[5/7] ldbl-128ibm-compat: enforce ibm128 on compat tests

Message ID 20200214161051.32579-6-murphyp@linux.vnet.ibm.com
State Committed
Delegated to: Tulio Magno Quites Machado Filho
Headers

Commit Message

Paul E. Murphy Feb. 14, 2020, 4:10 p.m. UTC
  For lack of a more comprehensive solution, tack on the ibm128 ABI
compiler options for the totalorder{,mag}l compat tests which exist
prior to enabling this feature.
---
 sysdeps/ieee754/ldbl-128ibm-compat/Makefile | 10 ++++++++++
 1 file changed, 10 insertions(+)
  

Comments

Tulio Magno Quites Machado Filho Feb. 27, 2020, 8:39 p.m. UTC | #1
"Paul E. Murphy" <murphyp@linux.vnet.ibm.com> writes:

> For lack of a more comprehensive solution, tack on the ibm128 ABI
> compiler options for the totalorder{,mag}l compat tests which exist
> prior to enabling this feature.
> ---
>  sysdeps/ieee754/ldbl-128ibm-compat/Makefile | 10 ++++++++++
>  1 file changed, 10 insertions(+)
>
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile
> index e40ae08469..af8027cf0e 100644
> --- a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile
> @@ -270,6 +270,7 @@ tests-internal += tst-ibm128-error tst-ieee128-error
>  tests-internal += tst-ibm128-efgcvt tst-ieee128-efgcvt
>  
>  $(objpfx)tst-ieee128-efgcvt: gnulib-tests += $(f128-loader-link)
> +$(objpfx)tst-ldbl-efgcvt: gnulib-tests += $(f128-loader-link)

LGTM, but I think this test should mentioned in the commit message too.

Reviewed-by: Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com>
  
Paul E Murphy Feb. 27, 2020, 10:45 p.m. UTC | #2
On 2/27/20 2:39 PM, Tulio Magno Quites Machado Filho wrote:
> "Paul E. Murphy" <murphyp@linux.vnet.ibm.com> writes:
> 
>> For lack of a more comprehensive solution, tack on the ibm128 ABI
>> compiler options for the totalorder{,mag}l compat tests which exist
>> prior to enabling this feature.
>> ---
>>   sysdeps/ieee754/ldbl-128ibm-compat/Makefile | 10 ++++++++++
>>   1 file changed, 10 insertions(+)
>>
>> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile
>> index e40ae08469..af8027cf0e 100644
>> --- a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile
>> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile
>> @@ -270,6 +270,7 @@ tests-internal += tst-ibm128-error tst-ieee128-error
>>   tests-internal += tst-ibm128-efgcvt tst-ieee128-efgcvt
>>   
>>   $(objpfx)tst-ieee128-efgcvt: gnulib-tests += $(f128-loader-link)
>> +$(objpfx)tst-ldbl-efgcvt: gnulib-tests += $(f128-loader-link)

I agree and missed this when refactoring patches.  It has been moved 
into a separate patch.

> LGTM, but I think this test should mentioned in the commit message too.
> 
> Reviewed-by: Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com>
>
  
Paul E Murphy Feb. 28, 2020, 2:57 p.m. UTC | #3
On 2/27/20 4:45 PM, Paul E Murphy wrote:
> 
> 
> On 2/27/20 2:39 PM, Tulio Magno Quites Machado Filho wrote:
>> "Paul E. Murphy" <murphyp@linux.vnet.ibm.com> writes:
>>
>>> For lack of a more comprehensive solution, tack on the ibm128 ABI
>>> compiler options for the totalorder{,mag}l compat tests which exist
>>> prior to enabling this feature.
>>> ---
>>>   sysdeps/ieee754/ldbl-128ibm-compat/Makefile | 10 ++++++++++
>>>   1 file changed, 10 insertions(+)
>>>
>>> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile 
>>> b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile
>>> index e40ae08469..af8027cf0e 100644
>>> --- a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile
>>> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile
>>> @@ -270,6 +270,7 @@ tests-internal += tst-ibm128-error tst-ieee128-error
>>>   tests-internal += tst-ibm128-efgcvt tst-ieee128-efgcvt
>>>   $(objpfx)tst-ieee128-efgcvt: gnulib-tests += $(f128-loader-link)
>>> +$(objpfx)tst-ldbl-efgcvt: gnulib-tests += $(f128-loader-link)
> 
> I agree and missed this when refactoring patches.  It has been moved 
> into a separate patch.
> 
>> LGTM, but I think this test should mentioned in the commit message too.
>>
>> Reviewed-by: Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com>
>>

Committed and trivial one-liner moved to a second commit and committed.
  

Patch

diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile
index e40ae08469..af8027cf0e 100644
--- a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile
+++ b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile
@@ -270,6 +270,7 @@  tests-internal += tst-ibm128-error tst-ieee128-error
 tests-internal += tst-ibm128-efgcvt tst-ieee128-efgcvt
 
 $(objpfx)tst-ieee128-efgcvt: gnulib-tests += $(f128-loader-link)
+$(objpfx)tst-ldbl-efgcvt: gnulib-tests += $(f128-loader-link)
 
 $(objpfx)tst-ibm128-%.c: tst-ldbl-%.c
 	cp $< $@
@@ -318,6 +319,15 @@  CFLAGS-test-strfrom-ibm128.c += -mabi=ibmlongdouble -Wno-psabi
 $(objpfx)test-strfrom-ieee128: gnulib-tests += $(f128-loader-link)
 endif
 
+ifeq ($(subdir),math)
+# The totalorder{,mag} compatibility tests were added prior to this
+# support. Thus, they can only correctly be used with ibm128.
+CFLAGS-test-ldouble-compat_totalorder.c += -mabi=ibmlongdouble
+CFLAGS-test-ldouble-compat_totalordermag.c += -mabi=ibmlongdouble
+CFLAGS-test-ildouble-compat_totalorder.c += -mabi=ibmlongdouble
+CFLAGS-test-ildouble-compat_totalordermag.c += -mabi=ibmlongdouble
+endif
+
 # Add IEEE binary128 files as make targets.
 routines += $(foreach r,$(ldbl-extra-routines),ieee128-$(r))