From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 125483 invoked by alias); 20 Sep 2017 10:38:21 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 123081 invoked by uid 89); 20 Sep 2017 10:38:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-19.3 required=5.0 tests=AWL,BAYES_00,DATE_IN_PAST_96_XX,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_INFOUSMEBIZ,KAM_LAZY_DOMAIN_SECURITY,RDNS_DYNAMIC autolearn=ham version=3.3.2 spammy=CANADIAN, H*r:4.72, H*RU:sk:pppoe.1, Hx-spam-relays-external:sk:pppoe.1 X-Spam-User: qpsmtpd, 2 recipients X-HELO: void-ptr.info Received: from pppoe.185.44.68.223.lanport.ru (HELO void-ptr.info) (185.44.68.223) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 20 Sep 2017 10:38:17 +0000 Received: from ptr by void-ptr.info with local (Exim 4.72) (envelope-from ) id 1ducOT-0002W3-T8; Wed, 20 Sep 2017 13:38:13 +0300 Message-Id: From: Petr Ovtchenkov Date: Wed, 20 Sep 2017 10:38:00 -0000 Subject: [PATCH] Remove CANADIAN, that break compilation for foreign target To: libstdc++@gcc.gnu.org Cc: gcc-patches@gcc.gnu.org X-IsSubscribed: yes X-SW-Source: 2017-09/txt/msg01332.txt.bz2 Some old ad-hoc (adding -I/usr/include to compiler flags) break compilation of libstdc++ for foreign target architecture (due to compiler see includes of native). --- libstdc++-v3/acinclude.m4 | 5 ----- libstdc++-v3/configure | 22 ---------------------- libstdc++-v3/configure.ac | 14 -------------- 3 files changed, 41 deletions(-) diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index e48cf96..60c93bf 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -734,11 +734,6 @@ AC_DEFUN([GLIBCXX_EXPORT_INCLUDES], [ -I$glibcxx_builddir/include \ -I$glibcxx_srcdir/libsupc++" - # For Canadian crosses, pick this up too. - if test $CANADIAN = yes; then - GLIBCXX_INCLUDES="$GLIBCXX_INCLUDES -I\${includedir}" - fi - # Stuff in the actual top level. Currently only used by libsupc++ to # get unwind* headers from the libgcc dir. #TOPLEVEL_INCLUDES='-I$(toplevel_srcdir)/libgcc -I$(toplevel_srcdir)/include' diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 9bf152a..7839518 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -21762,11 +21762,6 @@ done # Only do link tests if native. Else, hardcode. if $GLIBCXX_IS_NATIVE; then - # We can do more elaborate tests that assume a working linker. - CANADIAN=no - - - # Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes @@ -28807,17 +28802,6 @@ else # When all of that is done, all of this hokey, excessive AC_DEFINE junk for # crosses can be removed. - # If Canadian cross, then don't pick up tools from the build directory. - # Used only in GLIBCXX_EXPORT_INCLUDES. - if test -n "$with_cross_host" && - test x"$build_alias" != x"$with_cross_host" && - test x"$build" != x"$target"; - then - CANADIAN=yes - else - CANADIAN=no - fi - # Construct crosses by hand, eliminating bits that need ld... # GLIBCXX_CHECK_MATH_SUPPORT @@ -81041,7 +81025,6 @@ CPU_OPT_BITS_RANDOM=config/${cpu_opt_bits_random} # Determine cross-compile flags and AM_CONDITIONALs. #AC_SUBST(GLIBCXX_IS_NATIVE) -#AM_CONDITIONAL(CANADIAN, test $CANADIAN = yes) if test $is_hosted = yes; then GLIBCXX_HOSTED_TRUE= GLIBCXX_HOSTED_FALSE='#' @@ -81423,11 +81406,6 @@ $as_echo "$gxx_include_dir" >&6; } -I$glibcxx_builddir/include \ -I$glibcxx_srcdir/libsupc++" - # For Canadian crosses, pick this up too. - if test $CANADIAN = yes; then - GLIBCXX_INCLUDES="$GLIBCXX_INCLUDES -I\${includedir}" - fi - # Stuff in the actual top level. Currently only used by libsupc++ to # get unwind* headers from the libgcc dir. #TOPLEVEL_INCLUDES='-I$(toplevel_srcdir)/libgcc -I$(toplevel_srcdir)/include' diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac index 9e19e99..3a8e26d 100644 --- a/libstdc++-v3/configure.ac +++ b/libstdc++-v3/configure.ac @@ -243,8 +243,6 @@ wchar.h wctype.h]) if $GLIBCXX_IS_NATIVE; then # We can do more elaborate tests that assume a working linker. - CANADIAN=no - GLIBCXX_CHECK_LINKER_FEATURES GLIBCXX_CHECK_MATH_SUPPORT GLIBCXX_CHECK_STDLIB_SUPPORT @@ -276,17 +274,6 @@ else # When all of that is done, all of this hokey, excessive AC_DEFINE junk for # crosses can be removed. - # If Canadian cross, then don't pick up tools from the build directory. - # Used only in GLIBCXX_EXPORT_INCLUDES. - if test -n "$with_cross_host" && - test x"$build_alias" != x"$with_cross_host" && - test x"$build" != x"$target"; - then - CANADIAN=yes - else - CANADIAN=no - fi - # Construct crosses by hand, eliminating bits that need ld... # GLIBCXX_CHECK_MATH_SUPPORT @@ -480,7 +467,6 @@ AC_SUBST(CPU_OPT_BITS_RANDOM) # Determine cross-compile flags and AM_CONDITIONALs. #AC_SUBST(GLIBCXX_IS_NATIVE) -#AM_CONDITIONAL(CANADIAN, test $CANADIAN = yes) GLIBCXX_EVALUATE_CONDITIONALS AC_CACHE_SAVE -- 2.10.1