[Bug target/104239] [12 Regression] immintrin.h or x86gprintrin.h headers can't be included

[cvs-commit at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104239

--- Comment #3 from CVS Commits <cvs-commit at gcc dot gnu.org> ---
The master branch has been updated by Jakub Jelinek <jakub@gcc.gnu.org>:

https://gcc.gnu.org/g:2bf8da684b712a16c67f3defc0dd97f175f8f4ad

commit r12-6884-g2bf8da684b712a16c67f3defc0dd97f175f8f4ad
Author: Jakub Jelinek <jakub@redhat.com>
Date:   Wed Jan 26 22:07:29 2022 +0100

    rs6000: Fix up #include <immintrin.h> or <x86gprintrin.h> [PR104239]

    r12-4717-g7d37abedf58d66 added immintrin.h and x86gprintrin.h headers
    to rs6000, these headers are on x86 standalone headers that various
    programs include directly rather than including them through
    <x86intrin.h>.
    Unfortunately, for that change the bmiintrin.h and bmi2intrin.h
    headers haven't been adjusted, so the effect is that if one includes them
    (without including also x86intrin.h first) #error will trigger.
    Furthermore, when including such headers conditionally as some real-world
    packages do, this means a regression.

    The following patch fixes it and matches what the x86 bmi{,2}intrin.h
    headers do.

    2022-01-26  Jakub Jelinek  <jakub@redhat.com>

            PR target/104239
            * config/rs6000/bmiintrin.h: Test _X86GPRINTRIN_H_INCLUDED instead
of
            _X86INTRIN_H_INCLUDED and adjust #error wording.
            * config/rs6000/bmi2intrin.h: Likewise.

            * gcc.target/powerpc/pr104239-1.c: New test.
            * gcc.target/powerpc/pr104239-2.c: New test.