From: Andreas Schwab <schwab@linux-m68k.org>
Date: Mon, 29 Sep 2014 22:33:41 +0000 (+0000)
Subject: configure.host (abi_baseline_pair): If try_cpu is generic use host_cpu for the default.
X-Git-Tag: releases/gcc-5.1.0~4386
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2529c937df3cf8e2e663f05b2d0f5d78d39890a0;p=thirdparty%2Fgcc.git

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 6560372986fc..06940012e326 100644
--- 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 a12871aa365f..d1298c43cf5b 100644
--- 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