* configure.ac: Set ABI_TWEAKS_SRCDIR.

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

diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
index 60d4075..d63e58a 100644 (file)
--- a/libstdc++-v3/configure.host
+++ b/libstdc++-v3/configure.host
@@ -30,11 +30,12 @@
 #   abi_baseline_pair      directory name for ABI compat testing,
 #                          defaults to host_cpu-host_os (as per config.guess)
 #
-#   fpos_include_dir       directory for definition of fpos template
-#
-#   atomicity_include_dir  location of atomicity.h,
+#   atomicity_dir          location of atomicity.h,
 #                          defaults to cpu_include_dir
 #
+#   atomic_word_dir        location of atomic_word.h
+#                          defaults to generic.
+#
 # It possibly modifies the following variables:
 #
 #   OPT_LDFLAGS            extra flags to pass when linking the library, of
@@ -59,7 +60,7 @@
 # systems out there.  :-)
 c_model=c_std
 c_compatibility=no
-fpos_include_dir="os/generic"
+atomic_word_dir=cpu/generic
 
 # HOST-SPECIFIC OVERRIDES
 # Set any CPU-dependent bits.
@@ -96,6 +97,9 @@ case "${host_cpu}" in
   sparc* | ultrasparc)
     try_cpu=sparc
     ;;
+  arm* | xscale | ep9312)
+    try_cpu=arm
+    ;;
   *)
     if test -d ${glibcxx_srcdir}/config/cpu/${host_cpu}; then
       try_cpu=${host_cpu}
@@ -105,13 +109,34 @@ case "${host_cpu}" in
     ;;
 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
+  cris*)
+    atomic_word_dir=cpu/cris
+    ;;
+  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_include_dir=$cpu_include_dir
 abi_baseline_pair=${try_cpu}-${host_os}
 
+if test -f ${glibcxx_srcdir}/config/${cpu_include_dir}/atomicity.h ; then
+  atomicity_dir=$cpu_include_dir
+else
+  atomicity_dir="cpu/generic"
+fi
+
+if test -f ${glibcxx_srcdir}/config/${cpu_include_dir}/cxxabi_tweaks.h ; then
+  abi_tweaks_dir=$cpu_include_dir
+else
+  abi_tweaks_dir="cpu/generic"
+fi
 
 # Set any OS-dependent bits.
 # Set the os_include_dir.
@@ -125,14 +150,16 @@ case "${host_os}" in
     # os/aix/atomicity.h works on earlier versions of AIX 4.*, so we
     # explicitly duplicate the directory for 4.[<3].
     os_include_dir="os/aix"
-    atomicity_include_dir="os/aix"
+    atomicity_dir="os/aix"
     OPT_LDFLAGS="-Wl,-G"
     ;;
   aix4.*)
-    atomicity_include_dir="os/aix"
+    os_include_dir="os/generic"
+    atomicity_dir="os/aix"
     ;;
   aix*)
-    atomicity_include_dir="cpu/generic"
+    os_include_dir="os/generic"
+    atomicity_dir="cpu/generic"
     ;;
   bsd*)
     # Plain BSD attempts to share FreeBSD files.
@@ -147,9 +174,8 @@ case "${host_os}" in
   freebsd*)
     os_include_dir="os/bsd/freebsd"
     ;;
-  gnu* | linux*)
+  gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
     os_include_dir="os/gnu-linux"
-    fpos_include_dir=$os_include_dir
     ;;
   hpux*)
     os_include_dir="os/hpux"
@@ -157,11 +183,13 @@ case "${host_os}" in
   irix[1-6] | irix[1-5].* | irix6.[0-4]*)
     # This is known to work on at least IRIX 5.2 and 6.3.
     os_include_dir="os/irix/irix5.2"
-    atomicity_include_dir=$os_include_dir
+    atomicity_dir=os/irix
+    atomic_word_dir=os/irix
     ;;
   irix6.5*)
     os_include_dir="os/irix/irix6.5"
-    atomicity_include_dir=$os_include_dir
+    atomicity_dir=os/irix
+    atomic_word_dir=os/irix
     ;;
   mingw32*)
     os_include_dir="os/mingw32"
@@ -173,15 +201,27 @@ case "${host_os}" in
     os_include_dir="os/qnx/qnx6.1"
     c_model=c
     ;;
-  solaris2.5*)
+  solaris2)
+    # 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;
+    ;;
+  solaris2.5 | solaris2.5.[0-9])
     os_include_dir="os/solaris/solaris2.5"
     ;;
-  solaris2.6*)
+  solaris2.6)
     os_include_dir="os/solaris/solaris2.6"
     ;;
-  solaris2.[789]*)
+  solaris2.[789] | solaris2.1[0-9])
     os_include_dir="os/solaris/solaris2.7"
     ;;
+  tpf)
+    os_include_dir="os/tpf"
+    ;;
+  vxworks)
+    os_include_dir="os/vxworks"
+    ;;
   windiss*)
     os_include_dir="os/windiss"
     ;;
@@ -195,7 +235,7 @@ esac
 # THIS TABLE IS SORTED.  KEEP IT THAT WAY.
 case "${host}" in
   mips*-*-linux*)
-    atomicity_include_dir="cpu/mips"
+    atomicity_dir="cpu/mips"
     ;;
   x86_64-*-linux*)
     abi_baseline_pair="x86_64-linux-gnu"