commit be81e1078cd32c1c4a2b8f60e16e2c7760c2a353
author Logan Chien <loganchien@google.com> Fri Dec 16 13:31:39 2011 +0800
committer Logan Chien <loganchien@google.com> Fri Dec 16 13:35:34 2011 +0800
tree ed0f63b2ae3e885b1076341d7c9193c9ba405c47
parent 5749a60d136d73af9d5a000e6bcbb7f45d7cf491

Apply changes to migrate to upstream (Dec 16th 2011)

- Following constants has been removed from llvm::bitc by the
  upstream, so we have to define our version.

  - TYPE_BLOCK_ID_OLD 10
  - TYPE_SYMTAB_BLOCK_ID_OLD 13
  - TYPE_CODE_STRUCT_OLD 10

- CheckDebugInfoIntrinsics has been removed by the upstream,
  so we have to copy it from lib/VMCore/AutoUpgrade.cpp

- llvm::TargetMachine::createTargetMachine now takes a new
  parameter for options, such as float ABI, soft float, and
  no frame elimination, and etc.

Change-Id: Ied522748bf92956d23f41a6195916eda1c19c589

lib/ExecutionEngine/Compiler.cpp

diff --git a/lib/ExecutionEngine/Compiler.cpp b/lib/ExecutionEngine/Compiler.cpp
index f456066..1e9bdb8 100644
--- a/lib/ExecutionEngine/Compiler.cpp
+++ b/lib/ExecutionEngine/Compiler.cpp
@@ -200,22 +200,6 @@
   // -O3: llvm::CodeGenOpt::Aggressive
   CodeGenOptLevel = llvm::CodeGenOpt::Aggressive;
 
-  // Below are the global settings to LLVM
-
-  // Disable frame pointer elimination optimization
-  llvm::NoFramePointerElim = false;
-
-  // Use hardfloat ABI
-  //
-  // TODO(all): Need to detect the CPU capability and decide whether to use
-  // softfp. To use softfp, change following 2 lines to
-  //
-  // llvm::FloatABIType = llvm::FloatABI::Soft;
-  // llvm::UseSoftFloat = true;
-  //
-  llvm::FloatABIType = llvm::FloatABI::Soft;
-  llvm::UseSoftFloat = false;
-
   // Register the scheduler
   llvm::RegisterScheduler::setDefault(llvm::createDefaultScheduler);
 
@@ -316,10 +300,15 @@
   llvm::NamedMDNode const *ExportFuncMetadata;
   llvm::NamedMDNode const *ObjectSlotMetadata;
 
+  llvm::TargetOptions Options;
+
+  llvm::CodeModel::Model CM;
+  llvm::Reloc::Model RM;
+
   if (mModule == NULL)  // No module was loaded
     return 0;
 
-  // Create TargetMachine
+  // Find LLVM Target
   Target = llvm::TargetRegistry::lookupTarget(Triple, mError);
   if (hasError())
     goto on_bcc_compile_error;
@@ -335,18 +324,34 @@
     FeaturesStr = F.getString();
   }
 
+  // Setup LLVM Target Machine Options
+  // Disable frame pointer elimination optimization
+  Options.NoFramePointerElim = false;
+
+  // Use hardfloat ABI
+  //
+  // TODO(all): Need to detect the CPU capability and decide whether to use
+  // softfp. To use softfp, change following 2 lines to
+  //
+  // options.FloatABIType = llvm::FloatABI::Soft;
+  // options.UseSoftFloat = true;
+  Options.FloatABIType = llvm::FloatABI::Soft;
+  Options.UseSoftFloat = false;
+
 #if defined(DEFAULT_X86_64_CODEGEN)
   // Data address in X86_64 architecture may reside in a far-away place
-  TM = Target->createTargetMachine(Triple, CPU, FeaturesStr,
-                                   llvm::Reloc::Static,
-                                   llvm::CodeModel::Medium);
+  CM = llvm::CodeModel::Medium;
 #else
   // This is set for the linker (specify how large of the virtual addresses
   // we can access for all unknown symbols.)
-  TM = Target->createTargetMachine(Triple, CPU, FeaturesStr,
-                                   llvm::Reloc::Static,
-                                   llvm::CodeModel::Small);
+  CM = llvm::CodeModel::Small;
 #endif
+
+  RM = llvm::Reloc::Static;
+
+  // Create LLVM Target Machine
+  TM = Target->createTargetMachine(Triple, CPU, FeaturesStr, Options, RM, CM);
+
   if (TM == NULL) {
     setError("Failed to create target machine implementation for the"
              " specified triple '" + Triple + "'");