GCC 4.2.0 release C++ standard library and runtime support code.

1 files changed, 110 insertions, 51 deletions

diff --git a/contrib/libstdc++/configure.host b/contrib/libstdc++/configure.host
index 0c511e7..441eb4c 100644
--- a/contrib/libstdc++/configure.host
+++ b/contrib/libstdc++/configure.host
@@ -17,8 +17,8 @@
 # It sets the following shell variables:
 #
 #   cpu_include_dir        CPU-specific directory, defaults to cpu/generic
-#                          if cpu/host_cpu doesn't exist.  This is
-#                          used to set atomicity_include_dir.
+#                          if cpu/host_cpu doesn't exist.  This is not used
+#                          directly, but sets the default for others.
 #
 #   os_include_dir         OS-specific directory, defaults to os/generic.
 #
@@ -30,12 +30,18 @@
 #   abi_baseline_pair      directory name for ABI compat testing,
 #                          defaults to host_cpu-host_os (as per config.guess)
 #
+#   abi_tweaks_dir         location of cxxabi_tweaks.h,
+#                          defaults to cpu_include_dir
+#
 #   atomicity_dir          location of atomicity.h,
 #                          defaults to cpu_include_dir
 #
 #   atomic_word_dir        location of atomic_word.h
 #                          defaults to generic.
 #
+#   cpu_defines_dir        location of cpu_defines.h
+#                          defaults to generic.
+#
 # It possibly modifies the following variables:
 #
 #   OPT_LDFLAGS            extra flags to pass when linking the library, of
@@ -61,17 +67,24 @@
 c_model=c_std
 c_compatibility=no
 atomic_word_dir=cpu/generic
+atomicity_dir="cpu/generic"
+cpu_defines_dir="cpu/generic"
+try_cpu=generic
+abi_tweaks_dir="cpu/generic"
 
 # HOST-SPECIFIC OVERRIDES
 # Set any CPU-dependent bits.
-# Here we override defaults and catch more general cases due to naming
-# conventions (e.g., chip_name* to catch all variants).
 
+# Provide a way to funnel exotic flavors and prefixed/postfixed chip
+# variants into the established source config/cpu/* sub-directories.
 # THIS TABLE IS SORTED.  KEEP IT THAT WAY.
 case "${host_cpu}" in
   alpha*)
     try_cpu=alpha
     ;;
+  arm* | xscale | ep9312)
+    try_cpu=arm
+    ;;
   i[567]86 | x86_64)
     try_cpu=i486
     ;;
@@ -79,11 +92,7 @@ case "${host_cpu}" in
     try_cpu=hppa
     ;;
   mips*)
-    # NB: cpu/mips/atomicity.h needs MIPS II or above.  
-    # Of course, there is no sane way to test for this, no ABI macro,
-    # and no consistent host_cpu name differentiation. Therefore, only
-    # use it where it is known to be safe, ie it runs linux (see below).
-    try_cpu=generic
+    try_cpu=mips
     ;;
   m680[246]0)
     try_cpu=m68k
@@ -91,38 +100,63 @@ case "${host_cpu}" in
   powerpc* | rs6000)
     try_cpu=powerpc
     ;;
-  s390x)
-    try_cpu=s390
-    ;;
   sparc* | ultrasparc)
     try_cpu=sparc
     ;;
   *)
-    if test -f ${glibcxx_srcdir}/config/cpu/${host_cpu}/atomicity.h; then
+    if test -d ${glibcxx_srcdir}/config/cpu/${host_cpu}; then
       try_cpu=${host_cpu}
-    else
-      try_cpu=generic
     fi
+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}
+
+
+# Set specific CPU overrides for cpu_defines_dir. Most can just use generic.
+# THIS TABLE IS SORTED.  KEEP IT THAT WAY.
+case "${host_cpu}" in
+  powerpc* | rs6000)
+    cpu_defines_dir=cpu/powerpc
     ;;
 esac
 
+
 # Set specific CPU overrides for atomic_word_dir. Most can just use generic.
 # THIS TABLE IS SORTED.  KEEP IT THAT WAY.
 case "${host_cpu}" in
+  alpha*)
+    atomic_word_dir=cpu/alpha
+    ;;
   cris*)
     atomic_word_dir=cpu/cris
     ;;
+  ia64)
+    atomic_word_dir=cpu/ia64
+    ;;
+  powerpc* | rs6000)
+    atomic_word_dir=cpu/powerpc
+    ;;
   sparc* | ultrasparc)
     atomic_word_dir=cpu/sparc
     ;;
 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}"
-atomicity_dir=$cpu_include_dir
-abi_baseline_pair=${try_cpu}-${host_os}
+
+# Set specific CPU overrides for atomicity_dir.
+# This can be over-ridden in GLIBCXX_ENABLE_ATOMIC_BUILTINS.
+# THIS TABLE IS SORTED.  KEEP IT THAT WAY.
+if test -f ${glibcxx_srcdir}/config/${cpu_include_dir}/atomicity.h ; then
+  atomicity_dir=$cpu_include_dir
+fi
+
+
+if test -f ${glibcxx_srcdir}/config/${cpu_include_dir}/cxxabi_tweaks.h ; then
+  abi_tweaks_dir=$cpu_include_dir
+fi
 
 
 # Set any OS-dependent bits.
@@ -138,11 +172,13 @@ case "${host_os}" in
     # explicitly duplicate the directory for 4.[<3].
     os_include_dir="os/aix"
     atomicity_dir="os/aix"
+    atomic_word_dir="os/aix"
     OPT_LDFLAGS="-Wl,-G"
     ;;
   aix4.*)
     os_include_dir="os/generic"
     atomicity_dir="os/aix"
+    atomic_word_dir="os/aix"
     ;;
   aix*)
     os_include_dir="os/generic"
@@ -155,6 +191,19 @@ case "${host_os}" in
   cygwin*)
     os_include_dir="os/newlib"
     ;;
+  darwin | darwin[1-7] | darwin[1-7].*)
+    # On Darwin, performance is improved if libstdc++ is single-module.
+    # Up to at least 10.3.7, -flat_namespace is required for proper
+    # treatment of coalesced symbols.
+    OPT_LDFLAGS="${OPT_LDFLAGS} -Wl,-single_module -Wl,-flat_namespace"
+    os_include_dir="os/bsd/darwin"
+    ;;
+  darwin[89] | darwin[89].* | darwin[1-9][0-9]* )
+    # On Darwin, performance is improved if libstdc++ is single-module,
+    # and on 8+ compatibility is better if not -flat_namespace.
+    OPT_LDFLAGS="${OPT_LDFLAGS} -Wl,-single_module"
+    os_include_dir="os/bsd/darwin"
+    ;;
   *djgpp*)      # leading * picks up "msdosdjgpp"
     os_include_dir="os/djgpp"
     ;;
@@ -162,7 +211,11 @@ case "${host_os}" in
     os_include_dir="os/bsd/freebsd"
     ;;
   gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
-    os_include_dir="os/gnu-linux"
+    if [ "$uclibc" = "yes" ]; then
+      os_include_dir="os/uclibc"
+    else
+      os_include_dir="os/gnu-linux"
+    fi
     ;;
   hpux*)
     os_include_dir="os/hpux"
@@ -192,7 +245,7 @@ case "${host_os}" in
     # This too-vague configuration does not provide enough information
     # to select a ctype include, and thus os_include_dir is a crap shoot.
     echo "Please specify the full version of Solaris, ie. solaris2.9 " 1>&2
-    exit 1;
+    exit 1
     ;;
   solaris2.5 | solaris2.5.[0-9])
     os_include_dir="os/solaris/solaris2.5"
@@ -221,33 +274,39 @@ esac
 # Set any OS-dependent and CPU-dependent bits.
 # THIS TABLE IS SORTED.  KEEP IT THAT WAY.
 case "${host}" in
-  alpha*-*-freebsd5*)
-    abi_baseline_pair="alpha-freebsd5"
-    ;;
-  arm*-*-linux*)
-    abi_baseline_pair="arm-linux-gnu"
-    ;;
-  i*86-*-freebsd4*)
-    abi_baseline_pair="i386-freebsd4"
-    ;;
-  i*86-*-freebsd5*)
-    abi_baseline_pair="i386-freebsd5"
-    ;;
-  mips*-*-linux*)
-    atomicity_dir="cpu/mips"
-    abi_baseline_pair="mips-linux-gnu"
-    cpu_include_dir="cpu/mips"
-    ;;
-  s390-*-linux*)
-    abi_baseline_pair="s390-linux-gnu"
-    ;;
-  s390x-*-linux*)
-    abi_baseline_pair="s390x-linux-gnu"
-    ;;
-  sparc*-*-freebsd5*)
-    abi_baseline_pair="sparc-freebsd5"
-    ;;
-  x86_64-*-linux*)
-    abi_baseline_pair="x86_64-linux-gnu"
+  *-*-linux*)
+    case "${host_cpu}" in
+      i[567]86)
+        abi_baseline_pair=i486-linux-gnu
+        ;;
+      powerpc64)
+        abi_baseline_pair=powerpc64-linux-gnu
+        ;;
+      s390)
+        abi_baseline_pair=s390-linux-gnu
+        ;;
+      s390x)
+        abi_baseline_pair=s390x-linux-gnu
+        ;;
+      x86_64)
+        abi_baseline_pair=x86_64-linux-gnu
+        ;;
+      *)
+        if test -d ${glibcxx_srcdir}/config/abi/post/${try_cpu}-linux-gnu; then
+          abi_baseline_pair=${try_cpu}-linux-gnu
+        fi
+    esac
+    ;;
+  mips*-*-*)
+    case "${host_os}" in
+      gnu* | linux* | irix*)
+        ;;
+      *)
+        atomicity_dir="cpu/generic"
+        ;;
+    esac
+    ;;
+  powerpc*-*-darwin*)
+    port_specific_symbol_files="\$(srcdir)/../config/os/bsd/darwin/ppc-extra.ver"
     ;;
 esac