This commit was manufactured by cvs2svn to create branchbinutils-arc-20081103-branchpointarc-20081103-branchpointarc-20081103-branch

'arc-20081103-branch'.

Sprout from binutils-2_19-branch 2008-09-08 08:56:58 UTC nobody 'This commit was manufactured by cvs2svn to create branch 'binutils-'
Cherrypick from binutils-2_19-branch 2009-01-03 17:43:46 UTC nobody 'This commit was manufactured by cvs2svn to create branch 'binutils-':
    gas/testsuite/gas/ppc/common.d
    gas/testsuite/gas/ppc/common.s
    ld/testsuite/ld-powerpc/attr-gnu-12-1.s
    ld/testsuite/ld-powerpc/attr-gnu-12-11.d
    ld/testsuite/ld-powerpc/attr-gnu-12-2.s
    ld/testsuite/ld-powerpc/attr-gnu-12-21.d
Cherrypick from binutils-2_19-branch 2008-09-11 09:06:56 UTC nobody 'This commit was manufactured by cvs2svn to create branch 'binutils-':
    gprof/po/ro.po
Cherrypick from binutils-2_19-branch 2008-09-26 07:02:45 UTC nobody 'This commit was manufactured by cvs2svn to create branch 'binutils-':
    gas/config/te-solaris.h
Cherrypick from master 2008-11-02 23:59:45 UTC Alan Modra <amodra@gmail.com> 'daily update':
    ChangeLog
    Makefile.def
    Makefile.in
    Makefile.tpl
    bfd/ChangeLog
    bfd/Makefile.am
    bfd/Makefile.in
    bfd/aclocal.m4
    bfd/bfd-in2.h
    bfd/cache.c
    bfd/coff64-rs6000.c
    bfd/coffgen.c
    bfd/cofflink.c
    bfd/config.in
    bfd/configure
    bfd/configure.in
    bfd/doc/Makefile.in
    bfd/dwarf2.c
    bfd/elf-bfd.h
    bfd/elf-eh-frame.c
    bfd/elf.c
    bfd/elf32-cris.c
    bfd/elf32-ppc.c
    bfd/elf32-sh-symbian.c
    bfd/elf32-spu.c
    bfd/elf32-xtensa.c
    bfd/elf64-ppc.c
    bfd/elflink.c
    bfd/elfxx-mips.c
    bfd/libbfd.h
    bfd/linker.c
    bfd/po/id.po
    bfd/po/vi.po
    bfd/reloc.c
    bfd/version.h
    binutils/BRANCHES
    binutils/ChangeLog
    binutils/Makefile.in
    binutils/aclocal.m4
    binutils/config.in
    binutils/configure
    binutils/configure.in
    binutils/dlltool.c
    binutils/doc/Makefile.in
    binutils/dwarf.c
    binutils/embedspu.sh
    binutils/objcopy.c
    binutils/po/id.po
    binutils/po/sv.po
    binutils/readelf.c
    binutils/stabs.c
    binutils/testsuite/ChangeLog
    binutils/testsuite/binutils-all/group-2.s
    binutils/testsuite/binutils-all/group-3.s
    binutils/testsuite/binutils-all/group-4.s
    binutils/testsuite/binutils-all/group.s
    binutils/testsuite/binutils-all/objcopy.exp
    binutils/testsuite/binutils-all/objdump.W
    binutils/testsuite/binutils-all/strip-4.d
    binutils/testsuite/binutils-all/strip-5.d
    binutils/testsuite/binutils-all/strip-6.d
    binutils/testsuite/binutils-all/strip-7.d
    binutils/testsuite/binutils-all/strip-8.d
    binutils/testsuite/binutils-all/strip-9.d
    binutils/windmc.c
    binutils/windres.c
    configure
    configure.ac
    gas/ChangeLog
    gas/Makefile.am
    gas/Makefile.in
    gas/NEWS
    gas/aclocal.m4
    gas/app.c
    gas/config.in
    gas/config/bfin-parse.y
    gas/config/tc-bfin.c
    gas/config/tc-cris.c
    gas/config/tc-frv.c
    gas/config/tc-frv.h
    gas/config/tc-hppa.c
    gas/config/tc-hppa.h
    gas/config/tc-i386.c
    gas/config/tc-i386.h
    gas/config/tc-m68k.c
    gas/config/tc-mips.c
    gas/config/tc-mmix.c
    gas/config/tc-mmix.h
    gas/config/tc-mn10300.h
    gas/config/tc-ns32k.c
    gas/config/tc-ppc.c
    gas/config/tc-sh.h
    gas/config/tc-sh64.h
    gas/config/tc-tic4x.c
    gas/config/tc-xtensa.c
    gas/config/tc-xtensa.h
    gas/config/tc-z80.c
    gas/configure
    gas/configure.in
    gas/configure.tgt
    gas/doc/Makefile.in
    gas/doc/as.texinfo
    gas/doc/internals.texi
    gas/dw2gencfi.c
    gas/frags.c
    gas/hash.c
    gas/listing.c
    gas/po/id.po
    gas/read.c
    gas/symbols.c
    gas/testsuite/ChangeLog
    gas/testsuite/gas/all/gas.exp
    gas/testsuite/gas/cfi/cfi-alpha-1.d
    gas/testsuite/gas/cfi/cfi-alpha-3.d
    gas/testsuite/gas/cfi/cfi-arm-1.d
    gas/testsuite/gas/cfi/cfi-common-1.d
    gas/testsuite/gas/cfi/cfi-common-2.d
    gas/testsuite/gas/cfi/cfi-common-3.d
    gas/testsuite/gas/cfi/cfi-common-4.d
    gas/testsuite/gas/cfi/cfi-common-5.d
    gas/testsuite/gas/cfi/cfi-common-6.d
    gas/testsuite/gas/cfi/cfi-hppa-1.d
    gas/testsuite/gas/cfi/cfi-i386-2.d
    gas/testsuite/gas/cfi/cfi-i386.d
    gas/testsuite/gas/cfi/cfi-m68k.d
    gas/testsuite/gas/cfi/cfi-mips-1.d
    gas/testsuite/gas/cfi/cfi-ppc-1.d
    gas/testsuite/gas/cfi/cfi-s390-1.d
    gas/testsuite/gas/cfi/cfi-s390x-1.d
    gas/testsuite/gas/cfi/cfi-sh-1.d
    gas/testsuite/gas/cfi/cfi-sparc-1.d
    gas/testsuite/gas/cfi/cfi-sparc64-1.d
    gas/testsuite/gas/cfi/cfi-x86_64.d
    gas/testsuite/gas/cris/rd-tls-1.d
    gas/testsuite/gas/cris/rd-tls-1.s
    gas/testsuite/gas/cris/rd-tls-2.d
    gas/testsuite/gas/cris/rd-tls-2.s
    gas/testsuite/gas/cris/tls-err-1.s
    gas/testsuite/gas/cris/tls-err-2.s
    gas/testsuite/gas/cris/tls-err-3.s
    gas/testsuite/gas/elf/elf.exp
    gas/testsuite/gas/i386/i386.exp
    gas/testsuite/gas/i386/nops-5-i686.d
    gas/testsuite/gas/i386/nops-5.d
    gas/testsuite/gas/i386/nops-5.s
    gas/testsuite/gas/i386/sse2avx.d
    gas/testsuite/gas/i386/sse2avx.s
    gas/testsuite/gas/i386/x86-64-nops-5-k8.d
    gas/testsuite/gas/i386/x86-64-nops-5.d
    gas/testsuite/gas/i386/x86-64-sse2avx.d
    gas/testsuite/gas/i386/x86-64-sse2avx.s
    gas/testsuite/gas/ppc/power4_32.d
    gas/testsuite/gas/ppc/power4_32.s
    gas/testsuite/gas/ppc/power6.d
    gas/testsuite/gas/ppc/power6.s
    gas/testsuite/gas/ppc/ppc.exp
    gas/testsuite/gas/s390/esa-g5.d
    gas/testsuite/gas/s390/esa-g5.s
    gas/testsuite/gas/s390/esa-z990.d
    gas/testsuite/gas/s390/esa-z990.s
    gas/testsuite/gas/s390/zarch-z900.d
    gas/testsuite/gas/s390/zarch-z900.s
    gas/testsuite/gas/s390/zarch-z990.d
    gas/testsuite/gas/s390/zarch-z990.s
    gas/testsuite/gas/z80/arith.d
    gas/testsuite/gas/z80/arith.s
    gas/testsuite/gas/z80/bit.d
    gas/testsuite/gas/z80/bit.s
    gas/testsuite/gas/z80/block.d
    gas/testsuite/gas/z80/block.s
    gas/testsuite/gas/z80/branch.d
    gas/testsuite/gas/z80/branch.s
    gas/testsuite/gas/z80/inout.d
    gas/testsuite/gas/z80/inout.s
    gas/testsuite/gas/z80/ld-group.d
    gas/testsuite/gas/z80/ld-group.s
    gas/testsuite/gas/z80/misc.d
    gas/testsuite/gas/z80/misc.s
    gas/testsuite/gas/z80/rotate.d
    gas/testsuite/gas/z80/rotate.s
    gas/testsuite/gas/z80/z80.exp
    gas/write.c
    gold/ChangeLog
    gold/Makefile.am
    gold/Makefile.in
    gold/archive.cc
    gold/archive.h
    gold/config.in
    gold/configure
    gold/configure.ac
    gold/descriptors.cc
    gold/descriptors.h
    gold/fileread.cc
    gold/fileread.h
    gold/gold.cc
    gold/i386.cc
    gold/layout.cc
    gold/main.cc
    gold/mapfile.cc
    gold/object.cc
    gold/object.h
    gold/options.cc
    gold/options.h
    gold/output.cc
    gold/output.h
    gold/plugin.cc
    gold/plugin.h
    gold/powerpc.cc
    gold/readsyms.cc
    gold/reloc.cc
    gold/resolve.cc
    gold/sparc.cc
    gold/symtab.cc
    gold/symtab.h
    gold/target-reloc.h
    gold/target.h
    gold/testsuite/Makefile.am
    gold/testsuite/Makefile.in
    gold/testsuite/plugin_test.c
    gold/testsuite/plugin_test_1.sh
    gold/testsuite/plugin_test_2.sh
    gold/testsuite/thin_archive_main.cc
    gold/testsuite/thin_archive_test_1.cc
    gold/testsuite/thin_archive_test_2.cc
    gold/testsuite/thin_archive_test_3.cc
    gold/testsuite/thin_archive_test_4.cc
    gold/x86_64.cc
    gprof/ChangeLog
    gprof/Makefile.in
    gprof/aclocal.m4
    gprof/configure
    gprof/configure.in
    gprof/gconfig.in
    gprof/po/vi.po
    include/ChangeLog
    include/demangle.h
    include/elf/ChangeLog
    include/elf/cris.h
    include/elf/dwarf2.h
    include/elf/ppc.h
    include/obstack.h
    include/plugin-api.h
    ld/ChangeLog
    ld/Makefile.am
    ld/Makefile.in
    ld/aclocal.m4
    ld/config.in
    ld/configure
    ld/configure.in
    ld/emulparams/arcelf.sh
    ld/emulparams/criself.sh
    ld/emulparams/crislinux.sh
    ld/emulparams/elf32_i860.sh
    ld/emulparams/elf32_i960.sh
    ld/emulparams/elf32_sparc.sh
    ld/emulparams/elf32_spu.sh
    ld/emulparams/elf32am33lin.sh
    ld/emulparams/elf32fr30.sh
    ld/emulparams/elf32ip2k.sh
    ld/emulparams/elf32mcore.sh
    ld/emulparams/elf32openrisc.sh
    ld/emulparams/elf32ppccommon.sh
    ld/emulparams/elf32ppcwindiss.sh
    ld/emulparams/elf32vax.sh
    ld/emulparams/elf64_s390.sh
    ld/emulparams/elf64_sparc.sh
    ld/emulparams/elf64alpha.sh
    ld/emulparams/elf64mmix.sh
    ld/emulparams/elf64ppc.sh
    ld/emulparams/elf_i386.sh
    ld/emulparams/elf_i386_be.sh
    ld/emulparams/elf_i386_ldso.sh
    ld/emulparams/elf_i386_vxworks.sh
    ld/emulparams/elf_s390.sh
    ld/emulparams/elf_x86_64.sh
    ld/emulparams/h8300elf.sh
    ld/emulparams/hppa64linux.sh
    ld/emulparams/hppalinux.sh
    ld/emulparams/i386lynx.sh
    ld/emulparams/i386moss.sh
    ld/emulparams/i386nto.sh
    ld/emulparams/m68kelf.sh
    ld/emulparams/mn10200.sh
    ld/emulparams/or32elf.sh
    ld/emulparams/pjelf.sh
    ld/emulparams/ppclynx.sh
    ld/emulparams/scoreelf.sh
    ld/emulparams/shelf.sh
    ld/emulparams/shelf32.sh
    ld/emulparams/shelf_nto.sh
    ld/emulparams/shelf_vxworks.sh
    ld/emulparams/shlelf32_linux.sh
    ld/emulparams/shlelf_linux.sh
    ld/emulparams/shlelf_nto.sh
    ld/emultempl/armelf.em
    ld/emultempl/beos.em
    ld/emultempl/elf32.em
    ld/emultempl/genelf.em
    ld/emultempl/mmo.em
    ld/emultempl/pe.em
    ld/emultempl/pep.em
    ld/emultempl/spuelf.em
    ld/emultempl/sunos.em
    ld/ldemul.c
    ld/ldemul.h
    ld/ldexp.c
    ld/ldlang.c
    ld/ldlang.h
    ld/pe-dll.c
    ld/po/id.po
    ld/po/vi.po
    ld/scripttempl/avr.sc
    ld/scripttempl/elf.sc
    ld/testsuite/ChangeLog
    ld/testsuite/ld-elf/comm1.c
    ld/testsuite/ld-elf/eh-frame-hdr.d
    ld/testsuite/ld-elf/eh-group.exp
    ld/testsuite/ld-elf/eh-group1.s
    ld/testsuite/ld-elf/eh-group2.s
    ld/testsuite/ld-elf/eh1.d
    ld/testsuite/ld-elf/eh2.d
    ld/testsuite/ld-elf/eh3.d
    ld/testsuite/ld-elf/eh4.d
    ld/testsuite/ld-elf/eh5.d
    ld/testsuite/ld-elf/eh5b.s
    ld/testsuite/ld-elf/eh6.d
    ld/testsuite/ld-elf/extract-symbol-1sec.d
    ld/testsuite/ld-elf/func1.c
    ld/testsuite/ld-elf/group4.d
    ld/testsuite/ld-elf/group5.d
    ld/testsuite/ld-elf/group6.d
    ld/testsuite/ld-elf/group7.d
    ld/testsuite/ld-elf/shared.exp
    ld/testsuite/ld-elf/stab.d
    ld/testsuite/ld-elfcomm/common1b.c
    ld/testsuite/ld-gc/gc.c
    ld/testsuite/ld-ia64/tlsbin.rd
    ld/testsuite/ld-ia64/tlspic.rd
    ld/testsuite/ld-mips-elf/eh-frame1-n32.d
    ld/testsuite/ld-mips-elf/eh-frame1-n64.d
    ld/testsuite/ld-mips-elf/eh-frame2-n32.d
    ld/testsuite/ld-mips-elf/eh-frame2-n64.d
    ld/testsuite/ld-mips-elf/eh-frame3.d
    ld/testsuite/ld-mips-elf/eh-frame4.d
    ld/testsuite/ld-mips-elf/reloc-estimate-1.d
    ld/testsuite/ld-powerpc/powerpc.exp
    ld/testsuite/ld-powerpc/vxworks1-lib.rd
    ld/testsuite/ld-shared/main.c
    ld/testsuite/lib/ld-lib.exp
    libiberty/ChangeLog
    libiberty/Makefile.in
    libiberty/config.in
    libiberty/configure
    libiberty/configure.ac
    libiberty/cp-demangle.c
    libiberty/cp-demangle.h
    libiberty/testsuite/demangle-expected
    libiberty/xstrdup.c
    libtool.m4
    ltgcc.m4
    ltmain.sh
    ltoptions.m4
    ltsugar.m4
    ltversion.m4
    lt~obsolete.m4
    opcodes/ChangeLog
    opcodes/Makefile.am
    opcodes/Makefile.in
    opcodes/aclocal.m4
    opcodes/configure
    opcodes/configure.in
    opcodes/i386-gen.c
    opcodes/i386-opc.tbl
    opcodes/i386-tbl.h
    opcodes/po/fr.po
    opcodes/po/vi.po
    opcodes/s390-opc.c
    opcodes/s390-opc.txt
    opcodes/z80-dis.c

