[multiple changes]

2003-06-16  Andreas Jaeger  <aj@suse.de>

	* acinclude.m4 (GLIBCPP_CONFIGURE_TESTSUITE): Make
	check-abi multilib aware.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.

2003-06-16  Benjamin Kosnik  <bkoz@redhat.com>
            Andreas Jaeger  <aj@suse.de>

	* configure.host: Set x86_64 abi_baseline pair correctly.

From-SVN: r68029

libstdc++-v3/ChangeLog

+2003-06-16  Andreas Jaeger  <aj@suse.de>
+
+	* acinclude.m4 (GLIBCPP_CONFIGURE_TESTSUITE): Make
+	check-abi multilib aware.
+	* aclocal.m4: Regenerate.
+	* configure: Regenerate.
+	
+2003-06-16  Benjamin Kosnik  <bkoz@redhat.com>
+            Andreas Jaeger  <aj@suse.de>
+
+	* configure.host: Set x86_64 abi_baseline pair correctly.
+
 2003-06-16  Paolo Carlini  <pcarlini@unitus.it>
 
 	* testsuite/27_io/basic_filebuf/sungetc/char/1.cc: Split and
@@ -26,6 +38,8 @@
 	* config/abi/x86_64-linux-gnu: ...this.
 	* config/abi/i386-unknown-freebsd4: To...
 	* config/abi/i386-freebsd4: ...this.
+	* config/linker-map.gnu: Cleanups, move libsupc++ bits into
+	CXXABI.
 	* configure.host: abi_baseline_triplet to abi_baseline_pair.
 	Simplify cpu bits so that abi_baseline_pair can use the same
 	cpu configuration.

libstdc++-v3/acinclude.m4

@@ -2055,7 +2055,7 @@ AC_DEFUN(GLIBCPP_CONFIGURE_TESTSUITE, [
   GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_3(setenv)
 
   # Export file names for ABI checking.
-  baseline_file="${glibcpp_srcdir}/config/abi/${abi_baseline_pair}/baseline_symbols.txt"
+  baseline_file="${glibcpp_srcdir}/config/abi/${abi_baseline_pair}\$(MULTISUBDIR)/baseline_symbols.txt"
   AC_SUBST(baseline_file)
 
   dnl XXX move to configure.host?

libstdc++-v3/aclocal.m4

@@ -2067,7 +2067,7 @@ AC_DEFUN(GLIBCPP_CONFIGURE_TESTSUITE, [
   GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_3(setenv)
 
   # Export file names for ABI checking.
-  baseline_file="${glibcpp_srcdir}/config/abi/${abi_baseline_pair}/baseline_symbols.txt"
+  baseline_file="${glibcpp_srcdir}/config/abi/${abi_baseline_pair}\$(MULTISUBDIR)/baseline_symbols.txt"
   AC_SUBST(baseline_file)
 
   dnl XXX move to configure.host?

libstdc++-v3/configure

@@ -23472,7 +23472,7 @@ done
 
 
   # Export file names for ABI checking.
-  baseline_file="${glibcpp_srcdir}/config/abi/${abi_baseline_pair}/baseline_symbols.txt"
+  baseline_file="${glibcpp_srcdir}/config/abi/${abi_baseline_pair}\$(MULTISUBDIR)/baseline_symbols.txt"
   
 
     case "$target" in

libstdc++-v3/configure.host

@@ -97,23 +97,12 @@ case "${host_cpu}" in
     ;;
 esac
 
-
-# Now look for the file(s) usually tied to a CPU model, and make default
-# choices for those if they haven't been explicitly set already.
-cpu_include_dir="cpu/${try_cpu}"  
+# Now look for the file(s) usually tied to a CPU model, and make
+# default choices for those if they haven't been explicitly set
+# already.  
+cpu_include_dir="cpu/${try_cpu}"
 ATOMICITYH=$cpu_include_dir
-
-
-# Check whether ABI baseline file exists, if not try to guess name.
 abi_baseline_pair=${try_cpu}-${host_os}
-try_baseline_file=config/abi/${abi_baseline_pair}/baseline_symbols.txt
-if test ! -e ${glibcpp_srcdir}/${try_baseline_file} ; then
-  case "${host}" in
-    i*86-*-freebsd4*)
-      abi_baseline_pair="i386-freebsd4"
-      ;;
-  esac  
-fi
 
 
 # Set any OS-dependent bits.
@@ -199,4 +188,10 @@ case "${host}" in
   mips*-*-linux*)
     ATOMICITYH="cpu/mips"
     ;;
+  x86_64-*-linux*)
+    abi_baseline_pair="x86_64-linux-gnu"
+    ;;
+  i*86-*-freebsd4*)
+    abi_baseline_pair="i386-freebsd4"
+    ;;
 esac