From: Bill Wendling <isanbard@gmail.com>
Date: Wed, 29 Apr 2009 23:40:42 +0000 (+0000)
Subject: Remove LTO optimization level.
X-Git-Tag: android-x86-6.0-r1~1003^2~20933
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b8cb0bb08c7f9f2dfcdfa5f7d72a4c56a9c93228;p=android-x86%2Fexternal-llvm.git

Remove LTO optimization level.

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

diff --git a/include/llvm/Target/TargetMachine.h b/include/llvm/Target/TargetMachine.h
index 8afd71f721b..771f52b8306 100644
--- a/include/llvm/Target/TargetMachine.h
+++ b/include/llvm/Target/TargetMachine.h
@@ -76,8 +76,7 @@ namespace CodeGenOpt {
     One,
     Two,
     Size,
-    Aggressive,
-    LTO
+    Aggressive
   };
 }
 
diff --git a/tools/llc/llc.cpp b/tools/llc/llc.cpp
index cf583843784..bb49d32a4ac 100644
--- a/tools/llc/llc.cpp
+++ b/tools/llc/llc.cpp
@@ -263,7 +263,6 @@ int main(int argc, char **argv) {
   case '2': OLvl = CodeGenOpt::Two; break;
   case 's': OLvl = CodeGenOpt::Size; break;
   case '3': OLvl = CodeGenOpt::Aggressive; break;
-  case '4': OLvl = CodeGenOpt::LTO; break;
   }
 
   // If this target requires addPassesToEmitWholeFile, do it now.  This is
diff --git a/tools/lto/LTOCodeGenerator.cpp b/tools/lto/LTOCodeGenerator.cpp
index 66b56b174c4..70744c9a8f2 100644
--- a/tools/lto/LTOCodeGenerator.cpp
+++ b/tools/lto/LTOCodeGenerator.cpp
@@ -443,7 +443,7 @@ bool LTOCodeGenerator::generateAssemblyCode(raw_ostream& out,
 
     switch (_target->addPassesToEmitFile(*codeGenPasses, out,
                                          TargetMachine::AssemblyFile,
-                                         CodeGenOpt::Default)) {
+                                         CodeGenOpt::Aggressive)) {
         case FileModel::MachOFile:
             mce = AddMachOWriter(*codeGenPasses, out, *_target);
             break;
@@ -459,7 +459,7 @@ bool LTOCodeGenerator::generateAssemblyCode(raw_ostream& out,
     }
 
     if (_target->addPassesToEmitFileFinish(*codeGenPasses, mce,
-                                           CodeGenOpt::Default)) {
+                                           CodeGenOpt::Aggressive)) {
         errMsg = "target does not support generation of this file type";
         return true;
     }