[PATCH] x86-64: Don't set GLRO(dl_platform) to NULL [BZ #22299]

[H.J. Lu]

On Sun, Oct 22, 2017 at 4:52 AM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Thu, Oct 19, 2017 at 8:27 AM, H.J. Lu <hjl.tools@gmail.com> wrote:
>> On Thu, Oct 19, 2017 at 7:51 AM, Florian Weimer <fweimer@redhat.com> wrote:
>>> On 10/19/2017 04:41 PM, H.J. Lu wrote:
>>>>
>>>> +      if (platform)
>>>> +       GLRO(dl_platform) = platform;
>>>
>>>
>>> This should use “if (platform != NULL)”.
>>
>> Done.
>>
>>>> +ifneq (no,$(have-tunables))
>>>> +tests += tst-platform-1
>>>> +modules-names += tst-platformmod-1 x86_64/tst-platformmod-2
>>>> +CFLAGS-tst-platform-1.c = -mno-avx
>>>> +CFLAGS-tst-platformmod-1.c = -mno-avx
>>>> +CFLAGS-tst-platformmod-2.c = -mno-avx
>>>> +LDFLAGS-tst-platformmod-2.so = -Wl,-soname,tst-platformmod-2.so
>>>> +$(objpfx)tst-platform-1: $(objpfx)tst-platformmod-1.so
>>>> +$(objpfx)tst-platform-1.out: $(objpfx)x86_64/tst-platformmod-2.so
>>>> +# Turn off AVX512F_Usable and AVX2_Usable so that GLRO(dl_platform) is
>>>> +# always set to x86_64.
>>>> +tst-platform-1-ENV = LD_PRELOAD=$(objpfx)\$$PLATFORM/tst-platformmod-2.so
>>>> \
>>>> +       GLIBC_TUNABLES=glibc.tune.hwcaps=-AVX512F_Usable,-AVX2_Usable
>>>> +endif
>>>
>>>
>>> Does this build $(objpfx)/tst-platformmod-2.so?  I think this would
>>
>> No.  x86_64/tst-platformmod-2, not tst-platformmod-2, is added to
>> modules-names.
>>
>> [hjl@gnu-6 build-x86_64-linux]$ find -name tst-platformmod-2.so
>> ./elf/x86_64/tst-platformmod-2.so
>> [hjl@gnu-6 build-x86_64-linux]$
>>
>>> invalidate part of the test.
>>
>> I am checking it in now.
>>
>
> I'd like to backport it to 2.26 branch.  Any objections?
>

I am checking it in.

-- 
H.J.