[PATCH] Fix finding default baseline symbols directory

[Andreas Schwab]

Jonathan Wakely <jwakely@redhat.com> writes:

> Would a safer change be to just add a new pattern for aarch64?
>
> --- a/libstdc++-v3/configure.host
> +++ b/libstdc++-v3/configure.host
> @@ -345,6 +345,9 @@ case "${host}" in
>       x86_64)
>         abi_baseline_pair=x86_64-linux-gnu
>         ;;
> +      aarch64)
> +        abi_baseline_pair=aarch64-linux-gnu
> +        ;;
>       *)
>         if test -d ${glibcxx_srcdir}/config/abi/post/${try_cpu}-linux-gnu; then
>           abi_baseline_pair=${try_cpu}-linux-gnu

IMHO it doesn't make sense to use try_cpu here if it is generic.

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

diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
index a12871a..d1298c4 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

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."