acinclude.m4 (GLIBCC_ENABLE_SYMVERS): Tweak comments.

2003-07-11 Phil Edwards <pme@gcc.gnu.org> * acinclude.m4 (GLIBCC_ENABLE_SYMVERS): Tweak comments. Add warning messages if the environment cannot support symbol versioning. (port_specific_symbol_file): It's plural, add an 's' on the end. * configure.host: Likewise. * src/Makefile.am: Likewise. * config/linker-map.gnu: Remove one semicolon, heh. * scripts/extract_symvers: Don't assume useful 'export' syntax. Set LANG as well as LC_ALL for possibly-broken sort(1)s. * aclocal.m4, configure, src/Makefile.in: Regenerated. From-SVN: r69212
2003-07-11 04:04:49 +00:00 · 2003-07-11 04:04:49 +00:00 · 58579a27aa
commit 58579a27aa
parent 1dc9efda91
9 changed files with 104 additions and 120 deletions
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@ -1,3 +1,15 @@
+2003-07-11  Phil Edwards  <pme@gcc.gnu.org>
+
+	* acinclude.m4 (GLIBCC_ENABLE_SYMVERS):  Tweak comments.  Add
+	warning messages if the environment cannot support symbol versioning.
+	(port_specific_symbol_file):  It's plural, add an 's' on the end.
+	* configure.host:  Likewise.
+	* src/Makefile.am:  Likewise.
+	* config/linker-map.gnu:  Remove one semicolon, heh.
+	* scripts/extract_symvers:  Don't assume useful 'export' syntax.
+	Set LANG as well as LC_ALL for possibly-broken sort(1)s.
+	* aclocal.m4, configure, src/Makefile.in:  Regenerated.
+
 2003-07-09  Benjamin Kosnik  <bkoz@redhat.com>

 	* include/bits/locale_facets.tcc: Use function object for
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@ -2259,12 +2259,12 @@ if test $enable_symvers != no; then
  AC_MSG_RESULT($glibcxx_shared_libgcc)
 fi

-# For GNU ld, we need at least this version.  It's 2.14 in the same format
-# as the tested-for version.  See GLIBCXX_CHECK_LINKER_FEATURES for more.
+# For GNU ld, we need at least this version.  The format is described in
+# GLIBCXX_CHECK_LINKER_FEATURES above.
 glibcxx_min_gnu_ld_version=21400

-# Check to see if unspecified "yes" value can win, given results
-# above.
+# Check to see if unspecified "yes" value can win, given results above.
+# Change "yes" into either "no" or a style name.
 if test $enable_symvers = yes ; then
  if test $with_gnu_ld = yes &&
     test $glibcxx_shared_libgcc = yes ;
@ -2273,10 +2273,19 @@ if test $enable_symvers = yes ; then
      enable_symvers=gnu
    else
      # The right tools, the right setup, but too old.  Fallbacks?
+      AC_MSG_WARN(=== Linker version $glibcxx_gnu_ld_version is too old for)
+      AC_MSG_WARN(=== full symbol versioning support in this release of GCC.)
+      AC_MSG_WARN(=== You would need to upgrade your binutils to version)
+      AC_MSG_WARN(=== $glibcxx_min_gnu_ld_version or later and rebuild GCC.)
+      AC_MSG_WARN([=== Symbol versioning will be disabled.])
      enable_symvers=no
    fi
  else
    # just fail for now
+    AC_MSG_WARN([=== You have requested some kind of symbol versioning, but])
+    AC_MSG_WARN([=== either you are not using a supported linker, or you are])
+    AC_MSG_WARN([=== not building a shared libgcc_s (which is required).])
+    AC_MSG_WARN([=== Symbol versioning will be disabled.])
    enable_symvers=no
  fi
 fi
@ -2293,7 +2302,7 @@ case $enable_symvers in
 esac

 AC_SUBST(SYMVER_MAP)
-AC_SUBST(port_specific_symbol_file)
+AC_SUBST(port_specific_symbol_files)
 AM_CONDITIONAL(GLIBCXX_BUILD_VERSIONED_SHLIB, test $enable_symvers != no)
 AC_MSG_CHECKING([versioning on shared library symbols])
 AC_MSG_RESULT($enable_symvers)
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@ -2271,12 +2271,12 @@ if test $enable_symvers != no; then
  AC_MSG_RESULT($glibcxx_shared_libgcc)
 fi