1 files changed, 12 insertions, 2 deletions

diff --git a/configure b/configure
index a8cf680..0000ea8 100755
--- a/configure
+++ b/configure
@@ -272,7 +272,7 @@ PACKAGE_STRING=
 PACKAGE_BUGREPORT=
 
 ac_unique_file="move-if-change"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS TOPLEVEL_CONFIGURE_ARGUMENTS build build_cpu build_vendor build_os build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET CFLAGS_FOR_TARGET CXXFLAGS_FOR_TARGET RPATH_ENVVAR GCC_SHLIB_SUBDIR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS TOPLEVEL_CONFIGURE_ARGUMENTS build build_cpu build_vendor build_os build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET CFLAGS_FOR_TARGET CXXFLAGS_FOR_TARGET CPPFLAGS_FOR_TARGET LDFLAGS_FOR_TARGET RPATH_ENVVAR GCC_SHLIB_SUBDIR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CPPFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir LIBOBJS LTLIBOBJS'
 ac_subst_files='serialization_dependencies host_makefile_frag target_makefile_frag alphaieee_frag ospace_frag'
 ac_pwd=`pwd`
 
@@ -2643,7 +2643,6 @@ case "${target}" in
   sparc-*-solaris* | sparc64-*-solaris* | sparcv9-*-solaris*)
     ;;
   spu-*-*)
