diff mbox series

V2 [PATCH] x86: Replace <enqcmdntrin.h> with <enqcmdintrin.h>

Message ID CAMe9rOrTF56VZYHzU8f8VnX5z1AVxSuZZ3FhcYCccrVn0m-vUA@mail.gmail.com
State New
Headers show
Series V2 [PATCH] x86: Replace <enqcmdntrin.h> with <enqcmdintrin.h> | expand

Commit Message

H.J. Lu Sept. 29, 2020, 6:58 p.m. UTC 
On Tue, Sep 29, 2020 at 11:49 AM Jakub Jelinek <jakub@redhat.com> wrote:
>
> On Tue, Sep 29, 2020 at 11:46:24AM -0700, H.J. Lu via Gcc-patches wrote:
> > Fix a typo in config/i386/enqcmdintrin.h by replacing <enqcmdntrin.h>
> > with <enqcmdintrin.h>:
> >
> > [hjl@gnu-cfl-2 x86-gcc]$ echo "#include <enqcmdintrin.h>" | gcc -S -o /dev/null -x c -
> > In file included from <stdin>:1:
> > /usr/lib/gcc/x86_64-redhat-linux/10/include/enqcmdintrin.h:25:3: error: #error "Never use <enqcmdntrin.h> directly; include <x86intrin.h> instead."
> >    25 | # error "Never use <enqcmdntrin.h> directly; include <x86intrin.h> instead."
> >       |   ^~~~~
> > [hjl@gnu-cfl-2 x86-gcc]$
> >
> > gcc/
> >
> >       PR target/97247
> >       * config/i386/enqcmdintrin.h: Replace <enqcmdntrin.h> with
> >       <enqcmdintrin.h>.
>
> >  gcc/config/i386/enqcmdintrin.h | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/gcc/config/i386/enqcmdintrin.h b/gcc/config/i386/enqcmdintrin.h
> > index 4b2efcb9a20..72ef1ca7b5d 100644
> > --- a/gcc/config/i386/enqcmdintrin.h
> > +++ b/gcc/config/i386/enqcmdintrin.h
> > @@ -22,7 +22,7 @@
> >     <http://www.gnu.org/licenses/>.  */
> >
> >  #if !defined _IMMINTRIN_H_INCLUDED
> > -# error "Never use <enqcmdntrin.h> directly; include <x86intrin.h> instead."
> > +# error "Never use <enqcmdintrin.h> directly; include <x86intrin.h> instead."
>
> That isn't the only typo.
> >  #endif
> >
> >  #ifndef _ENQCMDNTRIN_H_INCLUDED
>
> The I is missing in this macro too.
>

Fixed.

Here is the V2 patch.  OK for master and GCC 10 branches?

Thanks.

Comments

Jakub Jelinek Sept. 29, 2020, 7 p.m. UTC | #1 
On Tue, Sep 29, 2020 at 11:58:39AM -0700, H.J. Lu wrote:
> Here is the V2 patch.  OK for master and GCC 10 branches?

Yes, thanks.

	Jakub
diff mbox series

Patch

From b135b3b2e016f2095bd9c2ae7da10175cf082adb Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Tue, 29 Sep 2020 11:40:46 -0700
Subject: [PATCH] x86: Replace <enqcmdntrin.h> with <enqcmdintrin.h>

Fix 2 typos in config/i386/enqcmdintrin.h by replacing <enqcmdntrin.h>
with <enqcmdintrin.h>:

[hjl@gnu-cfl-2 x86-gcc]$ echo "#include <enqcmdintrin.h>" | gcc -S -o /dev/null -x c -
In file included from <stdin>:1:
/usr/lib/gcc/x86_64-redhat-linux/10/include/enqcmdintrin.h:25:3: error: #error "Never use <enqcmdntrin.h> directly; include <x86intrin.h> instead."
   25 | # error "Never use <enqcmdntrin.h> directly; include <x86intrin.h> instead."
      |   ^~~~~
[hjl@gnu-cfl-2 x86-gcc]$

and _ENQCMDINTRIN_H_INCLUDED with _ENQCMDINTRIN_H_INCLUDED.

gcc/

	PR target/97247
	* config/i386/enqcmdintrin.h: Replace <enqcmdntrin.h> with
	<enqcmdintrin.h>.  Replace _ENQCMDNTRIN_H_INCLUDED with
	_ENQCMDINTRIN_H_INCLUDED.
---
 gcc/config/i386/enqcmdintrin.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gcc/config/i386/enqcmdintrin.h b/gcc/config/i386/enqcmdintrin.h
index 4b2efcb9a20..721dfb2ca92 100644
--- a/gcc/config/i386/enqcmdintrin.h
+++ b/gcc/config/i386/enqcmdintrin.h
@@ -22,11 +22,11 @@ 
    <http://www.gnu.org/licenses/>.  */
 
 #if !defined _IMMINTRIN_H_INCLUDED
-# error "Never use <enqcmdntrin.h> directly; include <x86intrin.h> instead."
+# error "Never use <enqcmdintrin.h> directly; include <x86intrin.h> instead."
 #endif
 
-#ifndef _ENQCMDNTRIN_H_INCLUDED
-#define _ENQCMDNTRIN_H_INCLUDED
+#ifndef _ENQCMDINTRIN_H_INCLUDED
+#define _ENQCMDINTRIN_H_INCLUDED
 
 #ifndef __ENQCMD__
 #pragma GCC push_options
@@ -52,4 +52,4 @@  _enqcmds (void * __P, const void * __Q)
 #undef __DISABLE_ENQCMD__
 #pragma GCC pop_options
 #endif /* __DISABLE_ENQCMD__ */
-#endif /* _ENQCMDNTRIN_H_INCLUDED.  */
+#endif /* _ENQCMDINTRIN_H_INCLUDED.  */
-- 
2.26.2