sparcv9: Restore fdiml@GLIBC_2.1 [Was Re: [PATCH 3/3] sparc32/sparcv9: add a VIS3 version of fdim]
diff mbox

Message ID d29e26c5-c8e1-115a-9ec6-b51092cb1d82@linux.vnet.ibm.com
State New
Headers show

Commit Message

Paul E. Murphy Aug. 26, 2016, 7:28 p.m. UTC
Hi Aurelien,

[Sorry for the duplicate, I forgot the CC to libc-alpha]

I tested using the F22 cross-compiler on x86-64, and verified
the symbol is once again exported.

It turns out most other architectures don't have quite as
convoluted Implies as ppc64.

Likewise, doing "#include_next <s_fdim.c>" gave me a
compiler error.

I'll commit the following if it is ok.

---8<---
Use s_fdim.c from sysdeps/ieee754/ldbl-opt/ instead of
math/ to ensure a compat symbol for fdiml is created.

	[BZ #20517]
	* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c:
	Include ldbl-opt/s_fdim.c to ensure fdiml@GLIBC_2.1 is
	exported.
---
 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Aurelien Jarno Aug. 27, 2016, 10:48 a.m. UTC | #1
Hi,

On 2016-08-26 14:28, Paul E. Murphy wrote:
> 
> Hi Aurelien,
> 
> [Sorry for the duplicate, I forgot the CC to libc-alpha]
> 
> I tested using the F22 cross-compiler on x86-64, and verified
> the symbol is once again exported.
> 
> It turns out most other architectures don't have quite as
> convoluted Implies as ppc64.
> 
> Likewise, doing "#include_next <s_fdim.c>" gave me a
> compiler error.
> 
> I'll commit the following if it is ok.
>
> ---8<---
> Use s_fdim.c from sysdeps/ieee754/ldbl-opt/ instead of
> math/ to ensure a compat symbol for fdiml is created.
> 
> 	[BZ #20517]
> 	* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c:
> 	Include ldbl-opt/s_fdim.c to ensure fdiml@GLIBC_2.1 is
> 	exported.
> ---
>  sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c
> index c9c7704..9666741 100644
> --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c
> +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c
> @@ -29,4 +29,4 @@ weak_alias (__fdim, fdim)
>  # define __fdim __fdim_generic
>  #endif
>  
> -#include <math/s_fdim.c>
> +#include <ldbl-opt/s_fdim.c>

I confirm this patch is correct. I have done a 32-bit build and it works
as expected, the symbol is back. I have added David Miller in Cc: so
that he can also ack the patch.

Aurelien
David Miller Aug. 28, 2016, 4:50 a.m. UTC | #2
From: Aurelien Jarno <aurelien@aurel32.net>
Date: Sat, 27 Aug 2016 12:48:23 +0200

> On 2016-08-26 14:28, Paul E. Murphy wrote:
>> 
>> diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c
>> index c9c7704..9666741 100644
>> --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c
>> +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c
>> @@ -29,4 +29,4 @@ weak_alias (__fdim, fdim)
>>  # define __fdim __fdim_generic
>>  #endif
>>  
>> -#include <math/s_fdim.c>
>> +#include <ldbl-opt/s_fdim.c>
> 
> I confirm this patch is correct. I have done a 32-bit build and it works
> as expected, the symbol is back. I have added David Miller in Cc: so
> that he can also ack the patch.

This is fine with me.
Paul E. Murphy Aug. 29, 2016, 6:30 p.m. UTC | #3
On 08/27/2016 11:50 PM, David Miller wrote:
> From: Aurelien Jarno <aurelien@aurel32.net>
> Date: Sat, 27 Aug 2016 12:48:23 +0200
> 
>> On 2016-08-26 14:28, Paul E. Murphy wrote:
>>>
>>> diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c
>>> index c9c7704..9666741 100644
>>> --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c
>>> +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c
>>> @@ -29,4 +29,4 @@ weak_alias (__fdim, fdim)
>>>  # define __fdim __fdim_generic
>>>  #endif
>>>  
>>> -#include <math/s_fdim.c>
>>> +#include <ldbl-opt/s_fdim.c>
>>
>> I confirm this patch is correct. I have done a 32-bit build and it works
>> as expected, the symbol is back. I have added David Miller in Cc: so
>> that he can also ack the patch.
> 
> This is fine with me.
> 

Thanks.

Committed as d47d27d.

Patch
diff mbox

diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c
index c9c7704..9666741 100644
--- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c
+++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c
@@ -29,4 +29,4 @@  weak_alias (__fdim, fdim)
 # define __fdim __fdim_generic
 #endif
 
-#include <math/s_fdim.c>
+#include <ldbl-opt/s_fdim.c>