configure.host (abi_baseline_pair): If try_cpu is generic use host_cpu for the default.

* configure.host (abi_baseline_pair): If try_cpu is generic use
host_cpu for the default.

From-SVN: r215695

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6560372986fc9753327c8453859a02a78edade5a..06940012e326504b961af65a43de2cf0c021337b 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-30  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * configure.host (abi_baseline_pair): If try_cpu is generic use
+       host_cpu for the default.
+
 2014-09-29  François Dumont  <fdumont@gcc.gnu.org>
 
        PR libstdc++/62313

diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
index a12871aa365fd36f1cb078604fca21220a1efadb..d1298c43cf5b641088e8ef48ea633aac5d949a49 100644 (file)
--- a/libstdc++-v3/configure.host
+++ b/libstdc++-v3/configure.host
@@ -346,8 +346,13 @@ case "${host}" in
         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
+        if test $try_cpu = generic; then
+          try_abi_cpu=$host_cpu
+        else
+          try_abi_cpu=$try_cpu
+        fi
+        if test -d ${glibcxx_srcdir}/config/abi/post/${try_abi_cpu}-linux-gnu; then
+          abi_baseline_pair=${try_abi_cpu}-linux-gnu
         fi
     esac
     case "${host}" in