via Alexandre Oliva <aoliva@redhat.com>

2000-10-17  Benjamin Kosnik  <bkoz@purist.soma.redhat.com>

	via Alexandre Oliva  <aoliva@redhat.com>
	* libsupc++/Makefile.am: Add --tag CXX, --tag CC, comments.
	* libsupc++/Makefile.in: Regenerate.
	* src/Makefile.am: Duplicate code.
	* src/Makefile.in: Regenerate.

	* acinclude.m4 (GLIBCPP_ENABLE_RELIBGCC): Take this out.
	* aclocal.m4: Regenerate.
	* configure.in: And here.
	* configure: Regenerate.

	* acinclude.m4 (GLIBCPP_CHECK_LINKER_FEATURES): Disable
	test for SECTION_LDFLAGS.

From-SVN: r36902

libstdc++-v3/ChangeLog

@@ -1,3 +1,19 @@
+2000-10-17  Benjamin Kosnik  <bkoz@purist.soma.redhat.com>
+
+	via Alexandre Oliva  <aoliva@redhat.com>
+	* libsupc++/Makefile.am: Add --tag CXX, --tag CC, comments.
+	* libsupc++/Makefile.in: Regenerate.
+	* src/Makefile.am: Duplicate code.
+	* src/Makefile.in: Regenerate.
+	
+	* acinclude.m4 (GLIBCPP_ENABLE_RELIBGCC): Take this out.
+	* aclocal.m4: Regenerate.
+	* configure.in: And here.
+	* configure: Regenerate.
+
+	* acinclude.m4 (GLIBCPP_CHECK_LINKER_FEATURES): Disable
+	test for SECTION_LDFLAGS.
+
 2000-10-16  Benjamin Kosnik  <bkoz@gnu.org>
 
 	Shadow headers would work if libsupc++ was strict about namespaces.

libstdc++-v3/Makefile.in

@@ -76,7 +76,6 @@ DEBUG_FLAGS = @DEBUG_FLAGS@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
 EXTRA_CXX_FLAGS = @EXTRA_CXX_FLAGS@
-GCC_OBJDIR = @GCC_OBJDIR@
 GCJ = @GCJ@
 GCJFLAGS = @GCJFLAGS@
 GLIBCPP_CFLAGS = @GLIBCPP_CFLAGS@

libstdc++-v3/acinclude.m4

@@ -255,29 +255,33 @@ AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [
   # If we're not using GNU ld, then there's no point in even trying these
   # tests.  Check for that first.  We should have already tested for gld
   # by now (in libtool), but require it now just to be safe...
+  SECTION_LDFLAGS=''
+  OPT_LDFLAGS=''
   AC_REQUIRE([AC_PROG_LD])
-  if test "$ac_cv_prog_gnu_ld" = "no"; then
+  if test "$ac_cv_prog_gnu_ld" = "yes"; then
-    SECTION_LDFLAGS=''
+    # GNU ld it is!  Joy and bunny rabbits!
-    OPT_LDFLAGS=''
-
-  else   # GNU ld it is!  Joy and bunny rabbits!
 
     # All these tests are for C++; save the language and the compiler flags.
     # Need to do this so that g++ won't try to link in libstdc++
     ac_test_CFLAGS="${CFLAGS+set}"
     ac_save_CFLAGS="$CFLAGS"
-    CFLAGS='-x c++  -Wl,--gc-sections'
+#    CFLAGS='-x c++  -Wl,--gc-sections'
+#XXX
+    CFLAGS=''
 
     # Check for -Wl,--gc-sections
     # XXX This test is broken at the moment, as symbols required for
     # linking are now in libsupc++ (not built yet.....). In addition, 
-    # this test has cored on solaris in the past.
+    # this test has cored on solaris in the past. In addition,
+    # --gc-sections doesn't really work at the moment (keeps on discarding
+    # used sections, first .eh_frame and now some of the glibc sections for
+    # iconv). Bzzzzt. Thanks for playing, maybe next time.
     AC_MSG_CHECKING([for ld that supports -Wl,--gc-sections])
     AC_TRY_RUN([
      int main(void) 
      {
-       //try { throw 1; }
+       try { throw 1; }
-       //catch (...) { };
+       catch (...) { };
        return 0;
      }
     ], [ac_sectionLDflags=yes],[ac_sectionLFflags=no], [ac_sectionLDflags=yes])
@@ -288,9 +292,12 @@ AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [
       CFLAGS=''
     fi
     if test "$ac_sectionLDflags" = "yes"; then
-      SECTION_LDFLAGS='-Wl,--gc-sections'
+#      SECTION_LDFLAGS='-Wl,--gc-sections'
+#XXX
+      SECTION_LDFLAGS=''
     fi
     AC_MSG_RESULT($ac_sectionLDflags)
+
     OPT_LDFLAGS='-Wl,-O1'
 
   fi
@@ -1177,48 +1184,6 @@ AC_SUBST(EXTRA_CXX_FLAGS)
 ])
 
 
