2012-04-23 Chris Jefferson <chris@bubblescope.net>

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

diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
index 06874d5..ca4d819 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"
 
@@ -209,7 +215,7 @@ case "${host_os}" in
     ;;
   cygwin*)
     os_include_dir="os/newlib"
-    OPT_LDFLAGS="${OPT_LDFLAGS} -no-undefined -bindir \$(bindir)"
+    OPT_LDFLAGS="${OPT_LDFLAGS} \$(lt_host_flags)"
     ;;
   darwin | darwin[1-7] | darwin[1-7].*)
     # On Darwin, performance is improved if libstdc++ is single-module.
@@ -252,15 +258,34 @@ case "${host_os}" in
     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"
-    OPT_LDFLAGS="${OPT_LDFLAGS} -no-undefined -bindir \$(bindir)"
+    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
@@ -272,7 +297,7 @@ case "${host_os}" in
     exit 1
     ;;
   solaris2.[89] | solaris2.1[0-9])
-    os_include_dir="os/solaris/solaris2.7"
+    os_include_dir="os/solaris/solaris2.8"
     ;;
   tpf)
     os_include_dir="os/tpf"
@@ -320,13 +345,15 @@ case "${host}" in
        ;;
     esac
     ;;
-  i?86-*-solaris2*)
-    abi_baseline_pair=i386-solaris2
-    ;;
   powerpc*-*-darwin*)
     port_specific_symbol_files="\$(srcdir)/../config/os/bsd/darwin/ppc-extra.ver"
     ;;
-  sparc*-*-solaris2*)
-    abi_baseline_pair=sparc-solaris2
+  *-*-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