r330743 - [X86] Consistently use double underscore at the beginning of the include guards in our intrinsic headers.

Craig Topper via cfe-commits cfe-commits at lists.llvm.org
Tue Apr 24 10:40:47 PDT 2018


Author: ctopper
Date: Tue Apr 24 10:40:47 2018
New Revision: 330743

URL: http://llvm.org/viewvc/llvm-project?rev=330743&view=rev
Log:
[X86] Consistently use double underscore at the beginning of the include guards in our intrinsic headers.

Most files used double underscore, but a few used single. This converges them all to double.

Modified:
    cfe/trunk/lib/Headers/__wmmintrin_aes.h
    cfe/trunk/lib/Headers/__wmmintrin_pclmul.h
    cfe/trunk/lib/Headers/clzerointrin.h
    cfe/trunk/lib/Headers/mwaitxintrin.h
    cfe/trunk/lib/Headers/nmmintrin.h
    cfe/trunk/lib/Headers/popcntintrin.h
    cfe/trunk/lib/Headers/smmintrin.h
    cfe/trunk/lib/Headers/waitpkgintrin.h
    cfe/trunk/lib/Headers/wmmintrin.h

Modified: cfe/trunk/lib/Headers/__wmmintrin_aes.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/__wmmintrin_aes.h?rev=330743&r1=330742&r2=330743&view=diff
==============================================================================
--- cfe/trunk/lib/Headers/__wmmintrin_aes.h (original)
+++ cfe/trunk/lib/Headers/__wmmintrin_aes.h Tue Apr 24 10:40:47 2018
@@ -20,8 +20,8 @@
  *
  *===-----------------------------------------------------------------------===
  */
-#ifndef _WMMINTRIN_AES_H
-#define _WMMINTRIN_AES_H
+#ifndef __WMMINTRIN_AES_H
+#define __WMMINTRIN_AES_H
 
 #include <emmintrin.h>
 
@@ -148,4 +148,4 @@ _mm_aesimc_si128(__m128i __V)
 
 #undef __DEFAULT_FN_ATTRS
 
-#endif  /* _WMMINTRIN_AES_H */
+#endif  /* __WMMINTRIN_AES_H */

Modified: cfe/trunk/lib/Headers/__wmmintrin_pclmul.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/__wmmintrin_pclmul.h?rev=330743&r1=330742&r2=330743&view=diff
==============================================================================
--- cfe/trunk/lib/Headers/__wmmintrin_pclmul.h (original)
+++ cfe/trunk/lib/Headers/__wmmintrin_pclmul.h Tue Apr 24 10:40:47 2018
@@ -20,8 +20,8 @@
  *
  *===-----------------------------------------------------------------------===
  */
-#ifndef _WMMINTRIN_PCLMUL_H
-#define _WMMINTRIN_PCLMUL_H
+#ifndef __WMMINTRIN_PCLMUL_H
+#define __WMMINTRIN_PCLMUL_H
 
 /// \brief Multiplies two 64-bit integer values, which are selected from source
 ///    operands using the immediate-value operand. The multiplication is a
@@ -54,4 +54,4 @@
   ((__m128i)__builtin_ia32_pclmulqdq128((__v2di)(__m128i)(__X), \
                                         (__v2di)(__m128i)(__Y), (char)(__I)))
 
-#endif /* _WMMINTRIN_PCLMUL_H */
+#endif /* __WMMINTRIN_PCLMUL_H */

Modified: cfe/trunk/lib/Headers/clzerointrin.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/clzerointrin.h?rev=330743&r1=330742&r2=330743&view=diff
==============================================================================
--- cfe/trunk/lib/Headers/clzerointrin.h (original)
+++ cfe/trunk/lib/Headers/clzerointrin.h Tue Apr 24 10:40:47 2018
@@ -24,8 +24,8 @@
 #error "Never use <clzerointrin.h> directly; include <x86intrin.h> instead."
 #endif
 
-#ifndef _CLZEROINTRIN_H
-#define _CLZEROINTRIN_H
+#ifndef __CLZEROINTRIN_H
+#define __CLZEROINTRIN_H
 
 /* Define the default attributes for the functions in this file. */
 #define __DEFAULT_FN_ATTRS \
@@ -47,4 +47,4 @@ _mm_clzero (void * __line)
 
 #undef __DEFAULT_FN_ATTRS 
 
-#endif /* _CLZEROINTRIN_H */
+#endif /* __CLZEROINTRIN_H */

Modified: cfe/trunk/lib/Headers/mwaitxintrin.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/mwaitxintrin.h?rev=330743&r1=330742&r2=330743&view=diff
==============================================================================
--- cfe/trunk/lib/Headers/mwaitxintrin.h (original)
+++ cfe/trunk/lib/Headers/mwaitxintrin.h Tue Apr 24 10:40:47 2018
@@ -25,8 +25,8 @@
 #error "Never use <mwaitxintrin.h> directly; include <x86intrin.h> instead."
 #endif
 
-#ifndef _MWAITXINTRIN_H
-#define _MWAITXINTRIN_H
+#ifndef __MWAITXINTRIN_H
+#define __MWAITXINTRIN_H
 
 /* Define the default attributes for the functions in this file. */
 #define __DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,  __target__("mwaitx")))
@@ -44,4 +44,4 @@ _mm_mwaitx(unsigned __extensions, unsign
 
 #undef __DEFAULT_FN_ATTRS
 
-#endif /* _MWAITXINTRIN_H */
+#endif /* __MWAITXINTRIN_H */

Modified: cfe/trunk/lib/Headers/nmmintrin.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/nmmintrin.h?rev=330743&r1=330742&r2=330743&view=diff
==============================================================================
--- cfe/trunk/lib/Headers/nmmintrin.h (original)
+++ cfe/trunk/lib/Headers/nmmintrin.h Tue Apr 24 10:40:47 2018
@@ -21,10 +21,10 @@
  *===-----------------------------------------------------------------------===
  */
 
-#ifndef _NMMINTRIN_H
-#define _NMMINTRIN_H
+#ifndef __NMMINTRIN_H
+#define __NMMINTRIN_H
 
 /* To match expectations of gcc we put the sse4.2 definitions into smmintrin.h,
    just include it now then.  */
 #include <smmintrin.h>
-#endif /* _NMMINTRIN_H */
+#endif /* __NMMINTRIN_H */

Modified: cfe/trunk/lib/Headers/popcntintrin.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/popcntintrin.h?rev=330743&r1=330742&r2=330743&view=diff
==============================================================================
--- cfe/trunk/lib/Headers/popcntintrin.h (original)
+++ cfe/trunk/lib/Headers/popcntintrin.h Tue Apr 24 10:40:47 2018
@@ -21,8 +21,8 @@
  *===-----------------------------------------------------------------------===
  */
 
-#ifndef _POPCNTINTRIN_H
-#define _POPCNTINTRIN_H
+#ifndef __POPCNTINTRIN_H
+#define __POPCNTINTRIN_H
 
 /* Define the default attributes for the functions in this file. */
 #define __DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__, __target__("popcnt")))
@@ -95,4 +95,4 @@ _popcnt64(long long __A)
 
 #undef __DEFAULT_FN_ATTRS
 
-#endif /* _POPCNTINTRIN_H */
+#endif /* __POPCNTINTRIN_H */

Modified: cfe/trunk/lib/Headers/smmintrin.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/smmintrin.h?rev=330743&r1=330742&r2=330743&view=diff
==============================================================================
--- cfe/trunk/lib/Headers/smmintrin.h (original)
+++ cfe/trunk/lib/Headers/smmintrin.h Tue Apr 24 10:40:47 2018
@@ -21,8 +21,8 @@
  *===-----------------------------------------------------------------------===
  */
 
-#ifndef _SMMINTRIN_H
-#define _SMMINTRIN_H
+#ifndef __SMMINTRIN_H
+#define __SMMINTRIN_H
 
 #include <tmmintrin.h>
 
@@ -2462,4 +2462,4 @@ _mm_crc32_u64(unsigned long long __C, un
 #include <popcntintrin.h>
 #endif
 
-#endif /* _SMMINTRIN_H */
+#endif /* __SMMINTRIN_H */

Modified: cfe/trunk/lib/Headers/waitpkgintrin.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/waitpkgintrin.h?rev=330743&r1=330742&r2=330743&view=diff
==============================================================================
--- cfe/trunk/lib/Headers/waitpkgintrin.h (original)
+++ cfe/trunk/lib/Headers/waitpkgintrin.h Tue Apr 24 10:40:47 2018
@@ -24,8 +24,8 @@
 #error "Never use <waitpkgintrin.h> directly; include <x86intrin.h> instead."
 #endif
 
-#ifndef _WAITPKGINTRIN_H
-#define _WAITPKGINTRIN_H
+#ifndef __WAITPKGINTRIN_H
+#define __WAITPKGINTRIN_H
 
 /* Define the default attributes for the functions in this file. */
 #define __DEFAULT_FN_ATTRS \
@@ -53,4 +53,4 @@ _tpause (unsigned int __control, unsigne
 
 #undef __DEFAULT_FN_ATTRS
 
-#endif /* _WAITPKGINTRIN_H */
+#endif /* __WAITPKGINTRIN_H */

Modified: cfe/trunk/lib/Headers/wmmintrin.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/wmmintrin.h?rev=330743&r1=330742&r2=330743&view=diff
==============================================================================
--- cfe/trunk/lib/Headers/wmmintrin.h (original)
+++ cfe/trunk/lib/Headers/wmmintrin.h Tue Apr 24 10:40:47 2018
@@ -21,8 +21,8 @@
  *===-----------------------------------------------------------------------===
  */
 
-#ifndef _WMMINTRIN_H
-#define _WMMINTRIN_H
+#ifndef __WMMINTRIN_H
+#define __WMMINTRIN_H
 
 #include <emmintrin.h>
 
@@ -30,4 +30,4 @@
 
 #include <__wmmintrin_pclmul.h>
 
-#endif /* _WMMINTRIN_H */
+#endif /* __WMMINTRIN_H */




More information about the cfe-commits mailing list