-dnl
-dnl Check for instructions to automatically rebuild libgcc.a.  Requires,
-dnl of course, the location of the gcc objdir.  Note that if --disable-
-dnl namespaces is in effect, rebuilding libgcc.a is an expensive no-op.
-dnl
-dnl GLIBCPP_ENABLE_RELIBGCC
-dnl --enable-libgcc-rebuild=/absolute/path/to/gcc/objdir sets GCC_OBJDIR
-dnl     (presumably in the top-level Makefile) to /absol.../objdir
-dnl --disable-libgcc-rebuild will not touch libgcc.a at all (maybe print
-dnl     a warning if this is given along with --enable-namespaces), by
-dnl     setting GCC_OBJDIR to `no'.
-dnl  +  Doing this by default is going to be interesting.  What default
-dnl     "on" value can there be?
-dnl  +  Usage:  GLIBCPP_ENABLE_RELIBGCC[(DEFAULT)]
-dnl       The default path should be ../.. if bundled with GCC source.
-dnl       If ommitted, it defaults to `no'.
-dnl
-AC_DEFUN(GLIBCPP_ENABLE_RELIBGCC, [dnl
-define([GLIBCPP_ENABLE_RELIBGCC_DEFAULT], ifelse($1,, no, $1))dnl
-AC_ARG_ENABLE(libgcc-rebuild,
-changequote(<<, >>)dnl
-<<  --enable-libgcc-rebuild=DIR     also rebuild libgcc.a; DIR is
-                                  the GCC objdir; see install.html>>,
-changequote([, ])dnl
-[case "$enableval" in
- yes) AC_MSG_ERROR([--enable-libgcc-rebuild needs a pathname]) ;;
- no)  enable_libgcc_rebuild=no ;;
- *)   if test -d "$enableval" && test -d "${enableval}/gcc" && \
-         test -d "${enableval}/libiberty"
-      then
-         enable_libgcc_rebuild="$enableval"
-      else
-         AC_MSG_ERROR(["$enableval" does not appear to be the GCC objdir])
-      fi
-      ;;
- esac],
-enable_libgcc_rebuild=GLIBCPP_ENABLE_RELIBGCC_DEFAULT)dnl
-GCC_OBJDIR="$enable_libgcc_rebuild"
-AC_SUBST(GCC_OBJDIR)
-])
-
-
 dnl
 dnl Check for which I/O library to use:  libio, or something specific.
 dnl

libstdc++-v3/aclocal.m4

@@ -267,29 +267,33 @@ AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [
   # If we're not using GNU ld, then there's no point in even trying these
   # tests.  Check for that first.  We should have already tested for gld
   # by now (in libtool), but require it now just to be safe...
+  SECTION_LDFLAGS=''
+  OPT_LDFLAGS=''
   AC_REQUIRE([AC_PROG_LD])
-  if test "$ac_cv_prog_gnu_ld" = "no"; then
+  if test "$ac_cv_prog_gnu_ld" = "yes"; then
-    SECTION_LDFLAGS=''
+    # GNU ld it is!  Joy and bunny rabbits!
-    OPT_LDFLAGS=''
-
-  else   # GNU ld it is!  Joy and bunny rabbits!
 
     # All these tests are for C++; save the language and the compiler flags.
     # Need to do this so that g++ won't try to link in libstdc++
     ac_test_CFLAGS="${CFLAGS+set}"
     ac_save_CFLAGS="$CFLAGS"
-    CFLAGS='-x c++  -Wl,--gc-sections'
+#    CFLAGS='-x c++  -Wl,--gc-sections'
+#XXX
+    CFLAGS=''
 
     # Check for -Wl,--gc-sections
     # XXX This test is broken at the moment, as symbols required for
     # linking are now in libsupc++ (not built yet.....). In addition, 
-    # this test has cored on solaris in the past.
+    # this test has cored on solaris in the past. In addition,
+    # --gc-sections doesn't really work at the moment (keeps on discarding
+    # used sections, first .eh_frame and now some of the glibc sections for
+    # iconv). Bzzzzt. Thanks for playing, maybe next time.
     AC_MSG_CHECKING([for ld that supports -Wl,--gc-sections])
     AC_TRY_RUN([
      int main(void) 
      {
-       //try { throw 1; }
+       try { throw 1; }
-       //catch (...) { };
+       catch (...) { };
        return 0;
      }
     ], [ac_sectionLDflags=yes],[ac_sectionLFflags=no], [ac_sectionLDflags=yes])
@@ -300,9 +304,12 @@ AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [
       CFLAGS=''
     fi
     if test "$ac_sectionLDflags" = "yes"; then
-      SECTION_LDFLAGS='-Wl,--gc-sections'
+#      SECTION_LDFLAGS='-Wl,--gc-sections'
+#XXX
+      SECTION_LDFLAGS=''
     fi
     AC_MSG_RESULT($ac_sectionLDflags)
+
     OPT_LDFLAGS='-Wl,-O1'
 
   fi
@@ -1189,48 +1196,6 @@ AC_SUBST(EXTRA_CXX_FLAGS)
 ])
 
 
