diff options
| author | Hal Finkel <hfinkel@anl.gov> | 2014-09-10 21:06:11 +0000 |
|---|---|---|
| committer | Hal Finkel <hfinkel@anl.gov> | 2014-09-10 21:06:11 +0000 |
| commit | 8123630a2184921a62e2314b8dce878bc0a4d864 (patch) | |
| tree | 66ac72704710a686bbc177def96964ec15058bf5 | |
| parent | 71b70841126a975d8876ba72cfba7ed803e9b689 (diff) | |
| download | bcm5719-llvm-8123630a2184921a62e2314b8dce878bc0a4d864.tar.gz bcm5719-llvm-8123630a2184921a62e2314b8dce878bc0a4d864.zip | |
Enable use of __builtin_assume_aligned when self-hosting
Clang/LLVM trunk now have support for __builtin_assume_aligned, turn this &&
into an || so we can use it ourselves.
llvm-svn: 217545
| -rw-r--r-- | llvm/include/llvm/Support/Compiler.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/include/llvm/Support/Compiler.h b/llvm/include/llvm/Support/Compiler.h index 85f0cc6a391..66d310133f8 100644 --- a/llvm/include/llvm/Support/Compiler.h +++ b/llvm/include/llvm/Support/Compiler.h @@ -284,7 +284,7 @@ /// \macro LLVM_ASSUME_ALIGNED /// \brief Returns a pointer with an assumed alignment. -#if __has_builtin(__builtin_assume_aligned) && __GNUC_PREREQ(4, 7) +#if __has_builtin(__builtin_assume_aligned) || __GNUC_PREREQ(4, 7) # define LLVM_ASSUME_ALIGNED(p, a) __builtin_assume_aligned(p, a) #elif defined(LLVM_BUILTIN_UNREACHABLE) // As of today, clang does not support __builtin_assume_aligned. |
