2 files changed, 7 insertions, 2 deletions
diff --git a/clang/lib/Basic/TargetInfo.cpp b/clang/lib/Basic/TargetInfo.cpp
index 7ea51467c18..c7a87b20eb8 100644
--- a/clang/lib/Basic/TargetInfo.cpp
+++ b/clang/lib/Basic/TargetInfo.cpp
@@ -65,6 +65,9 @@ TargetInfo::TargetInfo(const std::string &T) : Triple(T) {
   // Default to no types using fpret.
   RealTypeUsesObjCFPRet = 0;
 
+  // Default to using preferred type alignment.
+  UsePreferredTypeAlign = true;
+
   // Default to using the Itanium ABI.
   CXXABI = CXXABI_Itanium;
 
diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp
index 3aebc41d713..53f5c0abafc 100644
--- a/clang/lib/Basic/Targets.cpp
+++ b/clang/lib/Basic/Targets.cpp
@@ -1978,11 +1978,13 @@ public:
                              "v64:32:64-v128:32:128-a0:0:32-n32");
       }
 
-      // FIXME: Override "preferred align" for double and long long.
+      // Default to using minimum alignment, not preferred.
+      UsePreferredTypeAlign = false;
     } else if (Name == "aapcs") {
       // FIXME: Enumerated types are variable width in straight AAPCS.
+
     } else if (Name == "aapcs-linux") {
-      ;
+
     } else
       return false;