diff options
| -rw-r--r-- | recipes/gcc/gcc-4.3.3.inc | 5 | ||||
| -rw-r--r-- | recipes/gcc/gcc-4.3.3/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch | 1310 | ||||
| -rw-r--r-- | recipes/gcc/gcc-4.3.3/gcc-flags-for-build.patch | 174 | ||||
| -rw-r--r-- | recipes/gcc/gcc-4.3.3/gcc-pr36218.patch | 345 | ||||
| -rw-r--r-- | recipes/gcc/gcc-4.3.3/zecke-xgcc-cpp.patch | 20 |
5 files changed, 979 insertions, 875 deletions
diff --git a/recipes/gcc/gcc-4.3.3.inc b/recipes/gcc/gcc-4.3.3.inc index d4b82dcedc..44188777eb 100644 --- a/recipes/gcc/gcc-4.3.3.inc +++ b/recipes/gcc/gcc-4.3.3.inc @@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r11" +INC_PR = "r12" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \ @@ -54,10 +54,11 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ # file://pr34130.patch;patch=1 \ # file://fortran-static-linking.patch;patch=1 \ file://gcc-arm-frename-registers.patch;patch=1 \ - file://gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch;patch=1 \ file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \ file://zecke-xgcc-cpp.patch;patch=1 \ file://gcc-flags-for-build.patch;patch=1 \ + file://gcc-pr36218.patch;patch=1 \ + file://gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch;patch=1 \ file://arm-gcc-objective.patch;patch=1 \ " diff --git a/recipes/gcc/gcc-4.3.3/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch b/recipes/gcc/gcc-4.3.3/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch index 1d3936bc39..951e6838b4 100644 --- a/recipes/gcc/gcc-4.3.3/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch +++ b/recipes/gcc/gcc-4.3.3/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch @@ -71,9 +71,9 @@ gcc: Index: gcc-4.3.3/configure.ac =================================================================== ---- gcc-4.3.3.orig/configure.ac 2008-02-01 20:29:30.000000000 -0700 -+++ gcc-4.3.3/configure.ac 2009-04-29 18:03:50.025603468 -0700 -@@ -1667,6 +1667,38 @@ +--- gcc-4.3.3.orig/configure.ac 2010-05-16 23:25:38.000000000 -0700 ++++ gcc-4.3.3/configure.ac 2010-05-16 23:26:54.363020511 -0700 +@@ -1667,6 +1667,38 @@ AC_ARG_WITH([debug-prefix-map], [DEBUG_PREFIX_CFLAGS_FOR_TARGET=]) AC_SUBST(DEBUG_PREFIX_CFLAGS_FOR_TARGET) @@ -114,17 +114,9 @@ Index: gcc-4.3.3/configure.ac if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then Index: gcc-4.3.3/Makefile.def =================================================================== ---- gcc-4.3.3.orig/Makefile.def 2007-10-23 08:53:18.000000000 -0700 -+++ gcc-4.3.3/Makefile.def 2009-04-29 18:03:50.029603058 -0700 -@@ -214,6 +214,7 @@ - flags_to_pass = { flag= INSTALL_DATA ; }; - flags_to_pass = { flag= INSTALL_PROGRAM ; }; - flags_to_pass = { flag= INSTALL_SCRIPT ; }; -+flags_to_pass = { flag= LDFLAGS_FOR_BUILD ; }; - flags_to_pass = { flag= LEX ; }; - flags_to_pass = { flag= M4 ; }; - flags_to_pass = { flag= MAKE ; }; -@@ -511,43 +512,51 @@ +--- gcc-4.3.3.orig/Makefile.def 2010-05-16 23:25:38.000000000 -0700 ++++ gcc-4.3.3/Makefile.def 2010-05-16 23:26:54.363020511 -0700 +@@ -513,43 +513,51 @@ bootstrap_stage = { // compiler probably has never heard of them. stage_configure_flags='--disable-intermodule $(STAGE1_CHECKING) \ --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"' ; @@ -186,9 +178,9 @@ Index: gcc-4.3.3/Makefile.def + stage_libcflags='$(STAGE3_LIBCFLAGS) -fprofile-use' ; }; Index: gcc-4.3.3/Makefile.tpl =================================================================== ---- gcc-4.3.3.orig/Makefile.tpl 2008-08-16 00:28:01.000000000 -0700 -+++ gcc-4.3.3/Makefile.tpl 2009-04-29 18:04:16.836611837 -0700 -@@ -23,6 +23,14 @@ +--- gcc-4.3.3.orig/Makefile.tpl 2010-05-16 23:25:38.000000000 -0700 ++++ gcc-4.3.3/Makefile.tpl 2010-05-16 23:56:35.720617708 -0700 +@@ -23,6 +23,14 @@ in # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # @@ -203,21 +195,7 @@ Index: gcc-4.3.3/Makefile.tpl # ------------------------------- # Standard Autoconf-set variables # ------------------------------- -@@ -139,6 +147,13 @@ - WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES; \ - WINDMC="$(WINDMC_FOR_BUILD)"; export WINDMC; - -+# These variables must be set on the make command line for directories -+# built for the build system to override those in BASE_FLAGS_TO_PASSS. -+EXTRA_BUILD_FLAGS = \ -+ CFLAGS="$(CFLAGS_FOR_BUILD)" \ -+ LDFLAGS="$(LDFLAGS_FOR_BUILD)" \ -+ LIBCFLAGS="" -+ - # This is the list of directories to built for the host system. - SUBDIRS = @configdirs@ - # This is set by the configure script to the arguments to use when configuring -@@ -153,6 +168,7 @@ +@@ -159,6 +167,7 @@ HOST_SUBDIR = @host_subdir@ HOST_EXPORTS = \ $(BASE_EXPORTS) \ CC="$(CC)"; export CC; \ @@ -225,10 +203,10 @@ Index: gcc-4.3.3/Makefile.tpl CFLAGS="$(CFLAGS)"; export CFLAGS; \ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ CXX="$(CXX)"; export CXX; \ -@@ -207,10 +223,10 @@ - AR="$(AR_FOR_TARGET)"; export AR; \ +@@ -214,10 +223,10 @@ BASE_TARGET_EXPORTS = \ AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \ CC="$(CC_FOR_TARGET)"; export CC; \ + CPP="$(CC_FOR_TARGET) -E"; export CPP; \ - CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CFLAGS="$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ @@ -238,7 +216,7 @@ Index: gcc-4.3.3/Makefile.tpl GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \ GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \ DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \ -@@ -323,7 +339,6 @@ +@@ -331,7 +340,6 @@ LDFLAGS = @LDFLAGS@ LIBCFLAGS = $(CFLAGS) CXXFLAGS = @CXXFLAGS@ LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates @@ -246,7 +224,7 @@ Index: gcc-4.3.3/Makefile.tpl # Only build the C compiler for stage1, because that is the only one that # we can guarantee will build with the native compiler, and also it is the -@@ -331,14 +346,19 @@ +@@ -339,14 +347,19 @@ PICFLAG = # MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them # overrideable (for a bootstrap build stage1 also builds gcc.info). @@ -267,7 +245,7 @@ Index: gcc-4.3.3/Makefile.tpl do-compare = @do_compare@ do-compare3 = $(do-compare) do-compare-debug = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2 -@@ -377,22 +397,14 @@ +@@ -385,22 +398,14 @@ COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_ COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@ COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@ @@ -290,11 +268,11 @@ Index: gcc-4.3.3/Makefile.tpl LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates -LDFLAGS_FOR_TARGET = -PICFLAG_FOR_TARGET = -+LDFLAGS_FOR_TARGET = @LDFLAGS@ ++LDFLAGS_FOR_TARGET = # ------------------------------------ # Miscellaneous targets and flag lists -@@ -492,19 +504,20 @@ +@@ -500,19 +505,20 @@ POSTSTAGE1_FLAGS_TO_PASS = \ # Flags to pass down to makes which are built with the target environment. # The double $ decreases the length of the command line; those variables # are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them. The @@ -320,7 +298,7 @@ Index: gcc-4.3.3/Makefile.tpl 'NM=$(COMPILER_NM_FOR_TARGET)' \ 'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \ 'RANLIB=$$(RANLIB_FOR_TARGET)' \ -@@ -852,9 +865,11 @@ +@@ -860,9 +866,11 @@ configure-stage[+id+]-[+prefix+][+module fi; \ [+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \ [+exports+][+ IF prev +] \ @@ -334,7 +312,7 @@ Index: gcc-4.3.3/Makefile.tpl echo Configuring stage [+id+] in [+subdir+]/[+module+] ; \ $(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \ cd [+subdir+]/[+module+] || exit 1; \ -@@ -891,7 +906,8 @@ +@@ -899,7 +907,8 @@ all-[+prefix+][+module+]: configure-[+pr s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ [+exports+] \ (cd [+subdir+]/[+module+] && \ @@ -344,7 +322,7 @@ Index: gcc-4.3.3/Makefile.tpl @endif [+prefix+][+module+] [+ IF bootstrap +] -@@ -911,8 +927,11 @@ +@@ -919,8 +928,11 @@ all-stage[+id+]-[+prefix+][+module+]: co [+exports+][+ IF prev +] \ [+poststage1_exports+][+ ENDIF prev +] \ cd [+subdir+]/[+module+] && \ @@ -358,17 +336,7 @@ Index: gcc-4.3.3/Makefile.tpl IF prev +][+poststage1_args+][+ ENDIF prev +] [+extra_make_flags+] \ $(TARGET-stage[+id+]-[+prefix+][+module+]) -@@ -945,7 +964,8 @@ - target_alias=(get "target" "${target_alias}") - args="$(BUILD_CONFIGARGS)" no-config-site=true +] - --[+ all prefix="build-" subdir="$(BUILD_SUBDIR)" exports="$(BUILD_EXPORTS)" +] -+[+ all prefix="build-" subdir="$(BUILD_SUBDIR)" exports="$(BUILD_EXPORTS)" -+ args="$(EXTRA_BUILD_FLAGS)" +] - [+ ENDFOR build_module +] - - # -------------------------------------- -@@ -962,7 +982,7 @@ +@@ -971,7 +983,7 @@ clean-stage[+id+]-[+prefix+][+module+]: [+ all prefix="" subdir="$(HOST_SUBDIR)" exports="$(HOST_EXPORTS)" poststage1_exports="$(POSTSTAGE1_HOST_EXPORTS)" @@ -377,7 +345,7 @@ Index: gcc-4.3.3/Makefile.tpl poststage1_args="$(POSTSTAGE1_FLAGS_TO_PASS)" +] .PHONY: check-[+module+] maybe-check-[+module+] -@@ -1060,7 +1080,7 @@ +@@ -1069,7 +1081,7 @@ maybe-[+make_target+]-[+module+]: [+make [+ all prefix="target-" subdir="$(TARGET_SUBDIR)" exports="$(RAW_CXX_TARGET_EXPORTS)" @@ -386,7 +354,7 @@ Index: gcc-4.3.3/Makefile.tpl [+ ELSE +] [+ configure prefix="target-" subdir="$(TARGET_SUBDIR)" check_multilibs=true -@@ -1071,7 +1091,7 @@ +@@ -1080,7 +1092,7 @@ maybe-[+make_target+]-[+module+]: [+make [+ all prefix="target-" subdir="$(TARGET_SUBDIR)" exports="$(NORMAL_TARGET_EXPORTS)" @@ -395,7 +363,7 @@ Index: gcc-4.3.3/Makefile.tpl [+ ENDIF +] .PHONY: check-target-[+module+] maybe-check-target-[+module+] -@@ -1301,7 +1321,7 @@ +@@ -1310,7 +1322,7 @@ stage[+id+]-end:: [+ FOR host_modules +] # Bubble a bug fix through all the stages up to stage [+id+]. They are # remade, but not reconfigured. The next stage (if any) will not be @@ -404,7 +372,7 @@ Index: gcc-4.3.3/Makefile.tpl .PHONY: stage[+id+]-bubble stage[+id+]-bubble:: [+ IF prev +]stage[+prev+]-bubble[+ ENDIF +] @r=`${PWD_COMMAND}`; export r; \ -@@ -1440,11 +1460,11 @@ +@@ -1449,11 +1461,11 @@ stage_current: @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi .PHONY: restrap @@ -418,7 +386,7 @@ Index: gcc-4.3.3/Makefile.tpl @endif gcc-bootstrap # -------------------------------------- -@@ -1475,7 +1495,7 @@ +@@ -1484,7 +1496,7 @@ configure-target-[+module+]: maybe-all-g [+ ;; These Scheme functions build the bulk of the dependencies. ;; dep-target builds a string like "maybe-all-MODULE_KIND-gcc", @@ -427,7 +395,7 @@ Index: gcc-4.3.3/Makefile.tpl ;; is taken from VAR-NAME. (define dep-target (lambda (module-kind var-name hard) (string-append -@@ -1633,7 +1653,8 @@ +@@ -1642,7 +1654,8 @@ config.status: configure # Rebuilding configure. AUTOCONF = autoconf @@ -440,7 +408,7 @@ Index: gcc-4.3.3/Makefile.tpl Index: gcc-4.3.3/config/mh-ppc-darwin =================================================================== --- gcc-4.3.3.orig/config/mh-ppc-darwin 2007-05-23 07:26:31.000000000 -0700 -+++ gcc-4.3.3/config/mh-ppc-darwin 2009-04-29 18:03:50.057603252 -0700 ++++ gcc-4.3.3/config/mh-ppc-darwin 2010-05-16 23:26:54.363020511 -0700 @@ -2,5 +2,4 @@ # position-independent-code -- the usual default on Darwin. This fix speeds # compiles by 3-5%. @@ -450,9 +418,9 @@ Index: gcc-4.3.3/config/mh-ppc-darwin +BOOT_CFLAGS=-g -O2 -mdynamic-no-pic Index: gcc-4.3.3/gcc/doc/install.texi =================================================================== ---- gcc-4.3.3.orig/gcc/doc/install.texi 2009-01-06 17:52:26.000000000 -0700 -+++ gcc-4.3.3/gcc/doc/install.texi 2009-04-29 18:03:50.065603803 -0700 -@@ -1778,33 +1778,35 @@ +--- gcc-4.3.3.orig/gcc/doc/install.texi 2009-01-06 16:52:26.000000000 -0800 ++++ gcc-4.3.3/gcc/doc/install.texi 2010-05-16 23:26:54.363020511 -0700 +@@ -1778,33 +1778,35 @@ same described above, but object files f stage2 of the 3-stage bootstrap of the compiler are deleted as soon as they are no longer needed. @@ -513,7 +481,7 @@ Index: gcc-4.3.3/gcc/doc/install.texi If you used the flag @option{--enable-languages=@dots{}} to restrict the compilers to be built, only those you've actually enabled will be -@@ -2687,8 +2689,8 @@ +@@ -2687,8 +2689,8 @@ new version of DEC Unix, you should rebu stamp. @samp{make compare} may fail on old versions of DEC Unix unless you add @@ -526,8 +494,8 @@ Index: gcc-4.3.3/gcc/doc/install.texi fixed name to be used for the assembler input file, instead of a Index: gcc-4.3.3/Makefile.in =================================================================== ---- gcc-4.3.3.orig/Makefile.in 2008-08-16 00:28:01.000000000 -0700 -+++ gcc-4.3.3/Makefile.in 2009-04-29 18:04:32.133111439 -0700 +--- gcc-4.3.3.orig/Makefile.in 2010-05-16 23:25:38.000000000 -0700 ++++ gcc-4.3.3/Makefile.in 2010-05-16 23:56:50.000000000 -0700 @@ -20,6 +20,14 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # @@ -543,21 +511,7 @@ Index: gcc-4.3.3/Makefile.in # ------------------------------- # Standard Autoconf-set variables # ------------------------------- -@@ -136,6 +144,13 @@ - WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES; \ - WINDMC="$(WINDMC_FOR_BUILD)"; export WINDMC; - -+# These variables must be set on the make command line for directories -+# built for the build system to override those in BASE_FLAGS_TO_PASSS. -+EXTRA_BUILD_FLAGS = \ -+ CFLAGS="$(CFLAGS_FOR_BUILD)" \ -+ LDFLAGS="$(LDFLAGS_FOR_BUILD)" \ -+ LIBCFLAGS="" -+ - # This is the list of directories to built for the host system. - SUBDIRS = @configdirs@ - # This is set by the configure script to the arguments to use when configuring -@@ -150,6 +165,7 @@ +@@ -156,6 +164,7 @@ HOST_SUBDIR = @host_subdir@ HOST_EXPORTS = \ $(BASE_EXPORTS) \ CC="$(CC)"; export CC; \ @@ -565,10 +519,10 @@ Index: gcc-4.3.3/Makefile.in CFLAGS="$(CFLAGS)"; export CFLAGS; \ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ CXX="$(CXX)"; export CXX; \ -@@ -204,10 +220,10 @@ - AR="$(AR_FOR_TARGET)"; export AR; \ +@@ -211,10 +220,10 @@ BASE_TARGET_EXPORTS = \ AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \ CC="$(CC_FOR_TARGET)"; export CC; \ + CPP="$(CC_FOR_TARGET) -E"; export CPP; \ - CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CFLAGS="$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ @@ -578,7 +532,7 @@ Index: gcc-4.3.3/Makefile.in GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \ GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \ DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \ -@@ -320,7 +336,6 @@ +@@ -328,7 +337,6 @@ LDFLAGS = @LDFLAGS@ LIBCFLAGS = $(CFLAGS) CXXFLAGS = @CXXFLAGS@ LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates @@ -586,7 +540,7 @@ Index: gcc-4.3.3/Makefile.in # Only build the C compiler for stage1, because that is the only one that # we can guarantee will build with the native compiler, and also it is the -@@ -328,14 +343,19 @@ +@@ -336,14 +344,19 @@ PICFLAG = # MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them # overrideable (for a bootstrap build stage1 also builds gcc.info). @@ -607,7 +561,7 @@ Index: gcc-4.3.3/Makefile.in do-compare = @do_compare@ do-compare3 = $(do-compare) do-compare-debug = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2 -@@ -374,22 +394,14 @@ +@@ -382,22 +395,14 @@ COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_ COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@ COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@ @@ -630,19 +584,11 @@ Index: gcc-4.3.3/Makefile.in LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates -LDFLAGS_FOR_TARGET = -PICFLAG_FOR_TARGET = -+LDFLAGS_FOR_TARGET = @LDFLAGS@ ++LDFLAGS_FOR_TARGET = # ------------------------------------ # Miscellaneous targets and flag lists -@@ -496,6 +508,7 @@ - "INSTALL_DATA=$(INSTALL_DATA)" \ - "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ - "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \ -+ "LDFLAGS_FOR_BUILD=$(LDFLAGS_FOR_BUILD)" \ - "LEX=$(LEX)" \ - "M4=$(M4)" \ - "MAKE=$(MAKE)" \ -@@ -592,19 +605,20 @@ +@@ -602,19 +607,20 @@ POSTSTAGE1_FLAGS_TO_PASS = \ # Flags to pass down to makes which are built with the target environment. # The double $ decreases the length of the command line; those variables # are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them. The @@ -668,77 +614,77 @@ Index: gcc-4.3.3/Makefile.in 'NM=$(COMPILER_NM_FOR_TARGET)' \ 'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \ 'RANLIB=$$(RANLIB_FOR_TARGET)' \ -@@ -2738,7 +2752,8 @@ +@@ -2748,7 +2754,8 @@ all-build-libiberty: configure-build-lib s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/libiberty && \ -- $(MAKE) $(TARGET-build-libiberty)) +- $(MAKE) $(EXTRA_BUILD_FLAGS) $(TARGET-build-libiberty)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \ + $(TARGET-build-libiberty)) @endif build-libiberty -@@ -2793,7 +2808,8 @@ +@@ -2803,7 +2810,8 @@ all-build-bison: configure-build-bison s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/bison && \ -- $(MAKE) $(TARGET-build-bison)) +- $(MAKE) $(EXTRA_BUILD_FLAGS) $(TARGET-build-bison)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \ + $(TARGET-build-bison)) @endif build-bison -@@ -2848,7 +2864,8 @@ +@@ -2858,7 +2866,8 @@ all-build-byacc: configure-build-byacc s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/byacc && \ -- $(MAKE) $(TARGET-build-byacc)) +- $(MAKE) $(EXTRA_BUILD_FLAGS) $(TARGET-build-byacc)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \ + $(TARGET-build-byacc)) @endif build-byacc -@@ -2903,7 +2920,8 @@ +@@ -2913,7 +2922,8 @@ all-build-flex: configure-build-flex s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/flex && \ -- $(MAKE) $(TARGET-build-flex)) +- $(MAKE) $(EXTRA_BUILD_FLAGS) $(TARGET-build-flex)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \ + $(TARGET-build-flex)) @endif build-flex -@@ -2958,7 +2976,8 @@ +@@ -2968,7 +2978,8 @@ all-build-m4: configure-build-m4 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/m4 && \ -- $(MAKE) $(TARGET-build-m4)) +- $(MAKE) $(EXTRA_BUILD_FLAGS) $(TARGET-build-m4)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \ + $(TARGET-build-m4)) @endif build-m4 -@@ -3013,7 +3032,8 @@ +@@ -3023,7 +3034,8 @@ all-build-texinfo: configure-build-texin s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/texinfo && \ -- $(MAKE) $(TARGET-build-texinfo)) +- $(MAKE) $(EXTRA_BUILD_FLAGS) $(TARGET-build-texinfo)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \ + $(TARGET-build-texinfo)) @endif build-texinfo -@@ -3068,7 +3088,8 @@ +@@ -3078,7 +3090,8 @@ all-build-fixincludes: configure-build-f s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/fixincludes && \ -- $(MAKE) $(TARGET-build-fixincludes)) +- $(MAKE) $(EXTRA_BUILD_FLAGS) $(TARGET-build-fixincludes)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \ + $(TARGET-build-fixincludes)) @endif build-fixincludes -@@ -3127,7 +3148,8 @@ +@@ -3137,7 +3150,8 @@ all-ash: configure-ash s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/ash && \ @@ -748,7 +694,7 @@ Index: gcc-4.3.3/Makefile.in @endif ash -@@ -3551,7 +3573,8 @@ +@@ -3561,7 +3575,8 @@ all-autoconf: configure-autoconf s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/autoconf && \ @@ -758,7 +704,7 @@ Index: gcc-4.3.3/Makefile.in @endif autoconf -@@ -3975,7 +3998,8 @@ +@@ -3985,7 +4000,8 @@ all-automake: configure-automake s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/automake && \ @@ -768,7 +714,7 @@ Index: gcc-4.3.3/Makefile.in @endif automake -@@ -4399,7 +4423,8 @@ +@@ -4409,7 +4425,8 @@ all-bash: configure-bash s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/bash && \ @@ -778,7 +724,7 @@ Index: gcc-4.3.3/Makefile.in @endif bash -@@ -4816,9 +4841,9 @@ +@@ -4826,9 +4843,9 @@ configure-stage1-bfd: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ @@ -790,7 +736,7 @@ Index: gcc-4.3.3/Makefile.in echo Configuring stage 1 in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ -@@ -4847,9 +4872,9 @@ +@@ -4857,9 +4874,9 @@ configure-stage2-bfd: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -802,7 +748,7 @@ Index: gcc-4.3.3/Makefile.in echo Configuring stage 2 in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ -@@ -4878,9 +4903,9 @@ +@@ -4888,9 +4905,9 @@ configure-stageb2g0-bfd: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -814,7 +760,7 @@ Index: gcc-4.3.3/Makefile.in echo Configuring stage b2g0 in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ -@@ -4909,9 +4934,9 @@ +@@ -4919,9 +4936,9 @@ configure-stage3-bfd: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -826,7 +772,7 @@ Index: gcc-4.3.3/Makefile.in echo Configuring stage 3 in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ -@@ -4940,9 +4965,9 @@ +@@ -4950,9 +4967,9 @@ configure-stageb3g2-bfd: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -838,7 +784,7 @@ Index: gcc-4.3.3/Makefile.in echo Configuring stage b3g2 in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ -@@ -4971,9 +4996,9 @@ +@@ -4981,9 +4998,9 @@ configure-stage4-bfd: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -850,7 +796,7 @@ Index: gcc-4.3.3/Makefile.in echo Configuring stage 4 in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ -@@ -5002,9 +5027,9 @@ +@@ -5012,9 +5029,9 @@ configure-stageprofile-bfd: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -862,7 +808,7 @@ Index: gcc-4.3.3/Makefile.in echo Configuring stage profile in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ -@@ -5033,9 +5058,9 @@ +@@ -5043,9 +5060,9 @@ configure-stagefeedback-bfd: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -874,7 +820,7 @@ Index: gcc-4.3.3/Makefile.in echo Configuring stage feedback in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ -@@ -5070,7 +5095,8 @@ +@@ -5080,7 +5097,8 @@ all-bfd: configure-bfd s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/bfd && \ @@ -884,7 +830,7 @@ Index: gcc-4.3.3/Makefile.in @endif bfd -@@ -5089,8 +5115,11 @@ +@@ -5099,8 +5117,11 @@ all-stage1-bfd: configure-stage1-bfd s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ @@ -898,7 +844,7 @@ Index: gcc-4.3.3/Makefile.in $(TARGET-stage1-bfd) maybe-clean-stage1-bfd: clean-stage1-bfd -@@ -5103,7 +5132,7 @@ +@@ -5113,7 +5134,7 @@ clean-stage1-bfd: $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ @@ -907,7 +853,7 @@ Index: gcc-4.3.3/Makefile.in clean @endif bfd-bootstrap -@@ -5123,8 +5152,11 @@ +@@ -5133,8 +5154,11 @@ all-stage2-bfd: configure-stage2-bfd $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ @@ -921,7 +867,7 @@ Index: gcc-4.3.3/Makefile.in $(TARGET-stage2-bfd) maybe-clean-stage2-bfd: clean-stage2-bfd -@@ -5137,7 +5169,7 @@ +@@ -5147,7 +5171,7 @@ clean-stage2-bfd: $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ @@ -930,7 +876,7 @@ Index: gcc-4.3.3/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif bfd-bootstrap -@@ -5158,8 +5190,11 @@ +@@ -5168,8 +5192,11 @@ all-stageb2g0-bfd: configure-stageb2g0-b $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ @@ -944,7 +890,7 @@ Index: gcc-4.3.3/Makefile.in $(TARGET-stageb2g0-bfd) maybe-clean-stageb2g0-bfd: clean-stageb2g0-bfd -@@ -5172,7 +5207,7 @@ +@@ -5182,7 +5209,7 @@ clean-stageb2g0-bfd: $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ @@ -953,7 +899,7 @@ Index: gcc-4.3.3/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif bfd-bootstrap -@@ -5193,8 +5228,11 @@ +@@ -5203,8 +5230,11 @@ all-stage3-bfd: configure-stage3-bfd $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ @@ -967,7 +913,7 @@ Index: gcc-4.3.3/Makefile.in $(TARGET-stage3-bfd) maybe-clean-stage3-bfd: clean-stage3-bfd -@@ -5207,7 +5245,7 @@ +@@ -5217,7 +5247,7 @@ clean-stage3-bfd: $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ @@ -976,7 +922,7 @@ Index: gcc-4.3.3/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif bfd-bootstrap -@@ -5228,8 +5266,11 @@ +@@ -5238,8 +5268,11 @@ all-stageb3g2-bfd: configure-stageb3g2-b $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ @@ -990,7 +936,7 @@ Index: gcc-4.3.3/Makefile.in $(TARGET-stageb3g2-bfd) maybe-clean-stageb3g2-bfd: clean-stageb3g2-bfd -@@ -5242,7 +5283,7 @@ +@@ -5252,7 +5285,7 @@ clean-stageb3g2-bfd: $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ @@ -999,7 +945,7 @@ Index: gcc-4.3.3/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif bfd-bootstrap -@@ -5263,8 +5304,11 @@ +@@ -5273,8 +5306,11 @@ all-stage4-bfd: configure-stage4-bfd $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ @@ -1013,7 +959,7 @@ Index: gcc-4.3.3/Makefile.in $(TARGET-stage4-bfd) maybe-clean-stage4-bfd: clean-stage4-bfd -@@ -5277,7 +5321,7 @@ +@@ -5287,7 +5323,7 @@ clean-stage4-bfd: $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ @@ -1022,7 +968,7 @@ Index: gcc-4.3.3/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif bfd-bootstrap -@@ -5298,8 +5342,11 @@ +@@ -5308,8 +5344,11 @@ all-stageprofile-bfd: configure-stagepro $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ @@ -1036,7 +982,7 @@ Index: gcc-4.3.3/Makefile.in $(TARGET-stageprofile-bfd) maybe-clean-stageprofile-bfd: clean-stageprofile-bfd -@@ -5312,7 +5359,7 @@ +@@ -5322,7 +5361,7 @@ clean-stageprofile-bfd: $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ @@ -1045,7 +991,7 @@ Index: gcc-4.3.3/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif bfd-bootstrap -@@ -5333,8 +5380,11 @@ +@@ -5343,8 +5382,11 @@ all-stagefeedback-bfd: configure-stagefe $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ @@ -1059,7 +1005,7 @@ Index: gcc-4.3.3/Makefile.in $(TARGET-stagefeedback-bfd) maybe-clean-stagefeedback-bfd: clean-stagefeedback-bfd -@@ -5347,7 +5397,7 @@ +@@ -5357,7 +5399,7 @@ clean-stagefeedback-bfd: $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ @@ -1068,7 +1014,7 @@ Index: gcc-4.3.3/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif bfd-bootstrap -@@ -5754,9 +5804,9 @@ +@@ -5764,9 +5806,9 @@ configure-stage1-opcodes: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ @@ -1080,7 +1026,7 @@ Index: gcc-4.3.3/Makefile.in echo Configuring stage 1 in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ -@@ -5785,9 +5835,9 @@ +@@ -5795,9 +5837,9 @@ configure-stage2-opcodes: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1092,7 +1038,7 @@ Index: gcc-4.3.3/Makefile.in echo Configuring stage 2 in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ -@@ -5816,9 +5866,9 @@ +@@ -5826,9 +5868,9 @@ configure-stageb2g0-opcodes: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1104,7 +1050,7 @@ Index: gcc-4.3.3/Makefile.in echo Configuring stage b2g0 in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ -@@ -5847,9 +5897,9 @@ +@@ -5857,9 +5899,9 @@ configure-stage3-opcodes: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1116,7 +1062,7 @@ Index: gcc-4.3.3/Makefile.in echo Configuring stage 3 in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ -@@ -5878,9 +5928,9 @@ +@@ -5888,9 +5930,9 @@ configure-stageb3g2-opcodes: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1128,7 +1074,7 @@ Index: gcc-4.3.3/Makefile.in echo Configuring stage b3g2 in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ -@@ -5909,9 +5959,9 @@ +@@ -5919,9 +5961,9 @@ configure-stage4-opcodes: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1140,7 +1086,7 @@ Index: gcc-4.3.3/Makefile.in echo Configuring stage 4 in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ -@@ -5940,9 +5990,9 @@ +@@ -5950,9 +5992,9 @@ configure-stageprofile-opcodes: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1152,7 +1098,7 @@ Index: gcc-4.3.3/Makefile.in echo Configuring stage profile in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ -@@ -5971,9 +6021,9 @@ +@@ -5981,9 +6023,9 @@ configure-stagefeedback-opcodes: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1164,7 +1110,7 @@ Index: gcc-4.3.3/Makefile.in echo Configuring stage feedback in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ -@@ -6008,7 +6058,8 @@ +@@ -6018,7 +6060,8 @@ all-opcodes: configure-opcodes s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/opcodes && \ @@ -1174,7 +1120,7 @@ Index: gcc-4.3.3/Makefile.in @endif opcodes -@@ -6027,8 +6078,11 @@ +@@ -6037,8 +6080,11 @@ all-stage1-opcodes: configure-stage1-opc s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1188,7 +1134,7 @@ Index: gcc-4.3.3/Makefile.in $(TARGET-stage1-opcodes) maybe-clean-stage1-opcodes: clean-stage1-opcodes -@@ -6041,7 +6095,7 @@ +@@ -6051,7 +6097,7 @@ clean-stage1-opcodes: $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1197,7 +1143,7 @@ Index: gcc-4.3.3/Makefile.in clean @endif opcodes-bootstrap -@@ -6061,8 +6115,11 @@ +@@ -6071,8 +6117,11 @@ all-stage2-opcodes: configure-stage2-opc $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1211,7 +1157,7 @@ Index: gcc-4.3.3/Makefile.in $(TARGET-stage2-opcodes) maybe-clean-stage2-opcodes: clean-stage2-opcodes -@@ -6075,7 +6132,7 @@ +@@ -6085,7 +6134,7 @@ clean-stage2-opcodes: $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1220,7 +1166,7 @@ Index: gcc-4.3.3/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif opcodes-bootstrap -@@ -6096,8 +6153,11 @@ +@@ -6106,8 +6155,11 @@ all-stageb2g0-opcodes: configure-stageb2 $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1234,7 +1180,7 @@ Index: gcc-4.3.3/Makefile.in $(TARGET-stageb2g0-opcodes) maybe-clean-stageb2g0-opcodes: clean-stageb2g0-opcodes -@@ -6110,7 +6170,7 @@ +@@ -6120,7 +6172,7 @@ clean-stageb2g0-opcodes: $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1243,7 +1189,7 @@ Index: gcc-4.3.3/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif opcodes-bootstrap -@@ -6131,8 +6191,11 @@ +@@ -6141,8 +6193,11 @@ all-stage3-opcodes: configure-stage3-opc $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1257,7 +1203,7 @@ Index: gcc-4.3.3/Makefile.in $(TARGET-stage3-opcodes) maybe-clean-stage3-opcodes: clean-stage3-opcodes -@@ -6145,7 +6208,7 @@ +@@ -6155,7 +6210,7 @@ clean-stage3-opcodes: $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1266,7 +1212,7 @@ Index: gcc-4.3.3/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif opcodes-bootstrap -@@ -6166,8 +6229,11 @@ +@@ -6176,8 +6231,11 @@ all-stageb3g2-opcodes: configure-stageb3 $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1280,7 +1226,7 @@ Index: gcc-4.3.3/Makefile.in $(TARGET-stageb3g2-opcodes) maybe-clean-stageb3g2-opcodes: clean-stageb3g2-opcodes -@@ -6180,7 +6246,7 @@ +@@ -6190,7 +6248,7 @@ clean-stageb3g2-opcodes: $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1289,7 +1235,7 @@ Index: gcc-4.3.3/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif opcodes-bootstrap -@@ -6201,8 +6267,11 @@ +@@ -6211,8 +6269,11 @@ all-stage4-opcodes: configure-stage4-opc $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1303,7 +1249,7 @@ Index: gcc-4.3.3/Makefile.in $(TARGET-stage4-opcodes) maybe-clean-stage4-opcodes: clean-stage4-opcodes -@@ -6215,7 +6284,7 @@ +@@ -6225,7 +6286,7 @@ clean-stage4-opcodes: $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1312,7 +1258,7 @@ Index: gcc-4.3.3/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif opcodes-bootstrap -@@ -6236,8 +6305,11 @@ +@@ -6246,8 +6307,11 @@ all-stageprofile-opcodes: configure-stag $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1326,7 +1272,7 @@ Index: gcc-4.3.3/Makefile.in $(TARGET-stageprofile-opcodes) maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes -@@ -6250,7 +6322,7 @@ +@@ -6260,7 +6324,7 @@ clean-stageprofile-opcodes: $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1335,7 +1281,7 @@ Index: gcc-4.3.3/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif opcodes-bootstrap -@@ -6271,8 +6343,11 @@ +@@ -6281,8 +6345,11 @@ all-stagefeedback-opcodes: configure-sta $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1349,7 +1295,7 @@ Index: gcc-4.3.3/Makefile.in $(TARGET-stagefeedback-opcodes) maybe-clean-stagefeedback-opcodes: clean-stagefeedback-opcodes -@@ -6285,7 +6360,7 @@ +@@ -6295,7 +6362,7 @@ clean-stagefeedback-opcodes: $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1358,7 +1304,7 @@ Index: gcc-4.3.3/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif opcodes-bootstrap -@@ -6692,9 +6767,9 @@ +@@ -6702,9 +6769,9 @@ configure-stage1-binutils: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ @@ -1370,7 +1316,7 @@ Index: gcc-4.3.3/Makefile.in echo Configuring stage 1 in $(HOST_SUBDIR)/binutils ; \ $( |