From bd16b112554990be42e082de2236f762a50d2375 Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Tue, 24 Apr 2018 17:40:47 +0000 Subject: [PATCH] [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. llvm-svn: 330743 --- clang/lib/Headers/__wmmintrin_aes.h | 6 +++--- clang/lib/Headers/__wmmintrin_pclmul.h | 6 +++--- clang/lib/Headers/clzerointrin.h | 6 +++--- clang/lib/Headers/mwaitxintrin.h | 6 +++--- clang/lib/Headers/nmmintrin.h | 6 +++--- clang/lib/Headers/popcntintrin.h | 6 +++--- clang/lib/Headers/smmintrin.h | 6 +++--- clang/lib/Headers/waitpkgintrin.h | 6 +++--- clang/lib/Headers/wmmintrin.h | 6 +++--- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/clang/lib/Headers/__wmmintrin_aes.h b/clang/lib/Headers/__wmmintrin_aes.h index 570776d..fc1dfa0 100644 --- a/clang/lib/Headers/__wmmintrin_aes.h +++ b/clang/lib/Headers/__wmmintrin_aes.h @@ -20,8 +20,8 @@ * *===-----------------------------------------------------------------------=== */ -#ifndef _WMMINTRIN_AES_H -#define _WMMINTRIN_AES_H +#ifndef __WMMINTRIN_AES_H +#define __WMMINTRIN_AES_H #include @@ -148,4 +148,4 @@ _mm_aesimc_si128(__m128i __V) #undef __DEFAULT_FN_ATTRS -#endif /* _WMMINTRIN_AES_H */ +#endif /* __WMMINTRIN_AES_H */ diff --git a/clang/lib/Headers/__wmmintrin_pclmul.h b/clang/lib/Headers/__wmmintrin_pclmul.h index e9c6a9f..246caeb 100644 --- a/clang/lib/Headers/__wmmintrin_pclmul.h +++ b/clang/lib/Headers/__wmmintrin_pclmul.h @@ -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 */ diff --git a/clang/lib/Headers/clzerointrin.h b/clang/lib/Headers/clzerointrin.h index ed7478f..74a7bf5 100644 --- a/clang/lib/Headers/clzerointrin.h +++ b/clang/lib/Headers/clzerointrin.h @@ -24,8 +24,8 @@ #error "Never use directly; include 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 */ diff --git a/clang/lib/Headers/mwaitxintrin.h b/clang/lib/Headers/mwaitxintrin.h index 635f2ac..2921ead 100644 --- a/clang/lib/Headers/mwaitxintrin.h +++ b/clang/lib/Headers/mwaitxintrin.h @@ -25,8 +25,8 @@ #error "Never use directly; include 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, unsigned __hints, unsigned __clock) #undef __DEFAULT_FN_ATTRS -#endif /* _MWAITXINTRIN_H */ +#endif /* __MWAITXINTRIN_H */ diff --git a/clang/lib/Headers/nmmintrin.h b/clang/lib/Headers/nmmintrin.h index 57fec15..348fb8c 100644 --- a/clang/lib/Headers/nmmintrin.h +++ b/clang/lib/Headers/nmmintrin.h @@ -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 -#endif /* _NMMINTRIN_H */ +#endif /* __NMMINTRIN_H */ diff --git a/clang/lib/Headers/popcntintrin.h b/clang/lib/Headers/popcntintrin.h index 0b4793e..72ed38d 100644 --- a/clang/lib/Headers/popcntintrin.h +++ b/clang/lib/Headers/popcntintrin.h @@ -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 */ diff --git a/clang/lib/Headers/smmintrin.h b/clang/lib/Headers/smmintrin.h index e02775c..4b84bae 100644 --- a/clang/lib/Headers/smmintrin.h +++ b/clang/lib/Headers/smmintrin.h @@ -21,8 +21,8 @@ *===-----------------------------------------------------------------------=== */ -#ifndef _SMMINTRIN_H -#define _SMMINTRIN_H +#ifndef __SMMINTRIN_H +#define __SMMINTRIN_H #include @@ -2462,4 +2462,4 @@ _mm_crc32_u64(unsigned long long __C, unsigned long long __D) #include #endif -#endif /* _SMMINTRIN_H */ +#endif /* __SMMINTRIN_H */ diff --git a/clang/lib/Headers/waitpkgintrin.h b/clang/lib/Headers/waitpkgintrin.h index f9fad1a..184c4aa 100644 --- a/clang/lib/Headers/waitpkgintrin.h +++ b/clang/lib/Headers/waitpkgintrin.h @@ -24,8 +24,8 @@ #error "Never use directly; include 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, unsigned long long __counter) #undef __DEFAULT_FN_ATTRS -#endif /* _WAITPKGINTRIN_H */ +#endif /* __WAITPKGINTRIN_H */ diff --git a/clang/lib/Headers/wmmintrin.h b/clang/lib/Headers/wmmintrin.h index a2d9310..569a8d8 100644 --- a/clang/lib/Headers/wmmintrin.h +++ b/clang/lib/Headers/wmmintrin.h @@ -21,8 +21,8 @@ *===-----------------------------------------------------------------------=== */ -#ifndef _WMMINTRIN_H -#define _WMMINTRIN_H +#ifndef __WMMINTRIN_H +#define __WMMINTRIN_H #include @@ -30,4 +30,4 @@ #include <__wmmintrin_pclmul.h> -#endif /* _WMMINTRIN_H */ +#endif /* __WMMINTRIN_H */ -- 2.7.4