* jni.cc (array_from_valist): Use promoted types for va_arg.

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

diff --git a/libstdc++-v3/configure.target b/libstdc++-v3/configure.target
index 8897f2b..6d10614 100644 (file)
--- a/libstdc++-v3/configure.target
+++ b/libstdc++-v3/configure.target
@@ -16,17 +16,8 @@
 #   target_optspace       --enable-target-optspace ("yes", "no", "")
 
 # It possibly modifies the following shell variables:
-#   glibcpp_cflags         Special CFLAGS to use when building
-#   glibcpp_cxxflags       Special CXXFLAGS to use when building
 #   cpu_include_dir        CPU-specific include directory, relative to srcdir
 #   os_include_dir         OS-specific include directory, relative to srcdir
-# The first two are set in configure.host and modified here.
-
-
-# These are "local" and should be set in the switch statements below.  They
-# will be appended to their real conterparts once the dust settles.
-l_glibcpp_cflags=
-l_glibcpp_cxxflags=
 
 
 # Set any CPU dependent compiler flags.
@@ -48,9 +39,15 @@ case "${target_cpu}" in
   i486 | i586 | i686 | i786)
     cpu_include_dir="config/cpu/i486"
     ;;
+  m68k | m680[246]0)
+    cpu_include_dir="config/cpu/m68k"
+    ;;
   powerpc | rs6000)
     cpu_include_dir="config/cpu/powerpc"
     ;;
+  s390 | s390x)
+    cpu_include_dir="config/cpu/s390"
+    ;;
   sparc64 | ultrasparc)
     cpu_include_dir="config/cpu/sparc/sparc64"
     ;;
@@ -67,25 +64,11 @@ esac
 # THIS TABLE IS SORTED.  KEEP IT THAT WAY.
 
 case "${target_os}" in
-  aix4.[[3456789]]* | aix[[56789]]*)
-    os_include_dir="config/os/aix"
-    case "$CXX" in
-      *pthread*)
-        enable_threads='posix'
-        ;;
-      *)
-        enable_threads='no'
-        ;;
-    esac
-    ctype_include_dir=${os_include_dir}
-    ;;
-  aix*)
+  aix4.[3456789]* | aix[56789]*)
     os_include_dir="config/os/aix"
-    ctype_include_dir=${os_include_dir}
     ;;
   bsd* | freebsd* )
     os_include_dir="config/os/bsd/freebsd"
-    ctype_include_dir=${os_include_dir}
     ;;
   cygwin*)
     os_include_dir="config/os/newlib"
@@ -95,27 +78,25 @@ case "${target_os}" in
     ;;
   linux* | gnu*)
     os_include_dir="config/os/gnu-linux"
-    ctype_include_dir=${os_include_dir}
     ;;
-  irix*)
-    os_include_dir="config/os/irix"
-    ctype_include_dir=${os_include_dir}
+  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="config/os/irix/irix5.2"
+   ;;
+  irix6.5)
+    os_include_dir="config/os/irix/irix6.5"
     ;;
   netbsd*)
     os_include_dir="config/os/bsd/netbsd"
-    ctype_include_dir=${os_include_dir}
     ;;
   solaris2.5*)
     os_include_dir="config/os/solaris/solaris2.5"
-    ctype_include_dir=${os_include_dir}
     ;;
   solaris2.6*)
     os_include_dir="config/os/solaris/solaris2.6"
-    ctype_include_dir=${os_include_dir}
     ;;
   solaris2.7* | solaris2.8*)
     os_include_dir="config/os/solaris/solaris2.7"
-    ctype_include_dir=${os_include_dir}
     ;;
   hpux)
     os_include_dir="config/os/hpux"
@@ -130,8 +111,15 @@ esac
 # THIS TABLE IS SORTED.  KEEP IT THAT WAY.
 
 case "${target}" in
+   *-*-aix[456789]*)
+     # We set os_include_dir to config/os/aix only on AIX 4.3 and
+     # newer, but config/os/aix/bits/atomicity.h works on earlier
+     # versions of AIX 4.*, so we explicitly duplicate the directory
+     # here, because os_include_dir.
+     ATOMICITYH=config/os/aix
+     ;;
    *-*-aix*)
-     ATOMICITYH=$os_include_dir
+     ATOMICITYH=config/cpu/generic
      ;;
    *-*-irix*)
      ATOMICITYH=$os_include_dir
@@ -141,10 +129,18 @@ case "${target}" in
      ;;
 esac
 
+# Set LIMITSH to the directory where the configuration-dependent
+# limits.h can be found.
+# THIS TABLE IS SORTED.  KEEP IT THAT WAY.
 
-# Okay, folks, show's over.  Move along, move along.
-
-glibcpp_cflags="${glibcpp_cflags} ${libgcj_flags} ${l_glibcpp_cflags}"
-glibcpp_cxxflags="${glibcpp_cxxflags} ${libgcj_flags} ${l_glibcpp_cxxflags}"
-
-
+case "${target}" in
+   i?86-*-*)
+     LIMITSH=config/cpu/i386
+     ;;
+   powerpc-*-*)
+     LIMITSH=config/cpu/powerpc
+     ;;
+   *)
+     LIMITSH=config/cpu/generic
+     ;;
+esac