summaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2014-09-29 22:33:41 +0000
committerAndreas Schwab <schwab@gcc.gnu.org>2014-09-29 22:33:41 +0000
commit2529c937df3cf8e2e663f05b2d0f5d78d39890a0 (patch)
tree1b6316655dbec8425a116e99beafe79387b37ae2 /libstdc++-v3
parentebd4c354b39912dfa95b1288d28a658d671b2285 (diff)
downloadgcc-2529c937df3cf8e2e663f05b2d0f5d78d39890a0.tar.gz
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
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/configure.host9
2 files changed, 12 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6560372986f..06940012e32 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 a12871aa365..d1298c43cf5 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