* config.table: Accept i[345867]86 variant.

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / configure.target

diff --git a/libstdc++-v3/configure.target b/libstdc++-v3/configure.target
index ceafe51..e3da7bc 100644 (file)
--- a/libstdc++-v3/configure.target
+++ b/libstdc++-v3/configure.target
@@ -18,11 +18,7 @@
 #
 #   cpu_include_dir        CPU-specific directory, defaults to cpu/generic
 #                              if cpu/target_cpu doesn't exist.  This is
-#                              used to set the next two:
-#   ATOMICITYH             location of atomicity.h,
-#                              defaults to cpu_include_dir
-#   CPULIMITSH             location of cpu_limits.h,
-#                              defaults to cpu_include_dir
+#                              used to set ATOMICITYH.
 #
 #   os_include_dir         OS-specific directory, defaults to os/generic.
 #
@@ -34,6 +30,9 @@
 #   abi_baseline_triplet   directory name for ABI compat testing,
 #                              defaults to target (as per config.guess)
 #
+#   ATOMICITYH             location of atomicity.h,
+#                              defaults to cpu_include_dir
+#
 # It possibly modifies the following variables:
 #
 #   OPT_LDFLAGS            extra flags to pass when linking the library, of
@@ -51,17 +50,15 @@
 # Try to guess a default cpu_include_dir based on the name of the CPU.  We
 # cannot do this for os_include_dir; there are too many portable operating
 # systems out there.  :-)
+abi_baseline_triplet=${target}
+c_model=c_std
+c_compatibility=no
 if test -d ${glibcpp_srcdir}/config/cpu/${target_cpu}; then
     cpu_include_dir="cpu/${target_cpu}"
 else
     cpu_include_dir="cpu/generic"
 fi
 
-abi_baseline_triplet=${target}
-
-c_model=c_std
-c_compatibility=no
-
 
 # TARGET-SPECIFIC OVERRIDES
 # Set any CPU-dependent bits.
@@ -72,41 +69,33 @@ case "${target_cpu}" in
   alpha*)
     cpu_include_dir="cpu/alpha"
     ;;
-  arm* | strongarm* | xscale* )
-    cpu_include_dir="cpu/arm"
-    ;;
-  i486 | i586 | i686 | i786)
-    # add athlons here maybe
+  athlon* | i586 | i686 | i786 | x86_64)
     cpu_include_dir="cpu/i486"
-    CPULIMITSH="cpu/i386"
     ;;
-  m68k | m680[246]0)
-    cpu_include_dir="cpu/m68k"
+  hppa*)
+    cpu_include_dir="cpu/hppa"
     ;;
   mips*)
-    # MIPS chips are unreliable as to sc/ll support. By default
-    # don't use atomic instructions and override for the OS.
-    cpu_include_dir="cpu/generic"
-    ;;
-  mmix)
+    # cpu/mips/atomicity.h needs MIPS II or above.  Only use it
+    # where it is known to be safe.
     ATOMICITYH="cpu/generic"
     ;;
+  m680[246]0)
+    cpu_include_dir="cpu/m68k"
+    ;;
   powerpc* | rs6000)
     cpu_include_dir="cpu/powerpc"
     ;;
-  s390 | s390x)
+  s390x)
     cpu_include_dir="cpu/s390"
     ;;
   sparc* | ultrasparc)
     cpu_include_dir="cpu/sparc"
     ;;
-  x86_64*)
-    cpu_include_dir="cpu/x86-64"
-    ;;
 esac
 
 
-# Now look for the two files usually tied to a CPU model, and make default
+# 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_incdir_fullpath=${glibcpp_srcdir}/config/${cpu_include_dir}
 if test x${ATOMICITYH+set} != xset; then
@@ -116,13 +105,6 @@ if test x${ATOMICITYH+set} != xset; then
     ATOMICITYH="cpu/generic"
   fi
 fi
-if test x${CPULIMITSH+set} != xset; then
-  if test -f ${_cpu_incdir_fullpath}/cpu_limits.h; then
-    CPULIMITSH=$cpu_include_dir
-  else
-    CPULIMITSH="cpu/generic"
-  fi
-fi
 unset _cpu_incdir_fullpath
 
 
@@ -147,7 +129,8 @@ case "${target_os}" in
   aix*)
     ATOMICITYH="cpu/generic"
     ;;
-  bsd* | freebsd* )
+  bsd*)
+    # Plain BSD attempts to share FreeBSD files.
     os_include_dir="os/bsd/freebsd"
     ;;
   cygwin*)
@@ -156,12 +139,16 @@ case "${target_os}" in
   *djgpp*)      # leading * picks up "msdosdjgpp"
     os_include_dir="os/djgpp"
     ;;
+  freebsd*)
+    os_include_dir="os/bsd/freebsd"
+    # The FreeBSD ABI is expressed in the major version number only.
+    abi_baseline_triplet=`echo ${target} | sed 's,\(\.[0-9]*\)*$,,'`
+    ;;
   gnu* | linux*)
     os_include_dir="os/gnu-linux"
     ;;
   hpux*)
     os_include_dir="os/hpux"
-    CPULIMITSH="os/hpux"
     ;;
   irix[1-6] | irix[1-5].* | irix6.[0-4]*)
     # This is known to work on at least IRIX 5.2 and 6.3.
@@ -184,7 +171,7 @@ case "${target_os}" in
   solaris2.6*)
     os_include_dir="os/solaris/solaris2.6"
     ;;
-  solaris2.[78]*)
+  solaris2.[789]*)
     os_include_dir="os/solaris/solaris2.7"
     ;;
   windiss*)
@@ -203,9 +190,6 @@ esac
 # Set any OS-dependent and CPU-dependent bits.
 # THIS TABLE IS SORTED.  KEEP IT THAT WAY.
 case "${target}" in
-  alpha*-*-*osf5*)
-    CPULIMITSH="os/osf/osf5.0"
-    ;;
   mips*-*-linux*)
     ATOMICITYH="cpu/mips"
     ;;