I will backport this to glibc 2.28 branch next week.

H.J.

---------- Forwarded message ---------
From: H.J. Lu <hjl.tools@gmail.com>
Date: Fri, Sep 28, 2018 at 1:25 PM
Subject: Re: [PATCH] i386: Use _dl_runtime_[resolve|profile]_shstk for
SHSTK [BZ #23716]
To: Florian Weimer <fweimer@redhat.com>
Cc: GNU C Library <libc-alpha@sourceware.org>


On Fri, Sep 28, 2018 at 7:33 AM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Wed, Sep 26, 2018 at 10:30 AM, H.J. Lu <hjl.tools@gmail.com> wrote:
>> On Wed, Sep 26, 2018 at 10:23 AM, Florian Weimer <fweimer@redhat.com> wrote:
>>> * H. J. Lu:
>>>
>>>> diff --git a/sysdeps/i386/dl-trampoline.S b/sysdeps/i386/dl-trampoline.S
>>>> index 6dc0319216..9734f9c981 100644
>>>> --- a/sysdeps/i386/dl-trampoline.S
>>>> +++ b/sysdeps/i386/dl-trampoline.S
>>>> @@ -33,6 +33,7 @@
>>>>  _dl_runtime_resolve:
>>>>       cfi_adjust_cfa_offset (8)
>>>>       _CET_ENDBR
>>>> +     hlt
>>>>       pushl %eax              # Preserve registers otherwise clobbered.
>>>>       cfi_adjust_cfa_offset (4)
>>>>       pushl %ecx
>>>
>>> That doesn't look right. 8-)
>>>
>>
>> This is the change I used to test my fix to verify that the SHSTK resolver
>> is used if SHSTK is enabled by kernel.  It isn't the part of the fix.
>>
>
> We verified that the fix worked on CET simulator.  If there is no objection,
> I will check it later today.
>
> Thanks.

This is the patch I am checking in now.

--
H.J.


-- 
H.J.