From 88de2df4445edb74d5c1bd3f1982fc64737e3722 Mon Sep 17 00:00:00 2001 From: cvs2svn <> Date: Fri, 25 Mar 2005 09:02:31 +0000 Subject: This commit was manufactured by cvs2svn to create branch 'csl- arm-20050325-branch'. Sprout from binutils-2_16-branch 2005-03-03 11:58:11 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'binutils-' Cherrypick from master 2005-03-25 09:02:30 UTC Paolo Bonzini '2005-03-25 Paolo Bonzini ': ChangeLog Makefile.def Makefile.in Makefile.tpl config/ChangeLog config/gxx-include-dir.m4 configure configure.in djunpack.bat include/ChangeLog include/bfdlink.h include/elf/ChangeLog include/elf/arm.h include/elf/dwarf.h include/elf/m68k.h include/getopt.h include/libiberty.h include/opcode/arm.h include/xtensa-isa.h Delete: config/gcc-version.m4 --- ChangeLog | 47 +++++++++---- Makefile.def | 5 -- Makefile.in | 26 ++----- Makefile.tpl | 13 +--- config/ChangeLog | 9 +++ config/gcc-version.m4 | 28 -------- config/gxx-include-dir.m4 | 6 +- configure | 176 ++++++++++++++++------------------------------ configure.in | 22 +----- djunpack.bat | 52 ++++++++++++++ include/ChangeLog | 30 +++++++- include/bfdlink.h | 3 + include/elf/ChangeLog | 14 ++++ include/elf/arm.h | 3 + include/elf/dwarf.h | 54 +++++++------- include/elf/m68k.h | 3 +- include/libiberty.h | 15 +++- include/opcode/arm.h | 9 ++- include/xtensa-isa.h | 15 +++- 19 files changed, 282 insertions(+), 248 deletions(-) delete mode 100644 config/gcc-version.m4 create mode 100755 djunpack.bat diff --git a/ChangeLog b/ChangeLog index a6b744446..0a8d44179 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +2005-03-25 Paolo Bonzini + + * configure.in (RPATH_ENVVAR): Set to DYLD_LIBRARY_PATH on Darwin. + * configure: Regenerate. + +2005-03-21 Zack Weinberg + + * Makefile.def: Remove libstdcxx_incdir, libsubdir, gxx_include_dir, + gcc_version, and gcc_version_trigger from set of flags to pass. + * Makefile.tpl: Remove definitions of above variables. + (config.status): Remove dependency on $(gcc_version_trigger). + * Makefile.in: Regenerate. + * configure.in: Do not reference config/gcc-version.m4 nor + config/gxx-include-dir.m4. Do not invoke TL_AC_GCC_VERSION nor + TL_AC_GXX_INCLUDE_DIR. Do not set gcc_version_trigger. + * configure: Regenerate. + +2005-03-16 Manfred Hollstein + Andrew Pinski + + * Makefile.tpl (check-[+module+]): Fix shell statement inside if ... fi. + * Makefile.in: Regenerate. + 2005-03-01 Alexandre Oliva PR libgcj/20160 @@ -6,10 +29,10 @@ 2005-02-28 Andrew Pinski - PR bootstrap/20250 - * Makefile.tpl (HOST target installs): Fix copy and pasto, use install - instead of check. - * Makefile.in: Regenerate. + PR bootstrap/20250 + * Makefile.tpl (HOST target installs): Fix copy and pasto, use install + instead of check. + * Makefile.in: Regenerate. 2005-02-28 Paolo Bonzini @@ -156,7 +179,7 @@ * Makefile.tpl (clean-target-libgcc): Add stmp-dirs to list of things to remove. * Makefile.in: Regenerate. - + 2004-12-02 Richard Sandiford * configure.in: Clear gcc_version_trigger if the file doesn't exist. @@ -247,7 +270,7 @@ * src-release (do-djunpack, do-md5sum): Install the generated file directly into the proto-toplev/ directory. - + 2004-10-19 Andrew Cagney * src-release (GDB_SUPPORT_DIRS): Remove utils and intl. @@ -279,7 +302,7 @@ 2004-09-30 Tomer Levi * configure.in: Enable target-libgloss for crx-*-*. - * configure: Regenerate. + * configure: Regenerate. 2004-09-24 Michael Roth @@ -321,7 +344,7 @@ * configure: Regenerate. 2004-09-09 Daniel Berlin - + * Makefile.def: Remove libbanshee. * Makefile.tpl: Ditto. * configure.in: Ditto. @@ -337,7 +360,7 @@ * config.sub: Import latest version from master repository. * config.guess: Likewise. This includes these changes: - + 2004-08-27 Hans-Peter Nilsson * config.sub: Handle crisv32, alias etraxfs. @@ -424,7 +447,7 @@ * config.sub: Add support for National Semiconductor CRX target. 2004-09-03 Jan Beulich - + * configure.in: Remove target-libstdc++-v3 from noconfigdirs for *-*-netware, but add target-libmudflap. Consolidate *-*-netware targets (of which really only i?86 exists) @@ -450,8 +473,8 @@ * Makefile.in: Move BOOT_CFLAGS above host makefile fragment include. * configure.in: add test for powerpc-*-darwin* to specify makefile frag * configure: regenerate - * config/mh-ppc-darwin: create file, override BOOT_CFLAGS for - -mdynamic-no-pic + * config/mh-ppc-darwin: create file, override BOOT_CFLAGS for + -mdynamic-no-pic 2004-08-31 Paolo Bonzini diff --git a/Makefile.def b/Makefile.def index 3565f9832..ee731d929 100644 --- a/Makefile.def +++ b/Makefile.def @@ -172,8 +172,6 @@ flags_to_pass = { flag= infodir ; }; flags_to_pass = { flag= libdir ; }; flags_to_pass = { flag= libexecdir ; }; flags_to_pass = { flag= lispdir ; }; -flags_to_pass = { flag= libstdcxx_incdir ; }; -flags_to_pass = { flag= libsubdir ; }; flags_to_pass = { flag= localstatedir ; }; flags_to_pass = { flag= mandir ; }; flags_to_pass = { flag= oldincludedir ; }; @@ -183,9 +181,6 @@ flags_to_pass = { flag= sharedstatedir ; }; flags_to_pass = { flag= sysconfdir ; }; flags_to_pass = { flag= tooldir ; }; flags_to_pass = { flag= build_tooldir ; }; -flags_to_pass = { flag= gxx_include_dir ; }; -flags_to_pass = { flag= gcc_version ; }; -flags_to_pass = { flag= gcc_version_trigger ; }; flags_to_pass = { flag= target_alias ; }; // Build tools diff --git a/Makefile.in b/Makefile.in index a6d28ac0e..aeef11eb7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -72,21 +72,12 @@ LN_S = @LN_S@ # Miscellaneous non-standard autoconf-set variables # ------------------------------------------------- -# The file containing GCC's version number. -gcc_version_trigger = @gcc_version_trigger@ -gcc_version = @gcc_version@ - # The gcc driver likes to know the arguments it was configured with. TOPLEVEL_CONFIGURE_ARGUMENTS=@TOPLEVEL_CONFIGURE_ARGUMENTS@ -gxx_include_dir = @gxx_include_dir@ -libstdcxx_incdir = @libstdcxx_incdir@ - tooldir = @tooldir@ build_tooldir = @build_tooldir@ -# Directory in which the compiler finds executables, libraries, etc. -libsubdir = $(libdir)/gcc/$(target_alias)/$(gcc_version) GDB_NLM_DEPS = # This is the name of the environment variable used for the path to @@ -520,8 +511,6 @@ BASE_FLAGS_TO_PASS = \ "libdir=$(libdir)" \ "libexecdir=$(libexecdir)" \ "lispdir=$(lispdir)" \ - "libstdcxx_incdir=$(libstdcxx_incdir)" \ - "libsubdir=$(libsubdir)" \ "localstatedir=$(localstatedir)" \ "mandir=$(mandir)" \ "oldincludedir=$(oldincludedir)" \ @@ -531,9 +520,6 @@ BASE_FLAGS_TO_PASS = \ "sysconfdir=$(sysconfdir)" \ "tooldir=$(tooldir)" \ "build_tooldir=$(build_tooldir)" \ - "gxx_include_dir=$(gxx_include_dir)" \ - "gcc_version=$(gcc_version)" \ - "gcc_version_trigger=$(gcc_version_trigger)" \ "target_alias=$(target_alias)" \ "BISON=$(BISON)" \ "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ @@ -4820,7 +4806,7 @@ check-bison: $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/bison && \ - $(MAKE) $(FLAGS_TO_PASS) check) + $(MAKE) $(FLAGS_TO_PASS) check); \ fi @endif bison @@ -5151,7 +5137,7 @@ check-byacc: $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/byacc && \ - $(MAKE) $(FLAGS_TO_PASS) check) + $(MAKE) $(FLAGS_TO_PASS) check); \ fi @endif byacc @@ -7116,7 +7102,7 @@ check-fastjar: $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/fastjar && \ - $(MAKE) $(FLAGS_TO_PASS) check) + $(MAKE) $(FLAGS_TO_PASS) check); \ fi @endif fastjar @@ -8678,7 +8664,7 @@ check-flex: $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/flex && \ - $(MAKE) $(FLAGS_TO_PASS) check) + $(MAKE) $(FLAGS_TO_PASS) check); \ fi @endif flex @@ -21446,7 +21432,7 @@ check-zip: $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/zip && \ - $(MAKE) $(FLAGS_TO_PASS) check) + $(MAKE) $(FLAGS_TO_PASS) check); \ fi @endif zip @@ -35515,7 +35501,7 @@ $(srcdir)/Makefile.in: @MAINT@ $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def Makefile: $(srcdir)/Makefile.in config.status CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -config.status: configure $(gcc_version_trigger) +config.status: configure CONFIG_SHELL="$(SHELL)" $(SHELL) ./config.status --recheck # Rebuilding configure. diff --git a/Makefile.tpl b/Makefile.tpl index 1fe4025e9..9d662dc91 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -75,21 +75,12 @@ LN_S = @LN_S@ # Miscellaneous non-standard autoconf-set variables # ------------------------------------------------- -# The file containing GCC's version number. -gcc_version_trigger = @gcc_version_trigger@ -gcc_version = @gcc_version@ - # The gcc driver likes to know the arguments it was configured with. TOPLEVEL_CONFIGURE_ARGUMENTS=@TOPLEVEL_CONFIGURE_ARGUMENTS@ -gxx_include_dir = @gxx_include_dir@ -libstdcxx_incdir = @libstdcxx_incdir@ - tooldir = @tooldir@ build_tooldir = @build_tooldir@ -# Directory in which the compiler finds executables, libraries, etc. -libsubdir = $(libdir)/gcc/$(target_alias)/$(gcc_version) GDB_NLM_DEPS = # This is the name of the environment variable used for the path to @@ -920,7 +911,7 @@ check-[+module+]: $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/[+module+] && \ - $(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] check) + $(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] check); \ fi [+ ELSE check +] check-[+module+]: @@ -1673,7 +1664,7 @@ $(srcdir)/Makefile.in: @MAINT@ $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def Makefile: $(srcdir)/Makefile.in config.status CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -config.status: configure $(gcc_version_trigger) +config.status: configure CONFIG_SHELL="$(SHELL)" $(SHELL) ./config.status --recheck # Rebuilding configure. diff --git a/config/ChangeLog b/config/ChangeLog index 809396ba4..8572384d8 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,12 @@ +2005-03-21 Zack Weinberg + + * gxx-include-dir.m4: In all substitutions, leave $(gcc_version) + to be expanded by the Makefile. + +2005-03-15 Zack Weinberg + + * gcc-version.m4: Delete. + 2005-02-28 Paolo Bonzini PR bootstrap/17383 diff --git a/config/gcc-version.m4 b/config/gcc-version.m4 deleted file mode 100644 index 8de74bb2a..000000000 --- a/config/gcc-version.m4 +++ /dev/null @@ -1,28 +0,0 @@ -dnl Usage: TL_AC_GCC_VERSION(TOPSRCDIR) -dnl -dnl Set up the variables: -dnl -dnl gcc_version_trigger: pathname of gcc's version.c, if available -dnl gcc_version_full: full gcc version string -dnl gcc_version: the first "word" in $gcc_version_full -dnl -dnl TOPSRCDIR is the top-level source directory. -AC_DEFUN([TL_AC_GCC_VERSION], -[ -changequote(,)dnl -if test "${with_gcc_version_trigger+set}" = set; then - gcc_version_trigger=$with_gcc_version_trigger -else - gcc_version_trigger=$1/gcc/version.c -fi -if test -f "${gcc_version_trigger}"; then - gcc_version_full=`grep version_string "${gcc_version_trigger}" | sed -e 's/.*"\([^"]*\)".*/\1/'` -else - gcc_version_full=`$CC -v 2>&1 | sed -n 's/^gcc version //p'` -fi -gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'` -changequote([,])dnl -AC_SUBST(gcc_version_trigger) -AC_SUBST(gcc_version_full) -AC_SUBST(gcc_version) -])dnl diff --git a/config/gxx-include-dir.m4 b/config/gxx-include-dir.m4 index 87a65adaa..0e6e4ffc3 100644 --- a/config/gxx-include-dir.m4 +++ b/config/gxx-include-dir.m4 @@ -14,10 +14,10 @@ case "${with_gxx_include_dir}" in ;; no | "") case "${enable_version_specific_runtime_libs}" in - yes) gxx_include_dir='${libsubdir}/include/c++' ;; + yes) gxx_include_dir='$(libsubdir)/include/c++' ;; *) - libstdcxx_incdir=c++/${gcc_version} - gxx_include_dir='${prefix}/include/'${libstdcxx_incdir} ;; + libstdcxx_incdir='c++/$(gcc_version)' + gxx_include_dir='$(prefix)/include/$(libstdcxx_incdir)' ;; esac ;; *) gxx_include_dir=${with_gxx_include_dir} ;; esac diff --git a/configure b/configure index 0077b55a7..115a66927 100755 --- a/configure +++ b/configure @@ -852,37 +852,6 @@ topsrcdir=$srcpwd extra_host_args= -# Define the trigger file to make sure configure will re-run whenever -# the gcc version number changes. - -if test "${with_gcc_version_trigger+set}" = set; then - gcc_version_trigger=$with_gcc_version_trigger -else - gcc_version_trigger=$topsrcdir/gcc/version.c -fi -if test -f "${gcc_version_trigger}"; then - gcc_version_full=`grep version_string "${gcc_version_trigger}" | sed -e 's/.*"\([^"]*\)".*/\1/'` -else - gcc_version_full=`$CC -v 2>&1 | sed -n 's/^gcc version //p'` -fi -gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'` - - - - -if test -f $gcc_version_trigger ; then - case "$ac_configure_args" in - *--with-gcc-version-trigger=$gcc_version_trigger* ) - ;; - * ) - # Add to all subconfigure arguments: build, host, and target. - ac_configure_args="$ac_configure_args --with-gcc-version-trigger=$gcc_version_trigger" - ;; - esac -else - gcc_version_trigger= -fi - ### To add a new directory to the tree, first choose whether it is a target ### or a host dependent tool. Then put it into the appropriate list ### (library or tools, host or target), doing a dependency sort. @@ -1805,7 +1774,7 @@ else # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1809: checking for $ac_word" >&5 +echo "configure:1778: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1835,7 +1804,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1839: checking for $ac_word" >&5 +echo "configure:1808: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1886,7 +1855,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1890: checking for $ac_word" >&5 +echo "configure:1859: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1918,7 +1887,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1922: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1891: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1929,12 +1898,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1933 "configure" +#line 1902 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1960,12 +1929,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1964: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1933: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1969: checking whether we are using GNU C" >&5 +echo "configure:1938: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1974,7 +1943,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1978: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1993,7 +1962,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1997: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1966: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2060,7 +2029,7 @@ fi # Extract the first word of "${ac_tool_prefix}gnatbind", so it can be a program name with args. set dummy ${ac_tool_prefix}gnatbind; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2064: checking for $ac_word" >&5 +echo "configure:2033: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2092,7 +2061,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "gnatbind", so it can be a program name with args. set dummy gnatbind; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2096: checking for $ac_word" >&5 +echo "configure:2065: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2125,7 +2094,7 @@ fi fi echo $ac_n "checking whether compiler driver understands Ada""... $ac_c" 1>&6 -echo "configure:2129: checking whether compiler driver understands Ada" >&5 +echo "configure:2098: checking whether compiler driver understands Ada" >&5 if eval "test \"`echo '$''{'acx_cv_cc_gcc_supports_ada'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2158,7 +2127,7 @@ else fi echo $ac_n "checking how to compare bootstrapped objects""... $ac_c" 1>&6 -echo "configure:2162: checking how to compare bootstrapped objects" >&5 +echo "configure:2131: checking how to compare bootstrapped objects" >&5 if eval "test \"`echo '$''{'gcc_cv_prog_cmp_skip'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2256,9 +2225,9 @@ saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $gmpinc" # Check GMP actually works echo $ac_n "checking for correct version of gmp.h""... $ac_c" 1>&6 -echo "configure:2260: checking for correct version of gmp.h" >&5 +echo "configure:2229: checking for correct version of gmp.h" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -2282,12 +2251,12 @@ rm -f conftest* if test x"$have_gmp" = xyes; then echo $ac_n "checking for MPFR""... $ac_c" 1>&6 -echo "configure:2286: checking for MPFR" >&5 +echo "configure:2255: checking for MPFR" >&5 saved_LIBS="$LIBS" LIBS="$LIBS $gmplibs" cat > conftest.$ac_ext < #include @@ -2295,7 +2264,7 @@ int main() { mpfr_t n; mpfr_init(n); ; return 0; } EOF -if { (eval echo configure:2299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -2782,7 +2751,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2786: checking for $ac_word" >&5 +echo "configure:2755: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_BISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2817,7 +2786,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2821: checking for $ac_word" >&5 +echo "configure:2790: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2852,7 +2821,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2856: checking for $ac_word" >&5 +echo "configure:2825: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_M4'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2887,7 +2856,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2891: checking for $ac_word" >&5 +echo "configure:2860: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_FLEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2922,7 +2891,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2926: checking for $ac_word" >&5 +echo "configure:2895: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2957,7 +2926,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2961: checking for $ac_word" >&5 +echo "configure:2930: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_MAKEINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3078,6 +3047,7 @@ esac case "${host}" in *-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;; + *-*-darwin* | *-*-rhapsody* ) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;; *) RPATH_ENVVAR=LD_LIBRARY_PATH ;; esac @@ -3383,25 +3353,6 @@ fi # Pass the appropriate --host, --build, and --cache-file arguments. target_configargs="--cache-file=./config.cache --host=${target_alias} --build=${build_alias} ${target_configargs}" -# provide a proper gxx_include_dir. - -case "${with_gxx_include_dir}" in - yes) - { echo "configure: error: --with-gxx-include-dir=[dir] requires a directory" 1>&2; exit 1; } - ;; - no | "") - case "${enable_version_specific_runtime_libs}" in - yes) gxx_include_dir='${libsubdir}/include/c++' ;; - *) - libstdcxx_incdir=c++/${gcc_version} - gxx_include_dir='${prefix}/include/'${libstdcxx_incdir} ;; - esac ;; - *) gxx_include_dir=${with_gxx_include_dir} ;; -esac - - - - FLAGS_FOR_TARGET= case " $target_configdirs " in *" newlib "*) @@ -3603,7 +3554,7 @@ test -n "$target_alias" && ncn_target_tool_prefix=$target_alias- # Extract the first word of "${ncn_tool_prefix}ar", so it can be a program name with args. set dummy ${ncn_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3607: checking for $ac_word" >&5 +echo "configure:3558: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3636,7 +3587,7 @@ if test -z "$ac_cv_prog_AR" ; then # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3640: checking for $ac_word" >&5 +echo "configure:3591: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3675,7 +3626,7 @@ fi # Extract the first word of "${ncn_tool_prefix}as", so it can be a program name with args. set dummy ${ncn_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3679: checking for $ac_word" >&5 +echo "configure:3630: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3708,7 +3659,7 @@ if test -z "$ac_cv_prog_AS" ; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3712: checking for $ac_word" >&5 +echo "configure:3663: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3747,7 +3698,7 @@ fi # Extract the first word of "${ncn_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ncn_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3751: checking for $ac_word" >&5 +echo "configure:3702: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3780,7 +3731,7 @@ if test -z "$ac_cv_prog_DLLTOOL" ; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3784: checking for $ac_word" >&5 +echo "configure:3735: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3819,7 +3770,7 @@ fi # Extract the first word of "${ncn_tool_prefix}ld", so it can be a program name with args. set dummy ${ncn_tool_prefix}ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3823: checking for $ac_word" >&5 +echo "configure:3774: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3852,7 +3803,7 @@ if test -z "$ac_cv_prog_LD" ; then # Extract the first word of "ld", so it can be a program name with args. set dummy ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3856: checking for $ac_word" >&5 +echo "configure:3807: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3891,7 +3842,7 @@ fi # Extract the first word of "${ncn_tool_prefix}nm", so it can be a program name with args. set dummy ${ncn_tool_prefix}nm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3895: checking for $ac_word" >&5 +echo "configure:3846: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3924,7 +3875,7 @@ if test -z "$ac_cv_prog_NM" ; then # Extract the first word of "nm", so it can be a program name with args. set dummy nm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3928: checking for $ac_word" >&5 +echo "configure:3879: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3963,7 +3914,7 @@ fi # Extract the first word of "${ncn_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ncn_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3967: checking for $ac_word" >&5 +echo "configure:3918: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3996,7 +3947,7 @@ if test -z "$ac_cv_prog_RANLIB" ; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4000: checking for $ac_word" >&5 +echo "configure:3951: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4035,7 +3986,7 @@ fi # Extract the first word of "${ncn_tool_prefix}windres", so it can be a program name with args. set dummy ${ncn_tool_prefix}windres; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4039: checking for $ac_word" >&5 +echo "configure:3990: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4068,7 +4019,7 @@ if test -z "$ac_cv_prog_WINDRES" ; then # Extract the first word of "windres", so it can be a program name with args. set dummy windres; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4072: checking for $ac_word" >&5 +echo "configure:4023: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4107,7 +4058,7 @@ fi # Extract the first word of "${ncn_tool_prefix}objcopy", so it can be a program name with args. set dummy ${ncn_tool_prefix}objcopy; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4111: checking for $ac_word" >&5 +echo "configure:4062: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4140,7 +4091,7 @@ if test -z "$ac_cv_prog_OBJCOPY" ; then # Extract the first word of "objcopy", so it can be a program name with args. set dummy objcopy; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4144: checking for $ac_word" >&5 +echo "configure:4095: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJCOPY'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4179,7 +4130,7 @@ fi # Extract the first word of "${ncn_tool_prefix}objdump", so it can be a program name with args. set dummy ${ncn_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4183: checking for $ac_word" >&5 +echo "configure:4134: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4212,7 +4163,7 @@ if test -z "$ac_cv_prog_OBJDUMP" ; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4216: checking for $ac_word" >&5 +echo "configure:4167: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4258,7 +4209,7 @@ fi # Extract the first word of "${ncn_target_tool_prefix}ar", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4262: checking for $ac_word" >&5 +echo "configure:4213: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_AR_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4291,7 +4242,7 @@ if test -z "$ac_cv_prog_CONFIGURED_AR_FOR_TARGET" ; then # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4295: checking for $ac_word" >&5 +echo "configure:4246: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_AR_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4330,7 +4281,7 @@ fi # Extract the first word of "${ncn_target_tool_prefix}as", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4334: checking for $ac_word" >&5 +echo "configure:4285: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_AS_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4363,7 +4314,7 @@ if test -z "$ac_cv_prog_CONFIGURED_AS_FOR_TARGET" ; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4367: checking for $ac_word" >&5 +echo "configure:4318: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_AS_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4402,7 +4353,7 @@ fi # Extract the first word of "${ncn_target_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4406: checking for $ac_word" >&5 +echo "configure:4357: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4435,7 +4386,7 @@ if test -z "$ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET" ; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4439: checking for $ac_word" >&5 +echo "configure:4390: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4474,7 +4425,7 @@ fi # Extract the first word of "${ncn_target_tool_prefix}ld", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4478: checking for $ac_word" >&5 +echo "configure:4429: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_LD_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4507,7 +4458,7 @@ if test -z "$ac_cv_prog_CONFIGURED_LD_FOR_TARGET" ; then # Extract the first word of "ld", so it can be a program name with args. set dummy ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4511: checking for $ac_word" >&5 +echo "configure:4462: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_LD_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4546,7 +4497,7 @@ fi # Extract the first word of "${ncn_target_tool_prefix}nm", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}nm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4550: checking for $ac_word" >&5 +echo "configure:4501: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_NM_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4579,7 +4530,7 @@ if test -z "$ac_cv_prog_CONFIGURED_NM_FOR_TARGET" ; then # Extract the first word of "nm", so it can be a program name with args. set dummy nm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4583: checking for $ac_word" >&5 +echo "configure:4534: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_NM_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4618,7 +4569,7 @@ fi # Extract the first word of "${ncn_target_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4622: checking for $ac_word" >&5 +echo "configure:4573: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4651,7 +4602,7 @@ if test -z "$ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET" ; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4655: checking for $ac_word" >&5 +echo "configure:4606: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_RANLIB_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4690,7 +4641,7 @@ fi # Extract the first word of "${ncn_target_tool_prefix}windres", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}windres; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4694: checking for $ac_word" >&5 +echo "configure:4645: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4723,7 +4674,7 @@ if test -z "$ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET" ; then # Extract the first word of "windres", so it can be a program name with args. set dummy windres; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4727: checking for $ac_word" >&5 +echo "configure:4678: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_WINDRES_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4808,7 +4759,7 @@ RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET}${extra_ranlibflags_for_target} NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_for_target} echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:4812: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:4763: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -4855,7 +4806,7 @@ esac # gcc for stageN-gcc and stagePREV-gcc for stage(N-1). In case this is not # possible, however, we can resort to mv. echo $ac_n "checking if symbolic links between directories work""... $ac_c" 1>&6 -echo "configure:4859: checking if symbolic links between directories work" >&5 +echo "configure:4810: checking if symbolic links between directories work" >&5 if eval "test \"`echo '$''{'gcc_cv_prog_ln_s_dir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5089,9 +5040,6 @@ s%@INSTALL_DATA@%$INSTALL_DATA%g s%@LN@%$LN%g s%@LN_S@%$LN_S%g s%@TOPLEVEL_CONFIGURE_ARGUMENTS@%$TOPLEVEL_CONFIGURE_ARGUMENTS%g -s%@gcc_version_trigger@%$gcc_version_trigger%g -s%@gcc_version_full@%$gcc_version_full%g -s%@gcc_version@%$gcc_version%g s%@build_subdir@%$build_subdir%g s%@host_subdir@%$host_subdir%g s%@target_subdir@%$target_subdir%g @@ -5111,8 +5059,6 @@ s%@bootstrap_lean@%$bootstrap_lean%g s%@default_target@%$default_target%g /@serialization_dependencies@/r $serialization_dependencies s%@serialization_dependencies@%%g -s%@gxx_include_dir@%$gxx_include_dir%g -s%@libstdcxx_incdir@%$libstdcxx_incdir%g /@host_makefile_frag@/r $host_makefile_frag s%@host_makefile_frag@%%g /@target_makefile_frag@/r $target_makefile_frag diff --git a/configure.in b/configure.in index 59d349cd8..91c7191df 100644 --- a/configure.in +++ b/configure.in @@ -19,8 +19,6 @@ ### WARNING: this file contains embedded tabs. Do not run untabify on this file. sinclude(config/acx.m4) -sinclude(config/gcc-version.m4) -sinclude(config/gxx-include-dir.m4) AC_INIT(move-if-change) AC_PREREQ(2.13) @@ -101,22 +99,6 @@ topsrcdir=$srcpwd extra_host_args= -# Define the trigger file to make sure configure will re-run whenever -# the gcc version number changes. -TL_AC_GCC_VERSION([$topsrcdir]) -if test -f $gcc_version_trigger ; then - case "$ac_configure_args" in - *--with-gcc-version-trigger=$gcc_version_trigger* ) - ;; - * ) - # Add to all subconfigure arguments: build, host, and target. - ac_configure_args="$ac_configure_args --with-gcc-version-trigger=$gcc_version_trigger" - ;; - esac -else - gcc_version_trigger= -fi - ### To add a new directory to the tree, first choose whether it is a target ### or a host dependent tool. Then put it into the appropriate list ### (library or tools, host or target), doing a dependency sort. @@ -1667,6 +1649,7 @@ esac case "${host}" in *-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;; + *-*-darwin* | *-*-rhapsody* ) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;; *) RPATH_ENVVAR=LD_LIBRARY_PATH ;; esac @@ -1966,9 +1949,6 @@ fi # Pass the appropriate --host, --build, and --cache-file arguments. target_configargs="--cache-file=./config.cache --host=${target_alias} --build=${build_alias} ${target_configargs}" -# provide a proper gxx_include_dir. -TL_AC_GXX_INCLUDE_DIR - FLAGS_FOR_TARGET= case " $target_configdirs " in *" newlib "*) diff --git a/djunpack.bat b/djunpack.bat new file mode 100755 index 000000000..f09f5ed32 --- /dev/null +++ b/djunpack.bat @@ -0,0 +1,52 @@ +@echo off +Rem +Rem WARNING WARNING WARNING: This file needs to have DOS CRLF end-of-line +Rem format, or else stock DOS/Windows shells will refuse to run it. +Rem +Rem This batch file unpacks the GDB distribution while simultaneously +Rem renaming some of the files whose names are invalid on DOS or conflict +Rem with other file names after truncation to DOS 8+3 namespace. +Rem +Rem Invoke like this: +Rem +Rem djunpack gdb-XYZ.tar +Rem +Rem where XYZ is the version number. If the argument includes leading +Rem directories, it MUST use backslashes, not forward slashes. +Rem +Rem The following 2 lines need to be changed with each new GDB release, to +Rem be identical to the name of the top-level directory where the GDB +Rem distribution unpacks itself. +set GDBVER=gdb-5.0 +if "%GDBVER%"=="gdb-5.0" GoTo EnvOk +Rem If their environment space is too small, re-exec with a larger one +command.com /e:4096 /c %0 %1 +GoTo End +:EnvOk +if not exist %1 GoTo NoArchive +djtar -x -p -o %GDBVER%/gdb/config/djgpp/fnchange.lst %1 > fnchange.tmp +Rem The following uses a feature of COPY whereby it does not copy +Rem empty files. We need that because the previous line will create +Rem an empty fnchange.tmp even if the command failed for some reason. +copy fnchange.tmp junk.tmp > nul +if not exist junk.tmp GoTo NoDjTar +del junk.tmp +sed -e 's,@V@,%GDBVER%,g' < fnchange.tmp > fnchange.lst +Rem See the comment above about the reason for using COPY. +copy fnchange.lst junk.tmp > nul +if not exist junk.tmp GoTo NoSed +del junk.tmp +djtar -x -n fnchange.lst %1 +GoTo End +:NoSed +echo FAIL: Sed is not available. +GoTo End +:NoDjTar +echo FAIL: DJTAR is not available or no fnchange.lst file in %1. +GoTo End +:NoArchive +echo FAIL: the file %1 does not seem to exist. +echo Remember that %1 cannot use forward slashes, only backslashes. +GoTo End +:End +set GDBVER= diff --git a/include/ChangeLog b/include/ChangeLog index d45c62a3c..6f64e063b 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,29 @@ +2005-03-24 Kaveh R. Ghazi + + * libiberty.h (xstrndup): Declare. + +2005-03-22 Kaveh R. Ghazi + + * libiberty.h (make_relative_prefix): Add ATTRIBUTE_MALLOC. + +2005-03-22 Bob Wilson + + * xtensa-isa.h: Update a comment and whitespace. + +2005-03-16 H.J. Lu + + * bfdlink.h (bfd_link_info): Add gc_sections. + +2005-03-12 Zack Weinberg + + * opcode/arm.h: Adjust comments for ARM_EXT_V4T and ARM_EXT_V5T. + Add ARM_EXT_V6T2, ARM_ARCH_V6T2, ARM_ARCH_V6KT2, ARM_ARCH_V6ZT2, + and ARM_ARCH_V6ZKT2. + +2005-03-09 Mark Mitchell + + * libiberty.h (gettimeofday): Declare. + 2005-03-01 Jan Beulich * libiberty.h: Declare unlink_if_ordinary. @@ -54,7 +80,7 @@ * dis-asm.h: Add prototype for print_insn_maxq_little. 2004-11-05 Tomer Levi - + * opcode/crx.h (enum argtype): Rename types, remove unused types. 2004-10-27 Richard Earnshaw @@ -67,7 +93,7 @@ (enum reg_type): Remove CRX_PC_REGTYPE, CRX_MTPR_REGTYPE. (enum operand_type): Rearrange operands, edit comments. replace us with ui for unsigned immediate. - replace d with disps/dispu/dispe for signed/unsigned/escaped + replace d with disps/dispu/dispe for signed/unsigned/escaped displacements (respectively). replace rbase_ridx_scl2_dispu with rindex_disps for register index. (instruction type): Add NO_TYPE_INS. diff --git a/include/bfdlink.h b/include/bfdlink.h index 9d9315437..ad3290644 100644 --- a/include/bfdlink.h +++ b/include/bfdlink.h @@ -324,6 +324,9 @@ struct bfd_link_info /* TRUE if we should warn when adding a DT_TEXTREL to a shared object. */ unsigned int warn_shared_textrel: 1; + /* TRUE if unreferenced sections should be removed. */ + unsigned int gc_sections: 1; + /* What to do with unresolved symbols in an object file. When producing executables the default is GENERATE_ERROR. When producing shared libraries the default is IGNORE. The diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog index 91a81b995..b273adba9 100644 --- a/include/elf/ChangeLog +++ b/include/elf/ChangeLog @@ -1,3 +1,17 @@ +2005-03-23 Ben Elliston + + * dwarf.h: Merge with GCC's dwarf.h. + +2005-03-18 C Jaipraash + + * m68k.h (EF_CFV4E): Define. + +2005-03-17 Paul Brook + Dan Jacobowitz + Mark Mitchell + + * arm.h (PT_ARM_EXIDX): Define. + 2005-03-02 Daniel Jacobowitz Joseph Myers diff --git a/include/elf/arm.h b/include/elf/arm.h index 78678295d..de3ed0664 100644 --- a/include/elf/arm.h +++ b/include/elf/arm.h @@ -37,6 +37,9 @@ #define EF_ARM_VFP_FLOAT 0x400 #define EF_ARM_MAVERICK_FLOAT 0x800 +/* Frame unwind information */ +#define PT_ARM_EXIDX (PT_LOPROC + 1) + /* Other constants defined in the ARM ELF spec. version B-01. */ #define EF_ARM_SYMSARESORTED 0x04 /* NB conflicts with EF_INTERWORK */ #define EF_ARM_DYNSYMSUSESEGIDX 0x08 /* NB conflicts with EF_APCS26 */ diff --git a/include/elf/dwarf.h b/include/elf/dwarf.h index f79397253..170d60a5f 100644 --- a/include/elf/dwarf.h +++ b/include/elf/dwarf.h @@ -1,25 +1,26 @@ /* Declarations and definitions of codes relating to the DWARF symbolic debugging information format. - Written by Ron Guilmette (rfg@ncd.com) + Written by Ron Guilmette (rfg@netcom.com) -Copyright 1992, 1993, 1995, 1999 Free Software Foundation, Inc. +Copyright 1992, 1993, 1995, 1999, 2005 Free Software Foundation, Inc. -This file is part of GNU CC. +This file is part of GCC. -GNU CC is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. +GCC is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. -GNU CC is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +GCC is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with GNU CC; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +along with GCC; see the file COPYING. If not, write to the Free +Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. */ /* This file is derived from the DWARF specification (a public document) Revision 1.0.1 (April 8, 1992) developed by the UNIX International @@ -170,8 +171,8 @@ enum dwarf_attribute { AT_body_end = (0x8050|FORM_ADDR) }; -#define AT_lo_user 0x8000 /* implementation-defined range start */ -#define AT_hi_user 0xffff /* implementation-defined range end */ +#define AT_lo_user 0x2000 /* implementation-defined range start */ +#define AT_hi_user 0x3ff0 /* implementation-defined range end */ /* Location atom names and codes. */ @@ -182,7 +183,11 @@ enum dwarf_location_atom { OP_CONST = 0x04, OP_DEREF2 = 0x05, OP_DEREF4 = 0x06, - OP_ADD = 0x07 + OP_ADD = 0x07, + + /* GNU extensions. */ + + OP_MULT = 0x80 }; #define OP_LO_USER 0x80 /* implementation-defined range start */ @@ -217,7 +222,7 @@ enum dwarf_fundamental_type { /* GNU extensions The low order byte must indicate the size (in bytes) for the type. - All of these types will probably break "classic" svr4 SDB */ + All of these types will probably break "classic" svr4 SDB. */ FT_long_long = 0x8008, FT_signed_long_long = 0x8108, @@ -235,6 +240,9 @@ enum dwarf_fundamental_type { FT_int64 = 0x9908, FT_signed_int64 = 0x9a08, FT_unsigned_int64 = 0x9b08, + FT_int128 = 0x9c10, + FT_signed_int128 = 0x9d10, + FT_unsigned_int128 = 0x9e10, FT_real32 = 0xa004, FT_real64 = 0xa108, @@ -280,10 +288,10 @@ enum dwarf_subscr_data_formats { /* Derived from above for ease of use. */ -#define FMT_CODE(_FUNDAMENTAL_TYPE_P, _UB_CONST_P, _LB_CONST_P) \ +#define FMT_CODE(_FUNDAMENTAL_TYPE_P, _LB_CONST_P, _UB_CONST_P) \ (((_FUNDAMENTAL_TYPE_P) ? 0 : 4) \ - | ((_UB_CONST_P) ? 0 : 2) \ - | ((_LB_CONST_P) ? 0 : 1)) + | ((_LB_CONST_P) ? 0 : 2) \ + | ((_UB_CONST_P) ? 0 : 1)) /* Source language names and codes. */ @@ -298,11 +306,7 @@ enum dwarf_source_language { LANG_FORTRAN90 = 0x00000008, LANG_PASCAL83 = 0x00000009, LANG_MODULA2 = 0x0000000a, - - /* GNU extensions */ - - LANG_CHILL = 0x00009af3, /* random value for GNU Chill */ - LANG_JAVA = 0x00009af4 /* random value + 1 for GNU Java */ + LANG_JAVA = 0x0000000b }; #define LANG_lo_user 0x00008000 /* implementation-defined range start */ diff --git a/include/elf/m68k.h b/include/elf/m68k.h index fe66c5552..d6bc54f3d 100644 --- a/include/elf/m68k.h +++ b/include/elf/m68k.h @@ -1,5 +1,5 @@ /* MC68k ELF support for BFD. - Copyright 1998, 1999, 2000, 2002 Free Software Foundation, Inc. + Copyright 1998, 1999, 2000, 2002, 2005 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -54,5 +54,6 @@ END_RELOC_NUMBERS (R_68K_max) #define EF_CPU32 0x00810000 #define EF_M68000 0x01000000 +#define EF_CFV4E 0x00008000 #endif diff --git a/include/libiberty.h b/include/libiberty.h index 4df814092..49a2fb6fd 100644 --- a/include/libiberty.h +++ b/include/libiberty.h @@ -145,6 +145,15 @@ extern int fdmatch PARAMS ((int fd1, int fd2)); extern char * getpwd PARAMS ((void)); +/* Get the current time. */ +/* Prototypes vary from system to system, so we only provide a + prototype on systems where we know that we need it. */ +#ifdef __MINGW32__ +/* Forward declaration to avoid #include . */ +struct timeval; +extern int gettimeofday PARAMS ((struct timeval *, void *)); +#endif + /* Get the amount of time the process has run, in microseconds. */ extern long get_run_time PARAMS ((void)); @@ -153,7 +162,7 @@ extern long get_run_time PARAMS ((void)); return value using malloc. */ extern char *make_relative_prefix PARAMS ((const char *, const char *, - const char *)); + const char *)) ATTRIBUTE_MALLOC; /* Choose a temporary directory to use for scratch files. */ @@ -246,6 +255,10 @@ extern PTR xcalloc PARAMS ((size_t, size_t)) ATTRIBUTE_MALLOC; extern char *xstrdup PARAMS ((const char *)) ATTRIBUTE_MALLOC; +/* Copy at most N characters from string into a buffer without fail. */ + +extern char *xstrndup PARAMS ((const char *, size_t)) ATTRIBUTE_MALLOC; + /* Copy an existing memory buffer to a new memory buffer without fail. */ extern PTR xmemdup PARAMS ((const PTR, size_t, size_t)) ATTRIBUTE_MALLOC; diff --git a/include/opcode/arm.h b/include/opcode/arm.h index dd90e2ac6..db3666591 100644 --- a/include/opcode/arm.h +++ b/include/opcode/arm.h @@ -25,15 +25,16 @@ #define ARM_EXT_V3 0x00000008 /* MSR MRS. */ #define ARM_EXT_V3M 0x00000010 /* Allow long multiplies. */ #define ARM_EXT_V4 0x00000020 /* Allow half word loads. */ -#define ARM_EXT_V4T 0x00000040 /* Thumb v1. */ +#define ARM_EXT_V4T 0x00000040 /* Thumb. */ #define ARM_EXT_V5 0x00000080 /* Allow CLZ, etc. */ -#define ARM_EXT_V5T 0x00000100 /* Thumb v2. */ +#define ARM_EXT_V5T 0x00000100 /* Improved interworking. */ #define ARM_EXT_V5ExP 0x00000200 /* DSP core set. */ #define ARM_EXT_V5E 0x00000400 /* DSP Double transfers. */ #define ARM_EXT_V5J 0x00000800 /* Jazelle extension. */ #define ARM_EXT_V6 0x00001000 /* ARM V6. */ #define ARM_EXT_V6K 0x00002000 /* ARM V6K. */ #define ARM_EXT_V6Z 0x00004000 /* ARM V6Z. */ +#define ARM_EXT_V6T2 0x00008000 /* Thumb-2. */ /* Co-processor space extensions. */ #define ARM_CEXT_XSCALE 0x00800000 /* Allow MIA etc. */ @@ -65,6 +66,10 @@ #define ARM_ARCH_V6K (ARM_ARCH_V6 | ARM_EXT_V6K) #define ARM_ARCH_V6Z (ARM_ARCH_V6 | ARM_EXT_V6Z) #define ARM_ARCH_V6ZK (ARM_ARCH_V6 | ARM_EXT_V6K | ARM_EXT_V6Z) +#define ARM_ARCH_V6T2 (ARM_ARCH_V6 | ARM_EXT_V6T2) +#define ARM_ARCH_V6KT2 (ARM_ARCH_V6 | ARM_EXT_V6T2 | ARM_EXT_V6K) +#define ARM_ARCH_V6ZT2 (ARM_ARCH_V6 | ARM_EXT_V6T2 | ARM_EXT_V6Z) +#define ARM_ARCH_V6ZKT2 (ARM_ARCH_V6 | ARM_EXT_V6T2 | ARM_EXT_V6K | ARM_EXT_V6Z) /* Processors with specific extensions in the co-processor space. */ #define ARM_ARCH_XSCALE (ARM_ARCH_V5TE | ARM_CEXT_XSCALE) diff --git a/include/xtensa-isa.h b/include/xtensa-isa.h index 5c22902ee..043b9cdd5 100644 --- a/include/xtensa-isa.h +++ b/include/xtensa-isa.h @@ -65,7 +65,7 @@ extern "C" { typedef struct xtensa_isa_opaque { int unused; } *xtensa_isa; -/* Opcodes, formats, regfiles, states, sysregs, ctypes, and protos are +/* Most of the Xtensa ISA entities (e.g., opcodes, regfiles, etc.) are represented here using sequential integers beginning with 0. The specific values are only fixed for a particular instantiation of an xtensa_isa structure, so these values should only be used @@ -168,6 +168,7 @@ xtensa_isa_errno (xtensa_isa isa); extern char * xtensa_isa_error_msg (xtensa_isa isa); + /* Instruction buffers. */ @@ -215,6 +216,7 @@ extern void xtensa_insnbuf_from_chars (xtensa_isa isa, xtensa_insnbuf insn, const unsigned char *cp, int num_chars); + /* ISA information. */ @@ -279,6 +281,7 @@ xtensa_isa_num_interfaces (xtensa_isa isa); extern int xtensa_isa_num_funcUnits (xtensa_isa isa); + /* Instruction formats. */ @@ -342,6 +345,7 @@ extern int xtensa_format_set_slot (xtensa_isa isa, xtensa_format fmt, int slot, xtensa_insnbuf insn, const xtensa_insnbuf slotbuf); + /* Opcode information. */ @@ -412,7 +416,6 @@ xtensa_opcode_is_call (xtensa_isa isa, xtensa_opcode opc); extern int xtensa_opcode_num_operands (xtensa_isa isa, xtensa_opcode opc); - extern int xtensa_opcode_num_stateOperands (xtensa_isa isa, xtensa_opcode opc); @@ -438,6 +441,7 @@ xtensa_opcode_num_funcUnit_uses (xtensa_isa isa, xtensa_opcode opc); extern xtensa_funcUnit_use * xtensa_opcode_funcUnit_use (xtensa_isa isa, xtensa_opcode opc, int u); + /* Operand information. */ @@ -572,6 +576,7 @@ extern int xtensa_operand_undo_reloc (xtensa_isa isa, xtensa_opcode opc, int opnd, uint32 *valp, uint32 pc); + /* State Operands. */ @@ -588,6 +593,7 @@ xtensa_stateOperand_state (xtensa_isa isa, xtensa_opcode opc, int stOp); extern char xtensa_stateOperand_inout (xtensa_isa isa, xtensa_opcode opc, int stOp); + /* Interface Operands. */ @@ -598,6 +604,7 @@ extern xtensa_interface xtensa_interfaceOperand_interface (xtensa_isa isa, xtensa_opcode opc, int ifOp); + /* Register Files. */ @@ -651,6 +658,7 @@ xtensa_regfile_num_bits (xtensa_isa isa, xtensa_regfile rf); extern int xtensa_regfile_num_entries (xtensa_isa isa, xtensa_regfile rf); + /* Processor States. */ @@ -680,6 +688,7 @@ xtensa_state_num_bits (xtensa_isa isa, xtensa_state st); extern int xtensa_state_is_exported (xtensa_isa isa, xtensa_state st); + /* Sysregs ("special registers" and "user registers"). */ @@ -717,6 +726,7 @@ xtensa_sysreg_number (xtensa_isa isa, xtensa_sysreg sysreg); extern int xtensa_sysreg_is_user (xtensa_isa isa, xtensa_sysreg sysreg); + /* Interfaces. */ @@ -768,6 +778,7 @@ xtensa_interface_has_side_effect (xtensa_isa isa, xtensa_interface intf); extern int xtensa_interface_class_id (xtensa_isa isa, xtensa_interface intf); + /* Functional Units. */ -- cgit v1.2.3