1 files changed, 5 insertions, 5 deletions
diff --git a/lib/Sema/SemaDeclAttr.cpp b/lib/Sema/SemaDeclAttr.cpp
index adeb8e690f..12483a34e0 100644
--- a/lib/Sema/SemaDeclAttr.cpp
+++ b/lib/Sema/SemaDeclAttr.cpp
@@ -4759,11 +4759,11 @@ static void ProcessDeclAttribute(Sema &S, Scope *scope, Decl *D,
   if (Attr.isInvalid())
     return;
 
-  // Type attributes are still treated as declaration attributes by 
-  // ParseMicrosoftTypeAttributes and ParseBorlandTypeAttributes.  We don't 
-  // want to process them, however, because we will simply warn about ignoring 
-  // them.  So instead, we will bail out early.
-  if (Attr.isMSTypespecAttribute())
+  // FIXME: Ignore unknown keyword attributes for now. We see this in the case
+  // of some Borland attributes, like __pascal.
+  // FIXME: Add these attributes to Attr.td and mark as ignored!
+  if (Attr.isKeywordAttribute() &&
+      Attr.getKind() == AttributeList::UnknownAttribute)
     return;
 
   // Ignore C++11 attributes on declarator chunks: they appertain to the type