From a40bef25eebdb0bfc87b054d40048a5072798bac Mon Sep 17 00:00:00 2001
From: Aaron Ballman <aaron@aaronballman.com>
Date: Fri, 6 Dec 2013 15:58:47 +0000
Subject: 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
---
 clang/lib/Sema/TargetAttributesSema.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'clang/lib/Sema/TargetAttributesSema.cpp')

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;
       }
-- 
cgit v1.2.3