diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2022-01-26 22:07:29 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2022-01-26 22:07:29 +0100 |
| commit | 2bf8da684b712a16c67f3defc0dd97f175f8f4ad (patch) | |
| tree | 0c20e1a6cc8944636839141b3c94521937c4c35d /gcc | |
| parent | 9bf217920457f2e2d46b601f24721780a20a031b (diff) | |
| download | gcc-2bf8da684b712a16c67f3defc0dd97f175f8f4ad.zip gcc-2bf8da684b712a16c67f3defc0dd97f175f8f4ad.tar.gz gcc-2bf8da684b712a16c67f3defc0dd97f175f8f4ad.tar.bz2 | |
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.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/config/rs6000/bmi2intrin.h | 4 | ||||
| -rw-r--r-- | gcc/config/rs6000/bmiintrin.h | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.target/powerpc/pr104239-1.c | 10 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.target/powerpc/pr104239-2.c | 10 |
4 files changed, 24 insertions, 4 deletions
diff --git a/gcc/config/rs6000/bmi2intrin.h b/gcc/config/rs6000/bmi2intrin.h index 9bf36e9..931a61d 100644 --- a/gcc/config/rs6000/bmi2intrin.h +++ b/gcc/config/rs6000/bmi2intrin.h @@ -29,8 +29,8 @@ standard C or GNU C extensions, which are more portable and better optimized across multiple targets. */ -#if !defined _X86INTRIN_H_INCLUDED -# error "Never use <bmi2intrin.h> directly; include <x86intrin.h> instead." +#if !defined _X86GPRINTRIN_H_INCLUDED +# error "Never use <bmi2intrin.h> directly; include <x86gprintrin.h> instead." #endif #ifndef _BMI2INTRIN_H_INCLUDED diff --git a/gcc/config/rs6000/bmiintrin.h b/gcc/config/rs6000/bmiintrin.h index 8845f70..76cbc47 100644 --- a/gcc/config/rs6000/bmiintrin.h +++ b/gcc/config/rs6000/bmiintrin.h @@ -29,8 +29,8 @@ standard C or GNU C extensions, which are more portable and better optimized across multiple targets. */ -#if !defined _X86INTRIN_H_INCLUDED -# error "Never use <bmiintrin.h> directly; include <x86intrin.h> instead." +#if !defined _X86GPRINTRIN_H_INCLUDED +# error "Never use <bmiintrin.h> directly; include <x86gprintrin.h> instead." #endif #ifndef _BMIINTRIN_H_INCLUDED diff --git a/gcc/testsuite/gcc.target/powerpc/pr104239-1.c b/gcc/testsuite/gcc.target/powerpc/pr104239-1.c new file mode 100644 index 0000000..eacdedd --- /dev/null +++ b/gcc/testsuite/gcc.target/powerpc/pr104239-1.c @@ -0,0 +1,10 @@ +/* PR target/104239 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -mdejagnu-cpu=power8 -DNO_WARN_X86_INTRINSICS" } */ +/* { dg-require-effective-target powerpc_p8vector_ok } */ + +#if __has_include(<immintrin.h>) +#include <immintrin.h> +#endif + +int i; diff --git a/gcc/testsuite/gcc.target/powerpc/pr104239-2.c b/gcc/testsuite/gcc.target/powerpc/pr104239-2.c new file mode 100644 index 0000000..1bf316f --- /dev/null +++ b/gcc/testsuite/gcc.target/powerpc/pr104239-2.c @@ -0,0 +1,10 @@ +/* PR target/104239 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -mdejagnu-cpu=power8 -DNO_WARN_X86_INTRINSICS" } */ +/* { dg-require-effective-target powerpc_p8vector_ok } */ + +#if __has_include(<x86gprintrin.h>) +#include <x86gprintrin.h> +#endif + +int i; |