Backported from mainline

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

diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
index 4031b4e..b0e2cd9 100644 (file)
--- a/libstdc++-v3/configure.host
+++ b/libstdc++-v3/configure.host
@@ -30,6 +30,11 @@
 #   abi_baseline_pair      directory name for ABI compat testing,
 #                          defaults to host_cpu-host_os (as per config.guess)
 #
+#   abi_baseline_subdir_switch
+#                         g++ switch to determine ABI baseline subdir for
+#                         multilibbed targets,
+#                         defaults to --print-multi-directory
+#
 #   abi_tweaks_dir         location of cxxabi_tweaks.h,
 #                          defaults to cpu_include_dir
 #
@@ -78,6 +83,7 @@ atomic_flags=""
 atomicity_dir="cpu/generic"
 cpu_defines_dir="cpu/generic"
 try_cpu=generic
+abi_baseline_subdir_switch=--print-multi-directory
 abi_tweaks_dir="cpu/generic"
 error_constants_dir="os/generic"
 
@@ -91,21 +97,25 @@ case "${host_cpu}" in
   alpha*)
     try_cpu=alpha
     ;;
-  arm* | xscale | ep9312)
+  arm*)
     try_cpu=arm
     ;;
+  crisv32)
+    try_cpu=cris
+    ;;
   i[567]86 | x86_64)
     try_cpu=i486
     ;;
   hppa*)
     try_cpu=hppa
     ;;
+  mep*)
+    EXTRA_CXX_FLAGS=-mm
+    try_cpu=generic
+    ;;
   mips*)
     try_cpu=mips
     ;;
-  m680[246]0)
-    try_cpu=m68k
-    ;;
   powerpc* | rs6000)
     try_cpu=powerpc
     ;;
@@ -147,7 +157,7 @@ case "${host_cpu}" in
   ia64)
     atomic_word_dir=cpu/ia64
     ;;
-  i[567]86 | x86_64)
+  i[4567]86 | x86_64)
     atomic_flags="-march=native"
     ;;
   powerpc* | rs6000)
@@ -205,6 +215,7 @@ case "${host_os}" in
     ;;
   cygwin*)
     os_include_dir="os/newlib"
+    OPT_LDFLAGS="${OPT_LDFLAGS} \$(lt_host_flags)"
     ;;
   darwin | darwin[1-7] | darwin[1-7].*)
     # On Darwin, performance is improved if libstdc++ is single-module.
@@ -226,6 +237,7 @@ case "${host_os}" in
     ;;
   *djgpp*)      # leading * picks up "msdosdjgpp"
     os_include_dir="os/djgpp"
+    error_constants_dir="os/djgpp"
     ;;
   freebsd*)
     os_include_dir="os/bsd/freebsd"
@@ -233,6 +245,8 @@ case "${host_os}" in
   gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
     if [ "$uclibc" = "yes" ]; then
       os_include_dir="os/uclibc"
+    elif [ "$bionic" = "yes" ]; then
+      os_include_dir="os/bionic"
     else
       os_include_dir="os/gnu-linux"
     fi
@@ -240,24 +254,38 @@ case "${host_os}" in
   hpux*)
     os_include_dir="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.
-    os_include_dir="os/irix/irix5.2"
-    atomicity_dir=os/irix
-    atomic_word_dir=os/irix
-    ;;
   irix6.5*)
     os_include_dir="os/irix/irix6.5"
     atomicity_dir=os/irix
     atomic_word_dir=os/irix
+    # libstdc++.so relies on emutls on IRIX, which only works with the
+    # real functions implemented in libpthread.so, not with the stubs in
+    # libc, so always pass -lpthread.
+    OPT_LDFLAGS="${OPT_LDFLAGS} -lpthread"
     ;;
   mingw32*)
-    os_include_dir="os/mingw32"
-    error_constants_dir="os/mingw32"
+    case "$host" in
+      *-w64-*)
+        os_include_dir="os/mingw32-w64"
+        error_constants_dir="os/mingw32-w64"
+        ;;
+      *)
+        os_include_dir="os/mingw32"
+        error_constants_dir="os/mingw32"
+        ;;
+    esac
+    OPT_LDFLAGS="${OPT_LDFLAGS} \$(lt_host_flags)"
     ;;
   netbsd*)
     os_include_dir="os/bsd/netbsd"
     ;;
+  osf*)
+    os_include_dir="os/osf"
+    # libstdc++.so relies on emutls on Tru64 UNIX, which only works with the
+    # real functions implemented in libpthread.so, not with the dummies in
+    # libgcc, so always pass -lpthread.
+    OPT_LDFLAGS="${OPT_LDFLAGS} -lpthread"
+    ;;
   qnx6.[12]*)
     os_include_dir="os/qnx/qnx6.1"
     c_model=c
@@ -268,14 +296,8 @@ case "${host_os}" in
     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)
-    os_include_dir="os/solaris/solaris2.6"
-    ;;
-  solaris2.[789] | solaris2.1[0-9])
-    os_include_dir="os/solaris/solaris2.7"
+  solaris2.[89] | solaris2.1[0-9])
+    os_include_dir="os/solaris/solaris2.8"
     ;;
   tpf)
     os_include_dir="os/tpf"
@@ -283,9 +305,6 @@ case "${host_os}" in
   vxworks)
     os_include_dir="os/vxworks"
     ;;
-  windiss*)
-    os_include_dir="os/windiss"
-    ;;
   *)
     os_include_dir="os/generic"
     ;;
@@ -300,6 +319,9 @@ case "${host}" in
       i[567]86)
         abi_baseline_pair=i486-linux-gnu
         ;;
+      mips64*)
+       abi_baseline_pair=mips64-linux-gnu
+       ;;
       powerpc64)
         abi_baseline_pair=powerpc64-linux-gnu
         ;;
@@ -317,17 +339,21 @@ case "${host}" in
           abi_baseline_pair=${try_cpu}-linux-gnu
         fi
     esac
-    ;;
-  mips*-*-*)
-    case "${host_os}" in
-      gnu* | linux* | irix*)
-        ;;
-      *)
-        atomicity_dir="cpu/generic"
-        ;;
+    case "${host}" in
+      arm*-*-linux-*eabi*)
+       port_specific_symbol_files="\$(srcdir)/../config/os/gnu-linux/arm-eabi-extra.ver"
+       ;;
     esac
     ;;
   powerpc*-*-darwin*)
     port_specific_symbol_files="\$(srcdir)/../config/os/bsd/darwin/ppc-extra.ver"
     ;;
+  *-*-solaris2.[89])
+    abi_baseline_pair=solaris2.8
+    abi_baseline_subdir_switch=--print-multi-os-directory
+    ;;
+  *-*-solaris2.1[0-9])
+    abi_baseline_pair=solaris2.10
+    abi_baseline_subdir_switch=--print-multi-os-directory
+    ;;
 esac