diff --git a/clang/include/clang/AST/Attr.h b/clang/include/clang/AST/Attr.h
index 29b9d6354504..3240e50b0787 100644
--- a/clang/include/clang/AST/Attr.h
+++ b/clang/include/clang/AST/Attr.h
@@ -45,6 +45,7 @@ public:
   enum Kind {
     Alias,
     Aligned,
+    AlignMac68k,
     AlwaysInline,
     AnalyzerNoReturn, // Clang-specific.
     Annotate,
@@ -207,6 +208,8 @@ public:
   static bool classof(const MaxFieldAlignmentAttr *A) { return true; }
 };
 
+DEF_SIMPLE_ATTR(AlignMac68k);
+
 class AlignedAttr : public Attr {
   unsigned Alignment;
 public:
diff --git a/clang/lib/AST/AttrImpl.cpp b/clang/lib/AST/AttrImpl.cpp
index dbceeab6bd66..0fab22caced8 100644
--- a/clang/lib/AST/AttrImpl.cpp
+++ b/clang/lib/AST/AttrImpl.cpp
@@ -74,6 +74,7 @@ void NonNullAttr::Destroy(ASTContext &C) {
 // FIXME: Can we use variadic macro to define DEF_SIMPLE_ATTR_CLONE for
 // "non-simple" classes?
 
+DEF_SIMPLE_ATTR_CLONE(AlignMac68k)
 DEF_SIMPLE_ATTR_CLONE(AlwaysInline)
 DEF_SIMPLE_ATTR_CLONE(AnalyzerNoReturn)
 DEF_SIMPLE_ATTR_CLONE(BaseCheck)
diff --git a/clang/lib/Frontend/PCHReaderDecl.cpp b/clang/lib/Frontend/PCHReaderDecl.cpp
index 933034e7a0d3..1ef0441ebf60 100644
--- a/clang/lib/Frontend/PCHReaderDecl.cpp
+++ b/clang/lib/Frontend/PCHReaderDecl.cpp
@@ -666,6 +666,7 @@ Attr *PCHReader::ReadAttributes() {
       assert(0 && "Unknown attribute!");
       break;
     STRING_ATTR(Alias);
+    SIMPLE_ATTR(AlignMac68k);
     UNSIGNED_ATTR(Aligned);
     SIMPLE_ATTR(AlwaysInline);
     SIMPLE_ATTR(AnalyzerNoReturn);
diff --git a/clang/lib/Frontend/PCHWriter.cpp b/clang/lib/Frontend/PCHWriter.cpp
index efa0e3741ee8..3d5b7d8156a8 100644
--- a/clang/lib/Frontend/PCHWriter.cpp
+++ b/clang/lib/Frontend/PCHWriter.cpp
@@ -1836,6 +1836,9 @@ void PCHWriter::WriteAttributeRecord(const Attr *Attr) {
       AddString(cast<AliasAttr>(Attr)->getAliasee(), Record);
       break;
 
+    case Attr::AlignMac68k:
+      break;
+
     case Attr::Aligned:
       Record.push_back(cast<AlignedAttr>(Attr)->getAlignment());
       break;