181 lines
5.9 KiB
Diff
181 lines
5.9 KiB
Diff
Upstream-Status: Pending
|
|
|
|
Index: gcc-4.6.0/Makefile.def
|
|
===================================================================
|
|
--- gcc-4.6.0.orig/Makefile.def
|
|
+++ gcc-4.6.0/Makefile.def
|
|
@@ -243,6 +243,7 @@ flags_to_pass = { flag= AWK ; };
|
|
flags_to_pass = { flag= BISON ; };
|
|
flags_to_pass = { flag= CC_FOR_BUILD ; };
|
|
flags_to_pass = { flag= CFLAGS_FOR_BUILD ; };
|
|
+flags_to_pass = { flag= CPPFLAGS_FOR_BUILD ; };
|
|
flags_to_pass = { flag= CXX_FOR_BUILD ; };
|
|
flags_to_pass = { flag= EXPECT ; };
|
|
flags_to_pass = { flag= FLEX ; };
|
|
Index: gcc-4.6.0/gcc/Makefile.in
|
|
===================================================================
|
|
--- gcc-4.6.0.orig/gcc/Makefile.in
|
|
+++ gcc-4.6.0/gcc/Makefile.in
|
|
@@ -770,7 +770,7 @@ BUILD_LINKERFLAGS = $(BUILD_CFLAGS)
|
|
|
|
# Native linker and preprocessor flags. For x-fragment overrides.
|
|
BUILD_LDFLAGS=@BUILD_LDFLAGS@
|
|
-BUILD_CPPFLAGS=$(ALL_CPPFLAGS)
|
|
+BUILD_CPPFLAGS=$(INCLUDES) @BUILD_CPPFLAGS@ $(X_CPPFLAGS)
|
|
|
|
# Actual name to use when installing a native compiler.
|
|
GCC_INSTALL_NAME := $(shell echo gcc|sed '$(program_transform_name)')
|
|
Index: gcc-4.6.0/gcc/configure.ac
|
|
===================================================================
|
|
--- gcc-4.6.0.orig/gcc/configure.ac
|
|
+++ gcc-4.6.0/gcc/configure.ac
|
|
@@ -1784,16 +1784,18 @@ AC_SUBST(inhibit_libc)
|
|
# Also, we cannot run fixincludes.
|
|
|
|
# These are the normal (build=host) settings:
|
|
-CC_FOR_BUILD='$(CC)' AC_SUBST(CC_FOR_BUILD)
|
|
-BUILD_CFLAGS='$(ALL_CFLAGS)' AC_SUBST(BUILD_CFLAGS)
|
|
-BUILD_LDFLAGS='$(LDFLAGS)' AC_SUBST(BUILD_LDFLAGS)
|
|
-STMP_FIXINC=stmp-fixinc AC_SUBST(STMP_FIXINC)
|
|
+CC_FOR_BUILD='$(CC)' AC_SUBST(CC_FOR_BUILD)
|
|
+BUILD_CFLAGS='$(ALL_CFLAGS)' AC_SUBST(BUILD_CFLAGS)
|
|
+BUILD_LDFLAGS='$(LDFLAGS)' AC_SUBST(BUILD_LDFLAGS)
|
|
+BUILD_CPPFLAGS='$(ALL_CPPFLAGS)' AC_SUBST(BUILD_CPPFLAGS)
|
|
+STMP_FIXINC=stmp-fixinc AC_SUBST(STMP_FIXINC)
|
|
|
|
# And these apply if build != host, or we are generating coverage data
|
|
if test x$build != x$host || test "x$coverage_flags" != x
|
|
then
|
|
BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
|
|
BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)'
|
|
+ BUILD_CPPFLAGS='$(CPPFLAGS_FOR_BUILD)'
|
|
fi
|
|
|
|
# Expand extra_headers to include complete path.
|
|
Index: gcc-4.6.0/Makefile.in
|
|
===================================================================
|
|
--- gcc-4.6.0.orig/Makefile.in
|
|
+++ gcc-4.6.0/Makefile.in
|
|
@@ -338,6 +338,7 @@ AR_FOR_BUILD = @AR_FOR_BUILD@
|
|
AS_FOR_BUILD = @AS_FOR_BUILD@
|
|
CC_FOR_BUILD = @CC_FOR_BUILD@
|
|
CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
|
|
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
|
|
CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
|
|
CXX_FOR_BUILD = @CXX_FOR_BUILD@
|
|
DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
|
|
@@ -691,6 +692,7 @@ BASE_FLAGS_TO_PASS = \
|
|
"BISON=$(BISON)" \
|
|
"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
|
|
"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
|
|
+ "CPPFLAGS_FOR_BUILD=$(CPPFLAGS_FOR_BUILD)" \
|
|
"CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
|
|
"EXPECT=$(EXPECT)" \
|
|
"FLEX=$(FLEX)" \
|
|
Index: gcc-4.6.0/gcc/configure
|
|
===================================================================
|
|
--- gcc-4.6.0.orig/gcc/configure
|
|
+++ gcc-4.6.0/gcc/configure
|
|
@@ -703,6 +703,7 @@ SED
|
|
LIBTOOL
|
|
collect2
|
|
STMP_FIXINC
|
|
+BUILD_CPPFLAGS
|
|
BUILD_LDFLAGS
|
|
BUILD_CFLAGS
|
|
CC_FOR_BUILD
|
|
@@ -11382,6 +11383,7 @@ fi
|
|
CC_FOR_BUILD='$(CC)'
|
|
BUILD_CFLAGS='$(ALL_CFLAGS)'
|
|
BUILD_LDFLAGS='$(LDFLAGS)'
|
|
+BUILD_CPPFLAGS='$(ALL_CPPFLAGS)'
|
|
STMP_FIXINC=stmp-fixinc
|
|
|
|
# And these apply if build != host, or we are generating coverage data
|
|
@@ -11389,6 +11391,7 @@ if test x$build != x$host || test "x$cov
|
|
then
|
|
BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
|
|
BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)'
|
|
+ BUILD_CPPFLAGS='$(CPPFLAGS_FOR_BUILD)'
|
|
fi
|
|
|
|
# Expand extra_headers to include complete path.
|
|
@@ -17505,7 +17508,7 @@ else
|
|
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
|
lt_status=$lt_dlunknown
|
|
cat > conftest.$ac_ext <<_LT_EOF
|
|
-#line 17508 "configure"
|
|
+#line 17511 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#if HAVE_DLFCN_H
|
|
@@ -17611,7 +17614,7 @@ else
|
|
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
|
lt_status=$lt_dlunknown
|
|
cat > conftest.$ac_ext <<_LT_EOF
|
|
-#line 17614 "configure"
|
|
+#line 17617 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#if HAVE_DLFCN_H
|
|
Index: gcc-4.6.0/Makefile.tpl
|
|
===================================================================
|
|
--- gcc-4.6.0.orig/Makefile.tpl
|
|
+++ gcc-4.6.0/Makefile.tpl
|
|
@@ -341,6 +341,7 @@ AR_FOR_BUILD = @AR_FOR_BUILD@
|
|
AS_FOR_BUILD = @AS_FOR_BUILD@
|
|
CC_FOR_BUILD = @CC_FOR_BUILD@
|
|
CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
|
|
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
|
|
CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
|
|
CXX_FOR_BUILD = @CXX_FOR_BUILD@
|
|
DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
|
|
Index: gcc-4.6.0/configure.ac
|
|
===================================================================
|
|
--- gcc-4.6.0.orig/configure.ac
|
|
+++ gcc-4.6.0/configure.ac
|
|
@@ -3154,6 +3154,7 @@ esac
|
|
# our build compiler if desired.
|
|
if test x"${build}" = x"${host}" ; then
|
|
CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}}
|
|
+ CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD-${CPPFLAGS}}
|
|
CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}}
|
|
LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}}
|
|
fi
|
|
@@ -3220,6 +3221,7 @@ AC_SUBST(AR_FOR_BUILD)
|
|
AC_SUBST(AS_FOR_BUILD)
|
|
AC_SUBST(CC_FOR_BUILD)
|
|
AC_SUBST(CFLAGS_FOR_BUILD)
|
|
+AC_SUBST(CPPFLAGS_FOR_BUILD)
|
|
AC_SUBST(CXXFLAGS_FOR_BUILD)
|
|
AC_SUBST(CXX_FOR_BUILD)
|
|
AC_SUBST(DLLTOOL_FOR_BUILD)
|
|
Index: gcc-4.6.0/configure
|
|
===================================================================
|
|
--- gcc-4.6.0.orig/configure
|
|
+++ gcc-4.6.0/configure
|
|
@@ -617,6 +617,7 @@ GCJ_FOR_BUILD
|
|
DLLTOOL_FOR_BUILD
|
|
CXX_FOR_BUILD
|
|
CXXFLAGS_FOR_BUILD
|
|
+CPPFLAGS_FOR_BUILD
|
|
CFLAGS_FOR_BUILD
|
|
CC_FOR_BUILD
|
|
AS_FOR_BUILD
|
|
@@ -7675,6 +7676,7 @@ esac
|
|
# our build compiler if desired.
|
|
if test x"${build}" = x"${host}" ; then
|
|
CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}}
|
|
+ CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD-${CPPFLAGS}}
|
|
CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}}
|
|
LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}}
|
|
fi
|
|
@@ -7740,6 +7742,7 @@ done
|
|
|
|
|
|
|
|
+
|
|
|
|
|
|
|