Apply from mainline 2014-01-28 Alan Modra <amodra@gmail.com>

	Apply from mainline
	2014-01-28  Alan Modra  <amodra@gmail.com>
	* Makefile.in (BUILD_CPPFLAGS): Do not use ALL_CPPFLAGS.
	* configure.ac <recursive call for build != host>: Define
	GENERATOR_FILE.  Comment.  Use CXX_FOR_BUILD, CXXFLAGS_FOR_BUILD
	and LD_FOR_BUILD too.
	* configure: Regenerate.

From-SVN: r209149

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index efcfbf8c1421de7268d979d422b73d4bf57f0e2c..03ccd37aed41a839bd4c61469dfe4c87581e771f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2014-04-05  Alan Modra  <amodra@gmail.com>
+
+       Apply from mainline
+       2014-01-28  Alan Modra  <amodra@gmail.com>
+       * Makefile.in (BUILD_CPPFLAGS): Do not use ALL_CPPFLAGS.
+       * configure.ac <recursive call for build != host>: Define
+       GENERATOR_FILE.  Comment.  Use CXX_FOR_BUILD, CXXFLAGS_FOR_BUILD
+       and LD_FOR_BUILD too.
+       * configure: Regenerate.
+
 2014-04-04  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
 
        Backport from mainline r208895:

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 33784122cf19a2072a98e702ea4284616fd8e00b..2a4475b750ee4f7266f9cdbc094458106e6735b1 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -747,7 +747,8 @@ BUILD_LINKERFLAGS = $(BUILD_CXXFLAGS)
 
 # Native linker and preprocessor flags.  For x-fragment overrides.
 BUILD_LDFLAGS=@BUILD_LDFLAGS@
-BUILD_CPPFLAGS=$(ALL_CPPFLAGS)
+BUILD_CPPFLAGS= -I. -I$(@D) -I$(srcdir) -I$(srcdir)/$(@D) \
+               -I$(srcdir)/../include @INCINTL@ $(CPPINC) $(CPPFLAGS)
 
 # Actual name to use when installing a native compiler.
 GCC_INSTALL_NAME := $(shell echo gcc|sed '$(program_transform_name)')

diff --git a/gcc/configure b/gcc/configure
index 83998d6511ab1cfd0c2694b83bcd8266433e0395..21105517e252ecb465d00314429501c4f340cd9e 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -11202,8 +11202,13 @@ else
        /* | A-Za-z:\\/* ) realsrcdir=${srcdir};;
        *) realsrcdir=../${srcdir};;
        esac
+       # Clearing GMPINC is necessary to prevent host headers being
+       # used by the build compiler.  Defining GENERATOR_FILE stops
+       # system.h from including gmp.h.
        CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
-       LDFLAGS="${LDFLAGS_FOR_BUILD}" GMPINC="" \
+       CXX="${CXX_FOR_BUILD}" CXXFLAGS="${CXXFLAGS_FOR_BUILD}" \
+       LD="${LD_FOR_BUILD}" LDFLAGS="${LDFLAGS_FOR_BUILD}" \
+       GMPINC="" CPPFLAGS="${CPPFLAGS} -DGENERATOR_FILE" \
        ${realsrcdir}/configure \
                --enable-languages=${enable_languages-all} \
                --target=$target_alias --host=$build_alias --build=$build_alias
@@ -17833,7 +17838,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 17836 "configure"
+#line 17841 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17939,7 +17944,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 17942 "configure"
+#line 17947 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H

diff --git a/gcc/configure.ac b/gcc/configure.ac
index 7e97074c409fbada3ba12063bd4f3da8ed8868a8..b87c9eda00f220d59141a29606671e32a0a20b90 100644 (file)
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -1516,8 +1516,13 @@ else
        /* | [A-Za-z]:[\\/]* ) realsrcdir=${srcdir};;
        *) realsrcdir=../${srcdir};;
        esac
+       # Clearing GMPINC is necessary to prevent host headers being
+       # used by the build compiler.  Defining GENERATOR_FILE stops
+       # system.h from including gmp.h.
        CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
-       LDFLAGS="${LDFLAGS_FOR_BUILD}" GMPINC="" \
+       CXX="${CXX_FOR_BUILD}" CXXFLAGS="${CXXFLAGS_FOR_BUILD}" \
+       LD="${LD_FOR_BUILD}" LDFLAGS="${LDFLAGS_FOR_BUILD}" \
+       GMPINC="" CPPFLAGS="${CPPFLAGS} -DGENERATOR_FILE" \
        ${realsrcdir}/configure \
                --enable-languages=${enable_languages-all} \
                --target=$target_alias --host=$build_alias --build=$build_alias