[llvm-branch-commits] [cfe-branch] r101823 - in /cfe/branches/Apple/williamson: include/clang/Driver/Options.td lib/Basic/Targets.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Mon Apr 19 17:46:27 2010
New Revision: 101823

URL: http://llvm.org/viewvc/llvm-project?rev=101823&view=rev
Log:
Back out r100253 for now, we are currently building with a pre-AES LLVM.

--- Reverse-merging r100253 into '.':
U    include/clang/Driver/Options.td
U    lib/Basic/Targets.cpp

Modified:
    cfe/branches/Apple/williamson/include/clang/Driver/Options.td
    cfe/branches/Apple/williamson/lib/Basic/Targets.cpp

Modified: cfe/branches/Apple/williamson/include/clang/Driver/Options.td
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/williamson/include/clang/Driver/Options.td?rev=101823&r1=101822&r2=101823&view=diff
==============================================================================
--- cfe/branches/Apple/williamson/include/clang/Driver/Options.td (original)
+++ cfe/branches/Apple/williamson/include/clang/Driver/Options.td Mon Apr 19 17:46:27 2010
@@ -432,7 +432,6 @@
 def mno_sse4_2 : Flag<"-mno-sse4.2">, Group<m_x86_Features_Group>;
 def mno_sse : Flag<"-mno-sse">, Group<m_x86_Features_Group>;
 def mno_ssse3 : Flag<"-mno-ssse3">, Group<m_x86_Features_Group>;
-def mno_aes : Flag<"-mno-aes">, Group<m_x86_Features_Group>;
 
 def mno_thumb : Flag<"-mno-thumb">, Group<m_Group>;
 def marm : Flag<"-marm">, Alias<mno_thumb>;
@@ -449,7 +448,6 @@
 def msse4_2 : Flag<"-msse4.2">, Group<m_x86_Features_Group>;
 def msse : Flag<"-msse">, Group<m_x86_Features_Group>;
 def mssse3 : Flag<"-mssse3">, Group<m_x86_Features_Group>;
-def maes : Flag<"-maes">, Group<m_x86_Features_Group>;
 def mthumb : Flag<"-mthumb">, Group<m_Group>;
 def mtune_EQ : Joined<"-mtune=">, Group<m_Group>;
 def multi__module : Flag<"-multi_module">;

Modified: cfe/branches/Apple/williamson/lib/Basic/Targets.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/williamson/lib/Basic/Targets.cpp?rev=101823&r1=101822&r2=101823&view=diff
==============================================================================
--- cfe/branches/Apple/williamson/lib/Basic/Targets.cpp (original)
+++ cfe/branches/Apple/williamson/lib/Basic/Targets.cpp Mon Apr 19 17:46:27 2010
@@ -765,12 +765,9 @@
     NoAMD3DNow, AMD3DNow, AMD3DNowAthlon
   } AMD3DNowLevel;
 
-  bool HasAES;
-  
 public:
   X86TargetInfo(const std::string& triple)
-    : TargetInfo(triple), SSELevel(NoMMXSSE), AMD3DNowLevel(NoAMD3DNow),
-      HasAES(false) {
+    : TargetInfo(triple), SSELevel(NoMMXSSE), AMD3DNowLevel(NoAMD3DNow) {
     LongDoubleFormat = &llvm::APFloat::x87DoubleExtended;
   }
   virtual void getTargetBuiltins(const Builtin::Info *&Records,
@@ -816,7 +813,6 @@
   Features["ssse3"] = false;
   Features["sse41"] = false;
   Features["sse42"] = false;
-  Features["aes"] = false;
 
   // LLVM does not currently recognize this.
   // Features["sse4a"] = false;
@@ -845,10 +841,8 @@
     Features["sse42"] = false;
   } else if (CPU == "atom")
     setFeatureEnabled(Features, "sse3", true);
-  else if (CPU == "corei7") {
+  else if (CPU == "corei7")
     setFeatureEnabled(Features, "sse4", true);
-    setFeatureEnabled(Features, "aes", true);
-  }
   else if (CPU == "k6" || CPU == "winchip-c6")
     setFeatureEnabled(Features, "mmx", true);
   else if (CPU == "k6-2" || CPU == "k6-3" || CPU == "athlon" ||
@@ -898,8 +892,6 @@
       Features["3dnowa"] = true;
     else if (Name == "3dnowa")
       Features["3dnow"] = Features["3dnowa"] = true;
-    else if (Name == "aes")
-      Features["aes"] = true;
   } else {
     if (Name == "mmx")
       Features["mmx"] = Features["sse"] = Features["sse2"] = Features["sse3"] =
@@ -925,8 +917,6 @@
       Features["3dnow"] = Features["3dnowa"] = false;
     else if (Name == "3dnowa")
       Features["3dnowa"] = false;
-    else if (Name == "aes")
-      Features["aes"] = false;
   }
 
   return true;
@@ -941,11 +931,6 @@
     if (Features[i][0] == '-')
       continue;
 
-    if (Features[i].substr(1) == "aes") {
-      HasAES = true;
-      continue;
-    }
-
     assert(Features[i][0] == '+' && "Invalid target feature!");
     X86SSEEnum Level = llvm::StringSwitch<X86SSEEnum>(Features[i].substr(1))
       .Case("sse42", SSE42)
@@ -984,9 +969,6 @@
     DefineStd(Builder, "i386", Opts);
   }
 
-  if (HasAES)
-    Builder.defineMacro("__AES__");
-
   // Target properties.
   Builder.defineMacro("__LITTLE_ENDIAN__");