-dnl
-dnl Check for instructions to automatically rebuild libgcc.a.  Requires,
-dnl of course, the location of the gcc objdir.  Note that if --disable-
-dnl namespaces is in effect, rebuilding libgcc.a is an expensive no-op.
-dnl
-dnl GLIBCPP_ENABLE_RELIBGCC
-dnl --enable-libgcc-rebuild=/absolute/path/to/gcc/objdir sets GCC_OBJDIR
-dnl     (presumably in the top-level Makefile) to /absol.../objdir
-dnl --disable-libgcc-rebuild will not touch libgcc.a at all (maybe print
-dnl     a warning if this is given along with --enable-namespaces), by
-dnl     setting GCC_OBJDIR to `no'.
-dnl  +  Doing this by default is going to be interesting.  What default
-dnl     "on" value can there be?
-dnl  +  Usage:  GLIBCPP_ENABLE_RELIBGCC[(DEFAULT)]
-dnl       The default path should be ../.. if bundled with GCC source.
-dnl       If ommitted, it defaults to `no'.
-dnl
-AC_DEFUN(GLIBCPP_ENABLE_RELIBGCC, [dnl
-define([GLIBCPP_ENABLE_RELIBGCC_DEFAULT], ifelse($1,, no, $1))dnl
-AC_ARG_ENABLE(libgcc-rebuild,
-changequote(<<, >>)dnl
-<<  --enable-libgcc-rebuild=DIR     also rebuild libgcc.a; DIR is
-                                  the GCC objdir; see install.html>>,
-changequote([, ])dnl
-[case "$enableval" in
- yes) AC_MSG_ERROR([--enable-libgcc-rebuild needs a pathname]) ;;
- no)  enable_libgcc_rebuild=no ;;
- *)   if test -d "$enableval" && test -d "${enableval}/gcc" && \
-         test -d "${enableval}/libiberty"
-      then
-         enable_libgcc_rebuild="$enableval"
-      else
-         AC_MSG_ERROR(["$enableval" does not appear to be the GCC objdir])
-      fi
-      ;;
- esac],
-enable_libgcc_rebuild=GLIBCPP_ENABLE_RELIBGCC_DEFAULT)dnl
-GCC_OBJDIR="$enable_libgcc_rebuild"
-AC_SUBST(GCC_OBJDIR)
-])
-
-
 dnl
 dnl Check for which I/O library to use:  libio, or something specific.
 dnl

libstdc++-v3/configure.in

@@ -38,7 +38,6 @@ GLIBCPP_ENABLE_LONG_LONG(yes)
 GLIBCPP_ENABLE_SHADOW(no)
 GLIBCPP_ENABLE_THREADS
 GLIBCPP_ENABLE_ATOMICITY
-#GLIBCPP_ENABLE_RELIBGCC([../..])
 GLIBCPP_ENABLE_CXX_FLAGS([none])
 
 
@@ -245,16 +244,10 @@ if test ! -f stamp-limits; then
   touch stamp-limits
 fi
 
+
 # Sanity checking & User-visible messages.
 # Checks down here, otherwise they get scrolled off before
 # the user will notice.
-if test "$enable_libgcc_rebuild" = "no"; then
-  AC_MSG_WARN([libgcc.a will not match mangled symbols unless it is rebuilt])
-else
-  # Other things besides namespaces can make this true as well, but none
-  # of them are done automatically... yet
-  AC_MSG_WARN([no point in rebuilding libgcc.a if namespaces aren't used])
-fi
 
 # Trying to get more people to read documentation.  Possibly remove
 # check and warn all the time. There is no "informational" AC_MSG_

libstdc++-v3/libio/Makefile.in

@@ -74,7 +74,6 @@ DEBUG_FLAGS = @DEBUG_FLAGS@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
 EXTRA_CXX_FLAGS = @EXTRA_CXX_FLAGS@
-GCC_OBJDIR = @GCC_OBJDIR@
 GCJ = @GCJ@
 GCJFLAGS = @GCJFLAGS@
 GLIBCPP_CFLAGS = @GLIBCPP_CFLAGS@

libstdc++-v3/libmath/Makefile.in

@@ -74,7 +74,6 @@ DEBUG_FLAGS = @DEBUG_FLAGS@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
 EXTRA_CXX_FLAGS = @EXTRA_CXX_FLAGS@
-GCC_OBJDIR = @GCC_OBJDIR@
 GCJ = @GCJ@
 GCJFLAGS = @GCJFLAGS@
 GLIBCPP_CFLAGS = @GLIBCPP_CFLAGS@

libstdc++-v3/libsupc++/Makefile.am

@@ -116,10 +116,10 @@ LIBTOOL = @LIBTOOL@ --tag disable-shared
 LIBSUPCXX_CXXFLAGS = -prefer-pic
 
 # AM_CXXFLAGS needs to be in each subdirectory so that it can be
-# modified in a per-library or per-sub-library way.
+# modified in a per-library or per-sub-library way.  Need to manually
-# Need to manually set this option because CONFIG_CXXFLAGS has to be at
+# set this option because CONFIG_CXXFLAGS has to be after
-# the end of the compile line so that -O2 can be overridden as the
+# OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden
-# occasion call for it. (ie, --enable-debug)
+# as the occasion call for it. (ie, --enable-debug)
 AM_CXXFLAGS = \
 	-fno-implicit-templates \
 	$(LIBSUPCXX_CXXFLAGS) \
@@ -127,21 +127,31 @@ AM_CXXFLAGS = \
 	$(OPTIMIZE_CXXFLAGS) \
 	$(CONFIG_CXXFLAGS) 
 
-# Need to explicitly set this so that AM_CXXFLAGS is last. In
+
-# addition, we don't use $(DEFS), which tries to set $(top_srcdir) as
+# libstdc++ libtool notes
-# an include diretory, which screws up shadow headers. (That way,
+
-# things like -O2 passed down from the toplevel can be overridden by
+# 1) Need to explicitly set LTCXXCOMPILE so that AM_CXXFLAGS is
-# --enable-debug.)
+# last. (That way, things like -O2 passed down from the toplevel can
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(INCLUDES) \
+# be overridden by --enable-debug.)
+
+# 2) In general, libtool expects an argument such as `--tag=CXX' when
+# using the C++ compiler, because that will enable the settings
+# detected when C++ support was being configured.  However, when no
+# such flag is given in the command line, libtool attempts to figure
+# it out by matching the compiler name in each configuration section
+# against a prefix of the command line.  The problem is that, if the
+# compiler name and its initial flags stored in the libtool
+# configuration file don't match those in the command line, libtool
+# can't decide which configuration to use, and it gives up.  The
+# 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) 
 
-# We have a problem when building the shared libstdc++ object if the
+# 3) We have a problem when building the shared libstdc++ object if
-# rules automake generates would be used.  We cannot allow CXX to be used
+# the rules automake generates would be used.  We cannot allow CXX to
-# in libtool since this would add -lstdc++ to the link line which of
+# be used in libtool since this would add -lstdc++ to the link line
-# course is impossible.
+# which of course is problematic at this point.
-CXXLINK = $(LIBTOOL) --mode=link "$(CC)" @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) --tag CC --mode=link "$(CC)" \
-
+	  @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
-
-
-
-

libstdc++-v3/libsupc++/Makefile.in

@@ -74,7 +74,6 @@ DEBUG_FLAGS = @DEBUG_FLAGS@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
 EXTRA_CXX_FLAGS = @EXTRA_CXX_FLAGS@
-GCC_OBJDIR = @GCC_OBJDIR@
 GCJ = @GCJ@
 GCJFLAGS = @GCJFLAGS@
 GLIBCPP_CFLAGS = @GLIBCPP_CFLAGS@
@@ -164,26 +163,40 @@ LIBTOOL = @LIBTOOL@ --tag disable-shared
 LIBSUPCXX_CXXFLAGS = -prefer-pic
 
 # AM_CXXFLAGS needs to be in each subdirectory so that it can be
-# modified in a per-library or per-sub-library way.
+# modified in a per-library or per-sub-library way.  Need to manually
-# Need to manually set this option because CONFIG_CXXFLAGS has to be at
+# set this option because CONFIG_CXXFLAGS has to be after
-# the end of the compile line so that -O2 can be overridden as the
+# OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden
-# occasion call for it. (ie, --enable-debug)
+# as the occasion call for it. (ie, --enable-debug)
 AM_CXXFLAGS =  	-fno-implicit-templates 	$(LIBSUPCXX_CXXFLAGS) 	$(WARN_CXXFLAGS) 	$(OPTIMIZE_CXXFLAGS) 	$(CONFIG_CXXFLAGS) 
 
 
-# Need to explicitly set this so that AM_CXXFLAGS is last. In
+# libstdc++ libtool notes
-# addition, we don't use $(DEFS), which tries to set $(top_srcdir) as
+
-# an include diretory, which screws up shadow headers. (That way,
+# 1) Need to explicitly set LTCXXCOMPILE so that AM_CXXFLAGS is
-# things like -O2 passed down from the toplevel can be overridden by
+# last. (That way, things like -O2 passed down from the toplevel can
-# --enable-debug.)
+# be overridden by --enable-debug.)
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(INCLUDES) 	       $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) 
+
+# 2) In general, libtool expects an argument such as `--tag=CXX' when
+# using the C++ compiler, because that will enable the settings
+# detected when C++ support was being configured.  However, when no
+# such flag is given in the command line, libtool attempts to figure
+# it out by matching the compiler name in each configuration section
+# against a prefix of the command line.  The problem is that, if the
+# compiler name and its initial flags stored in the libtool
+# configuration file don't match those in the command line, libtool
+# can't decide which configuration to use, and it gives up.  The
+# 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) 
 
 
-# We have a problem when building the shared libstdc++ object if the
+# 3) We have a problem when building the shared libstdc++ object if
-# rules automake generates would be used.  We cannot allow CXX to be used
+# the rules automake generates would be used.  We cannot allow CXX to
-# in libtool since this would add -lstdc++ to the link line which of
+# be used in libtool since this would add -lstdc++ to the link line
-# course is impossible.
+# which of course is problematic at this point.
-CXXLINK = $(LIBTOOL) --mode=link "$(CC)" @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) --tag CC --mode=link "$(CC)" 	  @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
+
 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 

libstdc++-v3/src/Makefile.am

@@ -21,7 +21,7 @@
 ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 ## USA.
 
-## $Id: Makefile.am,v 1.40 2000/10/12 12:02:10 bkoz Exp $
+## $Id: Makefile.am,v 1.41 2000/10/15 08:45:33 bkoz Exp $
 
 AUTOMAKE_OPTIONS = 1.3 gnits
 MAINT_CHARSET = latin1
@@ -300,36 +300,42 @@ tmp-libstdc++.INC: Makefile
 
 
 # AM_CXXFLAGS needs to be in each subdirectory so that it can be
-# modified in a per-library or per-sub-library way.
+# modified in a per-library or per-sub-library way.  Need to manually
-# Need to manually set this option because CONFIG_CXXFLAGS has to be at
+# set this option because CONFIG_CXXFLAGS has to be after
-# the end of the compile line so that -O2 can be overridden as the
+# OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden
-# occasion call for it. (ie, --enable-debug)
+# as the occasion call for it. (ie, --enable-debug)
 AM_CXXFLAGS = \
 	-fno-implicit-templates \
+	$(LIBSUPCXX_CXXFLAGS) \
 	$(WARN_CXXFLAGS) \
 	$(OPTIMIZE_CXXFLAGS) \
 	$(CONFIG_CXXFLAGS) 
 
-# Need to explicitly set this so that AM_CXXFLAGS is last. In
+
-# addition, we don't use $(DEFS), which tries to set $(top_srcdir) as
+# libstdc++ libtool notes
-# an include diretory, which screws up shadow headers. (That way,
+
-# things like -O2 passed down from the toplevel can be overridden by
+# 1) Need to explicitly set LTCXXCOMPILE so that AM_CXXFLAGS is
-# --enable-debug.)
+# last. (That way, things like -O2 passed down from the toplevel can
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(INCLUDES) \
+# be overridden by --enable-debug.)
+
+# 2) In general, libtool expects an argument such as `--tag=CXX' when
+# using the C++ compiler, because that will enable the settings
+# detected when C++ support was being configured.  However, when no
+# such flag is given in the command line, libtool attempts to figure
+# it out by matching the compiler name in each configuration section
+# against a prefix of the command line.  The problem is that, if the
+# compiler name and its initial flags stored in the libtool
+# configuration file don't match those in the command line, libtool
+# can't decide which configuration to use, and it gives up.  The
+# 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) 
 
-# We have a problem when building the shared libstdc++ object if the
+# 3) We have a problem when building the shared libstdc++ object if
-# rules automake generates would be used.  We cannot allow CXX to be used
+# the rules automake generates would be used.  We cannot allow CXX to
-# in libtool since this would add -lstdc++ to the link line which of
+# be used in libtool since this would add -lstdc++ to the link line
-# course is impossible.
+# which of course is problematic at this point.
-CXXLINK = $(LIBTOOL) --mode=link "$(CC)" @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) --tag CC --mode=link "$(CC)" \
-
+	  @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
-
-
-
-
-
-
-
-
-

libstdc++-v3/src/Makefile.in

@@ -73,7 +73,6 @@ DEBUG_FLAGS = @DEBUG_FLAGS@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
 EXTRA_CXX_FLAGS = @EXTRA_CXX_FLAGS@
-GCC_OBJDIR = @GCC_OBJDIR@
 GCJ = @GCJ@
 GCJFLAGS = @GCJFLAGS@
 GLIBCPP_CFLAGS = @GLIBCPP_CFLAGS@
@@ -189,26 +188,40 @@ libstdc___la_DEPENDENCIES = $(libstdc___la_LIBADD)
 @GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@myincludep = $(prefix)/include/g++-@libstdcxx_interface@
 
 # AM_CXXFLAGS needs to be in each subdirectory so that it can be
-# modified in a per-library or per-sub-library way.
+# modified in a per-library or per-sub-library way.  Need to manually
-# Need to manually set this option because CONFIG_CXXFLAGS has to be at
+# set this option because CONFIG_CXXFLAGS has to be after
-# the end of the compile line so that -O2 can be overridden as the
+# OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden
-# occasion call for it. (ie, --enable-debug)
+# as the occasion call for it. (ie, --enable-debug)
-AM_CXXFLAGS =  	-fno-implicit-templates 	$(WARN_CXXFLAGS) 	$(OPTIMIZE_CXXFLAGS) 	$(CONFIG_CXXFLAGS) 
+AM_CXXFLAGS =  	-fno-implicit-templates 	$(LIBSUPCXX_CXXFLAGS) 	$(WARN_CXXFLAGS) 	$(OPTIMIZE_CXXFLAGS) 	$(CONFIG_CXXFLAGS) 
 
 
-# Need to explicitly set this so that AM_CXXFLAGS is last. In
+# libstdc++ libtool notes
-# addition, we don't use $(DEFS), which tries to set $(top_srcdir) as
+
-# an include diretory, which screws up shadow headers. (That way,
+# 1) Need to explicitly set LTCXXCOMPILE so that AM_CXXFLAGS is
-# things like -O2 passed down from the toplevel can be overridden by
+# last. (That way, things like -O2 passed down from the toplevel can
-# --enable-debug.)
+# be overridden by --enable-debug.)
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(INCLUDES) 	       $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) 
+
+# 2) In general, libtool expects an argument such as `--tag=CXX' when
+# using the C++ compiler, because that will enable the settings
+# detected when C++ support was being configured.  However, when no
+# such flag is given in the command line, libtool attempts to figure
+# it out by matching the compiler name in each configuration section
+# against a prefix of the command line.  The problem is that, if the
+# compiler name and its initial flags stored in the libtool
+# configuration file don't match those in the command line, libtool
+# can't decide which configuration to use, and it gives up.  The
+# 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) 
 
 
-# We have a problem when building the shared libstdc++ object if the
+# 3) We have a problem when building the shared libstdc++ object if
-# rules automake generates would be used.  We cannot allow CXX to be used
+# the rules automake generates would be used.  We cannot allow CXX to
-# in libtool since this would add -lstdc++ to the link line which of
+# be used in libtool since this would add -lstdc++ to the link line
-# course is impossible.
+# which of course is problematic at this point.
-CXXLINK = $(LIBTOOL) --mode=link "$(CC)" @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) --tag CC --mode=link "$(CC)" 	  @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
+
 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES =