[compiler-rt] r253492 - [PGO] Fix the build failures due to 253483 and 253489.

[Betul Buyukkurt via llvm-commits]

Author: betulb
Date: Wed Nov 18 13:39:20 2015
New Revision: 253492

URL: http://llvm.org/viewvc/llvm-project?rev=253492&view=rev
Log:
[PGO] Fix the build failures due to 253483 and 253489.


Modified:
    compiler-rt/trunk/lib/profile/InstrProfiling.h

Modified: compiler-rt/trunk/lib/profile/InstrProfiling.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/profile/InstrProfiling.h?rev=253492&r1=253491&r2=253492&view=diff
==============================================================================
--- compiler-rt/trunk/lib/profile/InstrProfiling.h (original)
+++ compiler-rt/trunk/lib/profile/InstrProfiling.h Wed Nov 18 13:39:20 2015
@@ -12,10 +12,8 @@
 
 #ifdef _MSC_VER
 # define LLVM_ALIGNAS(x) __declspec(align(x))
-#elif __GNUC__ && !__has_feature(cxx_alignas)
-# define LLVM_ALIGNAS(x) __attribute__((aligned(x))
-#else
-# define LLVM_ALIGNAS(x) alignas(x)
+#elif __GNUC__
+# define LLVM_ALIGNAS(x) __attribute__((aligned(x)))
 #endif
 
 #if defined(__FreeBSD__) && defined(__i386__)