-# For GNU ld, we need at least this version.  It's 2.14 in the same format
-# as the tested-for version.  See GLIBCXX_CHECK_LINKER_FEATURES for more.
+# For GNU ld, we need at least this version.  The format is described in
+# GLIBCXX_CHECK_LINKER_FEATURES above.
 glibcxx_min_gnu_ld_version=21400

-# Check to see if unspecified "yes" value can win, given results
-# above.
+# Check to see if unspecified "yes" value can win, given results above.
+# Change "yes" into either "no" or a style name.
 if test $enable_symvers = yes ; then
  if test $with_gnu_ld = yes &&
     test $glibcxx_shared_libgcc = yes ;
@ -2285,10 +2285,19 @@ if test $enable_symvers = yes ; then
      enable_symvers=gnu
    else
      # The right tools, the right setup, but too old.  Fallbacks?
+      AC_MSG_WARN(=== Linker version $glibcxx_gnu_ld_version is too old for)
+      AC_MSG_WARN(=== full symbol versioning support in this release of GCC.)
+      AC_MSG_WARN(=== You would need to upgrade your binutils to version)
+      AC_MSG_WARN(=== $glibcxx_min_gnu_ld_version or later and rebuild GCC.)
+      AC_MSG_WARN([=== Symbol versioning will be disabled.])
      enable_symvers=no
    fi
  else
    # just fail for now
+    AC_MSG_WARN([=== You have requested some kind of symbol versioning, but])
+    AC_MSG_WARN([=== either you are not using a supported linker, or you are])
+    AC_MSG_WARN([=== not building a shared libgcc_s (which is required).])
+    AC_MSG_WARN([=== Symbol versioning will be disabled.])
    enable_symvers=no
  fi
 fi
@ -2305,7 +2314,7 @@ case $enable_symvers in
 esac

 AC_SUBST(SYMVER_MAP)
-AC_SUBST(port_specific_symbol_file)
+AC_SUBST(port_specific_symbol_files)
 AM_CONDITIONAL(GLIBCXX_BUILD_VERSIONED_SHLIB, test $enable_symvers != no)
 AC_MSG_CHECKING([versioning on shared library symbols])
 AC_MSG_RESULT($enable_symvers)
--- a/libstdc++-v3/config/linker-map.gnu
+++ b/libstdc++-v3/config/linker-map.gnu
@ -55,7 +55,7 @@ GLIBCXX_3.4 {
      std::__num_base::_S_format_int*;
      std::__num_base::_S_atoms_in;
      std::__num_base::_S_atoms_out;
-      std::__numpunct_cache*;
+      std::__numpunct_cache*
    };

    # Names not in an 'extern' block are mangled names.
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@ -23231,12 +23231,12 @@ rm -f conftest*
  echo "$ac_t""$glibcxx_shared_libgcc" 1>&6
 fi

-# For GNU ld, we need at least this version.  It's 2.14 in the same format
-# as the tested-for version.  See GLIBCXX_CHECK_LINKER_FEATURES for more.
+# For GNU ld, we need at least this version.  The format is described in
+# GLIBCXX_CHECK_LINKER_FEATURES above.
 glibcxx_min_gnu_ld_version=21400

-# Check to see if unspecified "yes" value can win, given results
-# above.
+# Check to see if unspecified "yes" value can win, given results above.
+# Change "yes" into either "no" or a style name.
 if test $enable_symvers = yes ; then
  if test $with_gnu_ld = yes &&
     test $glibcxx_shared_libgcc = yes ;
@ -23245,10 +23245,19 @@ if test $enable_symvers = yes ; then
      enable_symvers=gnu
    else
      # The right tools, the right setup, but too old.  Fallbacks?
+      echo "configure: warning: === Linker version $glibcxx_gnu_ld_version is too old for" 1>&2
+      echo "configure: warning: === full symbol versioning support in this release of GCC." 1>&2
+      echo "configure: warning: === You would need to upgrade your binutils to version" 1>&2
+      echo "configure: warning: === $glibcxx_min_gnu_ld_version or later and rebuild GCC." 1>&2
+      echo "configure: warning: === Symbol versioning will be disabled." 1>&2
      enable_symvers=no
    fi
  else
    # just fail for now
+    echo "configure: warning: === You have requested some kind of symbol versioning, but" 1>&2
+    echo "configure: warning: === either you are not using a supported linker, or you are" 1>&2
+    echo "configure: warning: === not building a shared libgcc_s (which is required)." 1>&2
+    echo "configure: warning: === Symbol versioning will be disabled." 1>&2
    enable_symvers=no
  fi
 fi
