X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=libstdc%2B%2B-v3%2Fconfigure.host;h=02292b016d0ebd504b218f61579b0200031e9701;hb=df3fc529ce412a7442dee19e2cd1babcb54672d8;hp=477e4d8bb13521901eee535081518d058070698b;hpb=ee085235e033c00f8164ab81102ccbad369162ee;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
index 477e4d8bb13..02292b016d0 100644
--- a/libstdc++-v3/configure.host
+++ b/libstdc++-v3/configure.host
@@ -22,7 +22,7 @@
 #
 #   os_include_dir         OS-specific directory, defaults to os/generic.
 #
-#   c_model                the "C" header model, defaults to c_std.
+#   c_model                the "C" header model, defaults to c_global.
 #
 #   c_compatibility        if "C" compatibility headers are necessary,
 #                          defaults to no.
@@ -39,9 +39,16 @@
 #   atomic_word_dir        location of atomic_word.h
 #                          defaults to generic.
 #
+#   atomic_flags           extra flags to pass to use atomic instructions
+#                          defaults to nothing.
+#
 #   cpu_defines_dir        location of cpu_defines.h
 #                          defaults to generic.
 #
+#
+#   error_constants_dir    location of error_constants.h
+#                          defaults to os/generic.
+#
 # It possibly modifies the following variables:
 #
 #   OPT_LDFLAGS            extra flags to pass when linking the library, of
@@ -64,98 +71,115 @@
 # 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.  :-)
-c_model=c_std
+c_model=c_global
 c_compatibility=no
 atomic_word_dir=cpu/generic
-cpu_defines_dir=cpu/generic
+atomic_flags=""
+atomicity_dir="cpu/generic"
+cpu_defines_dir="cpu/generic"
+try_cpu=generic
+abi_tweaks_dir="cpu/generic"
+error_constants_dir="os/generic"
 
 # HOST-SPECIFIC OVERRIDES
 # Set any CPU-dependent bits.
-# Here we override defaults and catch more general cases due to naming
-# conventions (e.g., chip_name* to catch all variants).
 
+# Provide a way to funnel exotic flavors and prefixed/postfixed chip
+# variants into the established source config/cpu/* sub-directories.
 # THIS TABLE IS SORTED.  KEEP IT THAT WAY.
 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
     ;;
-  mips*)
-    # NB: cpu/mips/atomicity.h needs MIPS II or above.  
-    # Of course, there is no sane way to test for this, no ABI macro,
-    # and no consistent host_cpu name differentiation. Therefore, only
-    # use it where it is known to be safe, ie it runs linux (see below).
+  mep*)
+    EXTRA_CXX_FLAGS=-mm
     try_cpu=generic
     ;;
-  m680[246]0)
-    try_cpu=m68k
+  mips*)
+    try_cpu=mips
     ;;
   powerpc* | rs6000)
     try_cpu=powerpc
     ;;
-  s390x)
-    try_cpu=s390
-    ;;
   sparc* | ultrasparc)
     try_cpu=sparc
     ;;
   *)
     if test -d ${glibcxx_srcdir}/config/cpu/${host_cpu}; then
       try_cpu=${host_cpu}
-    else
-      try_cpu=generic
     fi
-    ;;
 esac
 
-# Set specific CPU overrides for atomic_word_dir. Most can just use generic.
+
+# 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}
+
+
+# Set specific CPU overrides for cpu_defines_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
+  powerpc* | rs6000)
+    cpu_defines_dir=cpu/powerpc
     ;;
 esac
 
-# Set specific CPU overrides for cpu_defines_dir. Most can just use generic.
+
+# Set specific CPU overrides for atomic_word_dir and atomic_flags. 
+# Most can just use generic.
 # THIS TABLE IS SORTED.  KEEP IT THAT WAY.
 case "${host_cpu}" in
+  alpha*)
+    atomic_word_dir=cpu/alpha
+    ;;
+  cris*)
+    atomic_word_dir=cpu/cris
+    ;;
+  ia64)
+    atomic_word_dir=cpu/ia64
+    ;;
+  i[4567]86 | x86_64)
+    atomic_flags="-march=native"
+    ;;
   powerpc* | rs6000)
-    cpu_defines_dir=cpu/powerpc
+    atomic_word_dir=cpu/powerpc
+    ;;
+  sparc* | ultrasparc)
+    atomic_word_dir=cpu/sparc
+    atomic_flags="-mcpu=v9"
     ;;
 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}
-abi_baseline_pair=${try_cpu}-${host_os}
-unset try_cpu
 
+# Set specific CPU overrides for atomicity_dir.
+# This can be over-ridden in GLIBCXX_ENABLE_ATOMIC_BUILTINS.
+# THIS TABLE IS SORTED.  KEEP IT THAT WAY.
 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.
+# Set the error_costants_dir.
 # Set c_model, c_compatibility here.
 # If atomic ops and/or numeric limits are OS-specific rather than
 # CPU-specifc, set those here too.
@@ -185,6 +209,7 @@ case "${host_os}" in
     ;;
   cygwin*)
     os_include_dir="os/newlib"
+    OPT_LDFLAGS="${OPT_LDFLAGS} -no-undefined -bindir \$(bindir)"
     ;;
   darwin | darwin[1-7] | darwin[1-7].*)
     # On Darwin, performance is improved if libstdc++ is single-module.
@@ -197,6 +222,11 @@ case "${host_os}" in
     # On Darwin, performance is improved if libstdc++ is single-module,
     # and on 8+ compatibility is better if not -flat_namespace.
     OPT_LDFLAGS="${OPT_LDFLAGS} -Wl,-single_module"
+    case "${host_cpu}" in
+      i[34567]86 | x86_64)
+        OPTIMIZE_CXXFLAGS="${OPTIMIZE_CXXFLAGS} -fvisibility-inlines-hidden"
+        ;;
+    esac
     os_include_dir="os/bsd/darwin"
     ;;
   *djgpp*)      # leading * picks up "msdosdjgpp"
@@ -228,6 +258,8 @@ case "${host_os}" in
     ;;
   mingw32*)
     os_include_dir="os/mingw32"
+    error_constants_dir="os/mingw32"
+    OPT_LDFLAGS="${OPT_LDFLAGS} -no-undefined -bindir \$(bindir)"
     ;;
   netbsd*)
     os_include_dir="os/bsd/netbsd"
@@ -242,12 +274,6 @@ 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"
     ;;
@@ -257,9 +283,6 @@ case "${host_os}" in
   vxworks)
     os_include_dir="os/vxworks"
     ;;
-  windiss*)
-    os_include_dir="os/windiss"
-    ;;
   *)
     os_include_dir="os/generic"
     ;;
@@ -269,39 +292,38 @@ esac
 # Set any OS-dependent and CPU-dependent bits.
 # THIS TABLE IS SORTED.  KEEP IT THAT WAY.
 case "${host}" in
-  alpha*-*-freebsd5*)
-    abi_baseline_pair="alpha-freebsd5"
-    ;;
-  arm*-*-linux*)
-    abi_baseline_pair="arm-linux-gnu"
-    ;;
-  i*86-*-freebsd4*)
-    abi_baseline_pair="i386-freebsd4"
-    ;;
-  i*86-*-freebsd5*)
-    abi_baseline_pair="i386-freebsd5"
-    ;;
-  mips*-*-linux*)
-    atomicity_dir="cpu/mips"
-    abi_baseline_pair="mips-linux-gnu"
-    cpu_include_dir="cpu/mips"
+  *-*-linux*)
+    case "${host_cpu}" in
+      i[567]86)
+        abi_baseline_pair=i486-linux-gnu
+        ;;
+      mips64*)
+	abi_baseline_pair=mips64-linux-gnu
+	;;
+      powerpc64)
+        abi_baseline_pair=powerpc64-linux-gnu
+        ;;
+      s390)
+        abi_baseline_pair=s390-linux-gnu
+        ;;
+      s390x)
+        abi_baseline_pair=s390x-linux-gnu
+        ;;
+      x86_64)
+        abi_baseline_pair=x86_64-linux-gnu
+        ;;
+      *)
+        if test -d ${glibcxx_srcdir}/config/abi/post/${try_cpu}-linux-gnu; then
+          abi_baseline_pair=${try_cpu}-linux-gnu
+        fi
+    esac
+    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"
     ;;
-  powerpc64-*-linux*)
-    abi_baseline_pair="powerpc64-linux-gnu"
-    ;;
-  s390-*-linux*)
-    abi_baseline_pair="s390-linux-gnu"
-    ;;
-  s390x-*-linux*)
-    abi_baseline_pair="s390x-linux-gnu"
-    ;;
-  sparc*-*-freebsd5*)
-    abi_baseline_pair="sparc-freebsd5"
-    ;;
-  x86_64-*-linux*)
-    abi_baseline_pair="x86_64-linux-gnu"
-    ;;
 esac