-    skipdirs="target-libssp"
     ;;
   v810-*-*)
     noconfigdirs="$noconfigdirs bfd binutils gas gcc gdb ld target-libstdc++-v3 opcodes target-libgloss ${libgcj}"
@@ -5287,6 +5286,12 @@ if test "x$CXXFLAGS_FOR_TARGET" = x; then
 fi
 
 
+# Other target tools.
+CPPFLAGS_FOR_TARGET=${CPPFLAGS_FOR_TARGET-${CPPFLAGS}}
+
+LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET-${LDFLAGS}}
+
+
 # Handle --with-headers=XXX.  If the value is not "yes", the contents of
 # the named directory are copied to $(tooldir)/sys-include.
 if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then
@@ -6034,6 +6039,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
@@ -6112,6 +6118,7 @@ done
 
 
 
+
 # Generate default definitions for YACC, M4, LEX and other programs that run
 # on the build machine.  These are used if the Makefile can't locate these
 # programs in objdir.
@@ -12980,6 +12987,8 @@ s,@SYSROOT_CFLAGS_FOR_TARGET@,$SYSROOT_CFLAGS_FOR_TARGET,;t t
 s,@DEBUG_PREFIX_CFLAGS_FOR_TARGET@,$DEBUG_PREFIX_CFLAGS_FOR_TARGET,;t t
 s,@CFLAGS_FOR_TARGET@,$CFLAGS_FOR_TARGET,;t t
 s,@CXXFLAGS_FOR_TARGET@,$CXXFLAGS_FOR_TARGET,;t t
+s,@CPPFLAGS_FOR_TARGET@,$CPPFLAGS_FOR_TARGET,;t t
+s,@LDFLAGS_FOR_TARGET@,$LDFLAGS_FOR_TARGET,;t t
 s,@RPATH_ENVVAR@,$RPATH_ENVVAR,;t t
 s,@GCC_SHLIB_SUBDIR@,$GCC_SHLIB_SUBDIR,;t t
 s,@tooldir@,$tooldir,;t t
@@ -12996,6 +13005,7 @@ s,@AR_FOR_BUILD@,$AR_FOR_BUILD,;t t
 s,@AS_FOR_BUILD@,$AS_FOR_BUILD,;t t
 s,@CC_FOR_BUILD@,$CC_FOR_BUILD,;t t
 s,@CFLAGS_FOR_BUILD@,$CFLAGS_FOR_BUILD,;t t
+s,@CPPFLAGS_FOR_BUILD@,$CPPFLAGS_FOR_BUILD,;t t
 s,@CXXFLAGS_FOR_BUILD@,$CXXFLAGS_FOR_BUILD,;t t
 s,@CXX_FOR_BUILD@,$CXX_FOR_BUILD,;t t
 s,@DLLTOOL_FOR_BUILD@,$DLLTOOL_FOR_BUILD,;t t