diff options
| author | Aaron Ballman <aaron@aaronballman.com> | 2013-12-06 15:58:47 +0000 |
|---|---|---|
| committer | Aaron Ballman <aaron@aaronballman.com> | 2013-12-06 15:58:47 +0000 |
| commit | a40bef25eebdb0bfc87b054d40048a5072798bac (patch) | |
| tree | 3bcf2b2931b33ea3e0ae6d521b47bef1aa3de30e /clang/lib/Sema/TargetAttributesSema.cpp | |
| parent | e0ab9e79361d24216c8459c0af3ebe3eed45c1fb (diff) | |
| download | bcm5719-llvm-a40bef25eebdb0bfc87b054d40048a5072798bac.tar.gz bcm5719-llvm-a40bef25eebdb0bfc87b054d40048a5072798bac.zip | |
Reverting changes from r196415; this patch exposed a different, but unrelated bug regarding the __has_attribute implementation. Reverting to unblock the Chrome tsan builds.
llvm-svn: 196583
Diffstat (limited to 'clang/lib/Sema/TargetAttributesSema.cpp')
| -rw-r--r-- | clang/lib/Sema/TargetAttributesSema.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Sema/TargetAttributesSema.cpp b/clang/lib/Sema/TargetAttributesSema.cpp index 68f13494a3e..e5eb591683b 100644 --- a/clang/lib/Sema/TargetAttributesSema.cpp +++ b/clang/lib/Sema/TargetAttributesSema.cpp @@ -233,7 +233,8 @@ namespace { } } if (Triple.getArch() != llvm::Triple::x86_64 && - Attr.getKind() == AttributeList::AT_X86ForceAlignArgPointer) { + (Attr.getName()->getName() == "force_align_arg_pointer" || + Attr.getName()->getName() == "__force_align_arg_pointer__")) { HandleX86ForceAlignArgPointerAttr(D, Attr, S); return true; } |