@ -23278,7 +23287,7 @@ else
  GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE=
 fi
 echo $ac_n "checking versioning on shared library symbols""... $ac_c" 1>&6
-echo "configure:23282: checking versioning on shared library symbols" >&5
+echo "configure:23291: checking versioning on shared library symbols" >&5
 echo "$ac_t""$enable_symvers" 1>&6


@ -23293,17 +23302,17 @@ echo "$ac_t""$enable_symvers" 1>&6
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:23297: checking for $ac_hdr" >&5
+echo "configure:23306: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 23302 "configure"
+#line 23311 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:23307: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:23316: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@ -23336,7 +23345,7 @@ done
    # Can't do these in a loop, else the resulting syntax is wrong.
    
  cat > conftest.$ac_ext <<EOF
-#line 23340 "configure"
+#line 23349 "configure"
 #include "confdefs.h"
 #include <unistd.h>
                  #include <sys/time.h>
@ -23346,7 +23355,7 @@ int main() {
 int f = RLIMIT_DATA ; 
 ; return 0; }
 EOF
-if { (eval echo configure:23350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:23359: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  glibcxx_mresult=1
 else
@ -23363,7 +23372,7 @@ EOF

    
  cat > conftest.$ac_ext <<EOF
-#line 23367 "configure"
+#line 23376 "configure"
 #include "confdefs.h"
 #include <unistd.h>
                  #include <sys/time.h>
@ -23373,7 +23382,7 @@ int main() {
 int f = RLIMIT_RSS ; 
 ; return 0; }
 EOF
-if { (eval echo configure:23377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:23386: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  glibcxx_mresult=1
 else
@ -23390,7 +23399,7 @@ EOF

    
  cat > conftest.$ac_ext <<EOF
-#line 23394 "configure"
+#line 23403 "configure"
 #include "confdefs.h"
 #include <unistd.h>
                  #include <sys/time.h>
@ -23400,7 +23409,7 @@ int main() {
 int f = RLIMIT_VMEM ; 
 ; return 0; }
 EOF
-if { (eval echo configure:23404: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:23413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  glibcxx_mresult=1
 else
@ -23417,7 +23426,7 @@ EOF

    
  cat > conftest.$ac_ext <<EOF
-#line 23421 "configure"
+#line 23430 "configure"
 #include "confdefs.h"
 #include <unistd.h>
                  #include <sys/time.h>
@ -23427,7 +23436,7 @@ int main() {
 int f = RLIMIT_AS ; 
 ; return 0; }
 EOF
-if { (eval echo configure:23431: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:23440: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  glibcxx_mresult=1
 else
@ -23449,7 +23458,7 @@ EOF
 else
  
      cat > conftest.$ac_ext <<EOF
-#line 23453 "configure"
+#line 23462 "configure"
 #include "confdefs.h"
 #include <unistd.h>
                  #include <sys/time.h>
@ -23459,7 +23468,7 @@ int main() {
 struct rlimit r; setrlimit(0, &r);
 ; return 0; }
 EOF
-if { (eval echo configure:23463: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:23472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_setrlimit=yes
 else
@ -23475,7 +23484,7 @@ fi
  fi

  echo $ac_n "checking for testsuite memory limit support""... $ac_c" 1>&6
-echo "configure:23479: checking for testsuite memory limit support" >&5
+echo "configure:23488: checking for testsuite memory limit support" >&5
  if test $setrlimit_have_headers = yes && test $ac_setrlimit = yes; then
    ac_mem_limits=yes
    cat >> confdefs.h <<\EOF
@ -23491,7 +23500,7 @@ EOF
    # Look for setenv, so that extended locale tests can be performed.
    
  echo $ac_n "checking for setenv declaration""... $ac_c" 1>&6
-echo "configure:23495: checking for setenv declaration" >&5
+echo "configure:23504: checking for setenv declaration" >&5
  if test x${glibcxx_cv_func_setenv_use+set} != xset; then
    if eval "test \"`echo '$''{'glibcxx_cv_func_setenv_use'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@ -23506,14 +23515,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross

      cat > conftest.$ac_ext <<EOF
-#line 23510 "configure"
+#line 23519 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int main() {
 setenv(0, 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:23517: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:23526: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  glibcxx_cv_func_setenv_use=yes
 else
@ -23539,12 +23548,12 @@ fi
    for ac_func in setenv
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:23543: checking for $ac_func" >&5
+echo "configure:23552: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 23548 "configure"
+#line 23557 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func(); below.  */
@ -23567,7 +23576,7 @@ $ac_func();

 ; return 0; }
 EOF
-if { (eval echo configure:23571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:23580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_func_$ac_func=yes"
 else
@ -23727,7 +23736,7 @@ glibcxx_prefixdir=${prefix}

 # Process the option --with-gxx-include-dir=<path to include-files directory>
 echo $ac_n "checking for --with-gxx-include-dir""... $ac_c" 1>&6
-echo "configure:23731: checking for --with-gxx-include-dir" >&5
+echo "configure:23740: checking for --with-gxx-include-dir" >&5
 # Check whether --with-gxx-include-dir or --without-gxx-include-dir was given.
 if test "${with_gxx_include_dir+set}" = set; then
  withval="$with_gxx_include_dir"
@ -23751,7 +23760,7 @@ echo "$ac_t""$gxx_include_dir" 1>&6

 # Process the option "--enable-version-specific-runtime-libs"
 echo $ac_n "checking for --enable-version-specific-runtime-libs""... $ac_c" 1>&6
-echo "configure:23755: checking for --enable-version-specific-runtime-libs" >&5
+echo "configure:23764: checking for --enable-version-specific-runtime-libs" >&5
 # Check whether --enable-version-specific-runtime-libs or --disable-version-specific-runtime-libs was given.
 if test "${enable_version_specific_runtime_libs+set}" = set; then
  enableval="$enable_version_specific_runtime_libs"
@ -23802,7 +23811,7 @@ if test x"$glibcxx_toolexecdir" = x"no"; then
 fi

 echo $ac_n "checking for install location""... $ac_c" 1>&6
-echo "configure:23806: checking for install location" >&5
+echo "configure:23815: checking for install location" >&5
 echo "$ac_t""$gxx_include_dir" 1>&6


@ -24086,7 +24095,7 @@ s%@OPT_LDFLAGS@%$OPT_LDFLAGS%g
 s%@LIBMATHOBJS@%$LIBMATHOBJS%g
 s%@WERROR@%$WERROR%g
 s%@SYMVER_MAP@%$SYMVER_MAP%g
-s%@port_specific_symbol_file@%$port_specific_symbol_file%g
+s%@port_specific_symbol_files@%$port_specific_symbol_files%g
 s%@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@%$GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE%g
 s%@GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@%$GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE%g
 s%@baseline_dir@%$baseline_dir%g
--- a/libstdc++-v3/configure.host
+++ b/libstdc++-v3/configure.host
@ -41,7 +41,7 @@
 #                          the form '-Wl,blah'
 #                          (defaults to empty in acinclude.m4)
 #
-#   port_specific_symbol_file
+#   port_specific_symbol_files
 #                          whitespace-seperated list of files containing
 #                              additional symbols to export from the shared
 #                              library, when symbol versioning is in use
--- a/libstdc++-v3/scripts/extract_symvers
+++ b/libstdc++-v3/scripts/extract_symvers
@ -1,6 +1,6 @@
 #!/bin/sh

-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 #
 # This file is part of the GNU ISO C++ Library.  This library is free
 # software; you can redistribute it and/or modify it under the
@ -45,7 +45,10 @@ if readelf --help | grep -- --wide > /dev/null; then
 fi

 # This avoids weird sorting problems later.
-export LC_ALL=C
+LC_ALL=C
+export LC_ALL
+LANG=C
+export LANG

 tmp=extract.$$

--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@ -37,14 +37,13 @@ toolexeclib_LTLIBRARIES = libstdc++.la

 # Symbol versioning for shared libraries.
 if GLIBCXX_BUILD_VERSIONED_SHLIB
-port_specific_symbol_file = @port_specific_symbol_file@
 version_arg = -Wl,--version-script=libstdc++-symbol.ver
 libstdc++-symbol.ver:  ${glibcxx_srcdir}/@SYMVER_MAP@
 	cp ${glibcxx_srcdir}/@SYMVER_MAP@ ./libstdc++-symbol.ver
-	if test "x${port_specific_symbol_file}" != x; then \
+	if test "x@port_specific_symbol_files@" != x; then \
 	  sed -n '1,/DO NOT DELETE/p' $@ > tmp.top; \
 	  sed -n '/DO NOT DELETE/,$$p' $@ > tmp.bottom; \
-	  cat tmp.top $(port_specific_symbol_file) tmp.bottom > $@; \
+	  cat tmp.top @port_specific_symbol_file@ tmp.bottom > $@; \
 	  rm tmp.top tmp.bottom; \
 	fi
 else
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@ -133,6 +133,7 @@ glibcxx_toolexeclibdir = @glibcxx_toolexeclibdir@
 gxx_include_dir = @gxx_include_dir@
 ifGNUmake = @ifGNUmake@
 libtool_VERSION = @libtool_VERSION@
+port_specific_symbol_files = @port_specific_symbol_files@
 toplevel_srcdir = @toplevel_srcdir@

 AUTOMAKE_OPTIONS = 1.3 cygnus
@ -147,10 +148,7 @@ glibcxx_builddir = @glibcxx_builddir@
 toolexecdir = @glibcxx_toolexecdir@
 toolexeclibdir = @glibcxx_toolexeclibdir@
 toolexeclib_LTLIBRARIES = libstdc++.la
-
-# Symbol versioning for shared libraries.
-@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@port_specific_symbol_file = @GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@@port_specific_symbol_file@
-@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@version_arg = @GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@-Wl,--version-script=libstdc++-symbol.ver
+@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@version_arg = -Wl,--version-script=libstdc++-symbol.ver
@GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@version_arg = 

 # Compile flags that should be constant throughout the build, both for
@ -159,13 +157,11 @@ OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@

 # These bits are all figured out from configure. Look in acinclude.m4
 # or configure.in to see how they are set. See GLIBCXX_EXPORT_FLAGS
-CONFIG_CXXFLAGS = \
-	@SECTION_FLAGS@ @EXTRA_CXX_FLAGS@
+CONFIG_CXXFLAGS =  	@SECTION_FLAGS@ @EXTRA_CXX_FLAGS@


 # Warning flags to use.
-WARN_CXXFLAGS = \
-	@WARN_FLAGS@ $(WERROR) -fdiagnostics-show-location=once
+WARN_CXXFLAGS =  	@WARN_FLAGS@ $(WERROR) -fdiagnostics-show-location=once


 # Use common includes from acinclude.m4/GLIBCXX_EXPORT_INCLUDES
@ -174,79 +170,33 @@ LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
 LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
 TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@

-INCLUDES = \
-	-nostdinc++ \
-	$(GLIBCXX_INCLUDES) \
-	$(LIBSUPCXX_INCLUDES) $(LIBMATH_INCLUDES) \
-	$(TOPLEVEL_INCLUDES)
+INCLUDES =  	-nostdinc++ 	$(GLIBCXX_INCLUDES) 	$(LIBSUPCXX_INCLUDES) $(LIBMATH_INCLUDES) 	$(TOPLEVEL_INCLUDES)


 # Source files linked in via configuration/make substitution for a
 # particular host.
-host_sources = \
-	codecvt_members.cc \
-	collate_members.cc \
-	ctype_members.cc \
-	messages_members.cc \
-	monetary_members.cc \
-	numeric_members.cc \
-	time_members.cc
+host_sources =  	codecvt_members.cc 	collate_members.cc 	ctype_members.cc 	messages_members.cc 	monetary_members.cc 	numeric_members.cc 	time_members.cc


 # Source files linked in via configuration/make substitution for a
 # particular host, but with ad hoc naming rules.
-host_sources_extra = \
-	basic_file.cc \
-	c++locale.cc
+host_sources_extra =  	basic_file.cc 	c++locale.cc


 # Sources present in the src directory.
-sources = \
-	allocator-inst.cc \
-	codecvt.cc \
-	complex_io.cc \
-	concept-inst.cc \
-	ctype.cc \
-	demangle.cc \
-	ext-inst.cc \
-	fstream-inst.cc \
-	functexcept.cc \
-	globals.cc \
-	io-inst.cc \
-	ios.cc \
-	istream-inst.cc \
-	limits.cc \
-	locale.cc \
-	locale-inst.cc \
-	localename.cc \
-	misc-inst.cc \
-	ostream-inst.cc \
-	sstream-inst.cc \
-	stdexcept.cc \
-	stl_tree.cc \
-	streambuf-inst.cc \
-	string-inst.cc \
-	strstream.cc \
-	valarray-inst.cc \
-	wstring-inst.cc \
-	${host_sources} \
-	${host_sources_extra}
+sources =  	allocator-inst.cc 	codecvt.cc 	complex_io.cc 	concept-inst.cc 	ctype.cc 	demangle.cc 	ext-inst.cc 	fstream-inst.cc 	functexcept.cc 	globals.cc 	io-inst.cc 	ios.cc 	istream-inst.cc 	limits.cc 	locale.cc 	locale-inst.cc 	localename.cc 	misc-inst.cc 	ostream-inst.cc 	sstream-inst.cc 	stdexcept.cc 	stl_tree.cc 	streambuf-inst.cc 	string-inst.cc 	strstream.cc 	valarray-inst.cc 	wstring-inst.cc 	${host_sources} 	${host_sources_extra}


 VPATH = $(top_srcdir)/src:$(top_srcdir)

 libstdc___la_SOURCES = $(sources)

-libstdc___la_LIBADD = \
-	$(top_builddir)/libmath/libmath.la \
-	$(top_builddir)/libsupc++/libsupc++convenience.la
+libstdc___la_LIBADD =  	$(top_builddir)/libmath/libmath.la 	$(top_builddir)/libsupc++/libsupc++convenience.la


 libstdc___la_DEPENDENCIES = libstdc++-symbol.ver $(libstdc___la_LIBADD)

-libstdc___la_LDFLAGS = \
-	-version-info @libtool_VERSION@ ${version_arg} \
-	-lm @LIBUNWIND_FLAG@
+libstdc___la_LDFLAGS =  	-version-info @libtool_VERSION@ ${version_arg} 	-lm @LIBUNWIND_FLAG@


 # Use special rules for the deprecated source files so that they find
@ -258,12 +208,7 @@ GLIBCXX_INCLUDE_DIR = @glibcxx_builddir@/include
 # set this option because CONFIG_CXXFLAGS has to be after
 # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden
 # as the occasion calls for it.
-AM_CXXFLAGS = \
-	-fno-implicit-templates \
-	$(LIBSUPCXX_CXXFLAGS) \
-	$(WARN_CXXFLAGS) \
-	$(OPTIMIZE_CXXFLAGS) \
-	$(CONFIG_CXXFLAGS)
+AM_CXXFLAGS =  	-fno-implicit-templates 	$(LIBSUPCXX_CXXFLAGS) 	$(WARN_CXXFLAGS) 	$(OPTIMIZE_CXXFLAGS) 	$(CONFIG_CXXFLAGS)


 # libstdc++ libtool notes
@ -284,8 +229,7 @@ AM_CXXFLAGS = \
 # correct solution is to add `--tag CXX' to LTCXXCOMPILE and maybe
 # CXXLINK, just after $(LIBTOOL), so that libtool doesn't have to
 # attempt to infer which configuration to use
-LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) \
-	       $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) 	       $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS)


 # 3) We'd have a problem when building the shared libstdc++ object if
@ -294,8 +238,7 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) \
 # course is problematic at this point.  So, we get the top-level
 # directory to configure libstdc++-v3 to use gcc as the C++
 # compilation driver.
-CXXLINK = $(LIBTOOL) --tag CXX --mode=link $(CXX) \
-	  @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) --tag CXX --mode=link $(CXX) 	  @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@


 debugdir = debug
@ -325,7 +268,7 @@ DIST_COMMON =  Makefile.am Makefile.in

 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 SOURCES = $(libstdc___la_SOURCES)
 OBJECTS = $(libstdc___la_OBJECTS)
@ -437,7 +380,7 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
 	  awk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))

 mostlyclean-tags:

@ -545,10 +488,10 @@ mostlyclean distclean maintainer-clean

@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@libstdc++-symbol.ver:  ${glibcxx_srcdir}/@SYMVER_MAP@
@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@	cp ${glibcxx_srcdir}/@SYMVER_MAP@ ./libstdc++-symbol.ver
-@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@	if test "x${port_specific_symbol_file}" != x; then \
+@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@	if test "x@port_specific_symbol_files@" != x; then \
@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@	  sed -n '1,/DO NOT DELETE/p' $@ > tmp.top; \
@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@	  sed -n '/DO NOT DELETE/,$$p' $@ > tmp.bottom; \
-@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@	  cat tmp.top $(port_specific_symbol_file) tmp.bottom > $@; \
+@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@	  cat tmp.top @port_specific_symbol_file@ tmp.bottom > $@; \
@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@	  rm tmp.top tmp.bottom; \
@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@	fi
@GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@libstdc++-symbol.ver: