acinclude.m4 (GLIBCPP_CHECK_LINKER_FEATURES): Do not clear SECTION_LDFLAGS and OPT_LDFLAGS.

2002-01-16  David Edelsohn  <dje@watson.ibm.com>

	* acinclude.m4 (GLIBCPP_CHECK_LINKER_FEATURES): Do not clear
	SECTION_LDFLAGS and OPT_LDFLAGS.  Fix ac_sectionLDflags type.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.

From-SVN: r48941

5 files changed, 33 insertions, 25 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 15c4dd7..54211a6 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-16  David Edelsohn  <dje@watson.ibm.com>
+
+	* acinclude.m4 (GLIBCPP_CHECK_LINKER_FEATURES): Do not clear
+	SECTION_LDFLAGS and OPT_LDFLAGS.  Fix ac_sectionLDflags type.
+	* aclocal.m4: Regenerate.
+	* configure: Regenerate.
+	
 2002-01-16  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* include/Makefile.am (c_base_headers_rename): New.
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 2d55e53..21b3508 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -286,8 +286,8 @@ 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=''
+  test -z "$SECTION_LDFLAGS" && SECTION_LDFLAGS=''
+  test -z "$OPT_LDFLAGS" && OPT_LDFLAGS=''
   AC_REQUIRE([AC_PROG_LD])
 
   # Set --gc-sections.
@@ -323,7 +323,7 @@ AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [
       CFLAGS=''
     fi
     if test "$ac_sectionLDflags" = "yes"; then
-      SECTION_LDFLAGS='-Wl,--gc-sections'
+      SECTION_LDFLAGS="-Wl,--gc-sections $SECTION_LDFLAGS"
     fi
     AC_MSG_RESULT($ac_sectionLDflags)
   fi
@@ -331,7 +331,7 @@ AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [
   # Set linker optimization flags.
   if test x"$ac_cv_prog_gnu_ld" = x"yes" &&
      test x"$enable_debug" = x"no"; then
-    OPT_LDFLAGS='-Wl,-O1'
+    OPT_LDFLAGS="-Wl,-O1 $OPT_LDFLAGS"
   fi
 
   AC_SUBST(SECTION_LDFLAGS)
diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index b945d5a..8b4500b 100644
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -298,8 +298,8 @@ 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=''
+  test -z "$SECTION_LDFLAGS" && SECTION_LDFLAGS=''
+  test -z "$OPT_LDFLAGS" && OPT_LDFLAGS=''
   AC_REQUIRE([AC_PROG_LD])
 
   # Set --gc-sections.
@@ -335,7 +335,7 @@ AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [
       CFLAGS=''
     fi
     if test "$ac_sectionLDflags" = "yes"; then
-      SECTION_LDFLAGS='-Wl,--gc-sections'
+      SECTION_LDFLAGS="-Wl,--gc-sections $SECTION_LDFLAGS"
     fi
     AC_MSG_RESULT($ac_sectionLDflags)
   fi
@@ -343,7 +343,7 @@ AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [
   # Set linker optimization flags.
   if test x"$ac_cv_prog_gnu_ld" = x"yes" &&
      test x"$enable_debug" = x"no"; then
-    OPT_LDFLAGS='-Wl,-O1'
+    OPT_LDFLAGS="-Wl,-O1 $OPT_LDFLAGS"
   fi
 
   AC_SUBST(SECTION_LDFLAGS)
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index d07776b..4213dc0 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -4043,8 +4043,8 @@ done
   # 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=''
+  test -z "$SECTION_LDFLAGS" && SECTION_LDFLAGS=''
+  test -z "$OPT_LDFLAGS" && OPT_LDFLAGS=''
   
 
   # Set --gc-sections.
@@ -4100,7 +4100,7 @@ fi
       CFLAGS=''
     fi
     if test "$ac_sectionLDflags" = "yes"; then
-      SECTION_LDFLAGS='-Wl,--gc-sections'
+      SECTION_LDFLAGS="-Wl,--gc-sections $SECTION_LDFLAGS"
     fi
     echo "$ac_t""$ac_sectionLDflags" 1>&6
   fi
@@ -4108,7 +4108,7 @@ fi
   # Set linker optimization flags.
   if test x"$ac_cv_prog_gnu_ld" = x"yes" &&
      test x"$enable_debug" = x"no"; then
-    OPT_LDFLAGS='-Wl,-O1'
+    OPT_LDFLAGS="-Wl,-O1 $OPT_LDFLAGS"
   fi
 
   
@@ -4854,8 +4854,8 @@ done
   # 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=''
+  test -z "$SECTION_LDFLAGS" && SECTION_LDFLAGS=''
+  test -z "$OPT_LDFLAGS" && OPT_LDFLAGS=''
   
 
   # Set --gc-sections.
@@ -4911,7 +4911,7 @@ fi
       CFLAGS=''
     fi
     if test "$ac_sectionLDflags" = "yes"; then
-      SECTION_LDFLAGS='-Wl,--gc-sections'
+      SECTION_LDFLAGS="-Wl,--gc-sections $SECTION_LDFLAGS"
     fi
     echo "$ac_t""$ac_sectionLDflags" 1>&6
   fi
@@ -4919,7 +4919,7 @@ fi
   # Set linker optimization flags.
   if test x"$ac_cv_prog_gnu_ld" = x"yes" &&
      test x"$enable_debug" = x"no"; then
-    OPT_LDFLAGS='-Wl,-O1'
+    OPT_LDFLAGS="-Wl,-O1 $OPT_LDFLAGS"
   fi
 
   
@@ -5659,8 +5659,8 @@ done
   # 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=''
+  test -z "$SECTION_LDFLAGS" && SECTION_LDFLAGS=''
+  test -z "$OPT_LDFLAGS" && OPT_LDFLAGS=''
   
 
   # Set --gc-sections.
@@ -5716,7 +5716,7 @@ fi
       CFLAGS=''
     fi
     if test "$ac_sectionLDflags" = "yes"; then
-      SECTION_LDFLAGS='-Wl,--gc-sections'
+      SECTION_LDFLAGS="-Wl,--gc-sections $SECTION_LDFLAGS"
     fi
     echo "$ac_t""$ac_sectionLDflags" 1>&6
   fi
@@ -5724,7 +5724,7 @@ fi
   # Set linker optimization flags.
   if test x"$ac_cv_prog_gnu_ld" = x"yes" &&
      test x"$enable_debug" = x"no"; then
-    OPT_LDFLAGS='-Wl,-O1'
+    OPT_LDFLAGS="-Wl,-O1 $OPT_LDFLAGS"
   fi
 
   
@@ -6786,8 +6786,8 @@ cross_compiling=$ac_cv_prog_cc_cross
   # 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=''
+  test -z "$SECTION_LDFLAGS" && SECTION_LDFLAGS=''
+  test -z "$OPT_LDFLAGS" && OPT_LDFLAGS=''
   
 
   # Set --gc-sections.
@@ -6843,7 +6843,7 @@ fi
       CFLAGS=''
     fi
     if test "$ac_sectionLDflags" = "yes"; then
-      SECTION_LDFLAGS='-Wl,--gc-sections'
+      SECTION_LDFLAGS="-Wl,--gc-sections $SECTION_LDFLAGS"
     fi
     echo "$ac_t""$ac_sectionLDflags" 1>&6
   fi
@@ -6851,7 +6851,7 @@ fi
   # Set linker optimization flags.
   if test x"$ac_cv_prog_gnu_ld" = x"yes" &&
      test x"$enable_debug" = x"no"; then
-    OPT_LDFLAGS='-Wl,-O1'
+    OPT_LDFLAGS="-Wl,-O1 $OPT_LDFLAGS"
   fi
 
   
diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
index 0e0a935..633e832 100644
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -681,7 +681,8 @@ install-data-local:
 # Stop implicit '.o' make rules from ever stomping on extensionless
 # headers, in the improbable case where some foolish, crack-addled
 # developer tries to create them via make in the include build
-# directory.
+# directory. (This is more of an example of how this kind of rule can
+# be made.)
 .PRECIOUS: $(std_headers_rename) $(c_base_headers_rename)
 $(std_headers_rename): ; @:
 $(c_base_headers_rename): ; @: