diff mbox

Fix finding default baseline symbols directory

Message ID 87a95il4px.fsf@igel.home
State New
Headers show

Commit Message

Andreas Schwab Sept. 29, 2014, 5:24 p.m. UTC 
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.


Andreas.

Comments

Jonathan Wakely Sept. 29, 2014, 6:38 p.m. UTC | #1 
On 29/09/14 19:24 +0200, Andreas Schwab wrote:
>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

Yes, that looks sensible to me - OK for trunk, thanks.
diff mbox

Patch

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