After further discussion it has been determined that alignof should report

the preferred alignment.  Thus, revert r135934, r135935, and r135940.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@136062 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 2 insertions, 7 deletions

diff --git a/lib/Basic/TargetInfo.cpp b/lib/Basic/TargetInfo.cpp
index c7a87b20eb..7ea51467c1 100644
--- a/lib/Basic/TargetInfo.cpp
+++ b/lib/Basic/TargetInfo.cpp
@@ -65,9 +65,6 @@ 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/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index 53f5c0abaf..3aebc41d71 100644
--- a/lib/Basic/Targets.cpp
+++ b/lib/Basic/Targets.cpp
@@ -1978,13 +1978,11 @@ public:
                              "v64:32:64-v128:32:128-a0:0:32-n32");
       }
 
-      // Default to using minimum alignment, not preferred.
-      UsePreferredTypeAlign = false;
+      // FIXME: Override "preferred align" for double and long long.
     } else if (Name == "aapcs") {
       // FIXME: Enumerated types are variable width in straight AAPCS.
-
     } else if (Name == "aapcs-linux") {
-
+      ;
     } else
       return false;