[committed] libstdc++: More workarounds in 17_intro/names.cc test [PR 97088]

[Christophe LYON]

On 28/06/2021 17:26, Jonathan Wakely wrote:
> On Mon, 28 Jun 2021 at 15:20, Jonathan Wakely wrote:
>> On Mon, 28 Jun 2021 at 12:56, Christophe LYON wrote:
>>>
>>> On 25/06/2021 21:51, Jonathan Wakely via Libstdc++ wrote:
>>>> Conditionally #undef some more names that are used in system headers.
>>>>
>>>> libstdc++-v3/ChangeLog:
>>>>
>>>>        PR libstdc++/97088
>>>>        * testsuite/17_intro/names.cc: Undef more names for newlib and
>>>>        also for arm-none-linux-gnueabi.
>>>>        * testsuite/experimental/names.cc: Disable PCH.
>>>>
>>>> Tested powerpc64le-linux. Committed to trunk.
>>> Hi Jonathan,
>>>
>>> After disabling PCH, we now have the following failures on arm-eabi,
>>> using newlib-3.3:
>>>
>>> FAIL: experimental/names.cc (test for excess errors)
>>> Excess errors:
>>> /aci-gcc-fsf/builds/gcc-fsf-gccsrc/tools/arm-none-eabi/include/math.h:194:
>>> error: expected ')' before ';' token
>>> /aci-gcc-fsf/builds/gcc-fsf-gccsrc/tools/arm-none-eabi/include/math.h:195:
>>> error: expected ')' before ';' token
>>> /aci-gcc-fsf/builds/gcc-fsf-gccsrc/tools/arm-none-eabi/include/math.h:196:
>>> error: expected ')' before ';' token
>>> /aci-gcc-fsf/builds/gcc-fsf-gccsrc/tools/arm-none-eabi/include/math.h:197:
>>> error: expected ')' before ';' token
>>> /aci-gcc-fsf/builds/gcc-fsf-gccsrc/tools/arm-none-eabi/include/math.h:198:
>>> error: expected ')' before ';' token
>>> /aci-gcc-fsf/builds/gcc-fsf-gccsrc/tools/arm-none-eabi/include/math.h:199:
>>> error: expected ')' before ';' token
>>> /aci-gcc-fsf/builds/gcc-fsf-gccsrc/tools/arm-none-eabi/include/math.h:200:
>>> error: expected ')' before ';' token
>>> /aci-gcc-fsf/builds/gcc-fsf-gccsrc/tools/arm-none-eabi/include/math.h:201:
>>> error: expected ')' before ';' token
>>> /aci-gcc-fsf/builds/gcc-fsf-gccsrc/tools/arm-none-eabi/include/time.h:110:
>>> error: expected unqualified-id before ';' token
>>> /aci-gcc-fsf/builds/gcc-fsf-gccsrc/tools/arm-none-eabi/include/time.h:110:
>>> error: expected ')' before ';' token
>>> /aci-gcc-fsf/builds/gcc-fsf-gccsrc/tools/arm-none-eabi/include/inttypes.h:323:
>>> error: expected ')' before ';' token
>>>
>>> All this is a bit of a mess :-)
>> Ugh, that's because I made a mess of the #if logic. My last change was
>> supposed to avoid exactly those errors, but I messed up.
>>
>> I'm testing the attached patch (but not on arm or newlib), which should fix it.
> That's pushed to trunk now (r12-1845).

Thanks, I'll let you know if there are any problems.


Christophe