[llvm-commits] [llvm] r153795 - /llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.cpp

[Akira Hatanaka]

Author: ahatanak
Date: Fri Mar 30 21:38:36 2012
New Revision: 153795

URL: http://llvm.org/viewvc/llvm-project?rev=153795&view=rev
Log:
Select static relocation model if it is jitting.

Modified:
    llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.cpp

Modified: llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.cpp?rev=153795&r1=153794&r2=153795&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.cpp (original)
+++ llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.cpp Fri Mar 30 21:38:36 2012
@@ -67,7 +67,9 @@
                                               CodeModel::Model CM,
                                               CodeGenOpt::Level OL) {
   MCCodeGenInfo *X = new MCCodeGenInfo();
-  if (RM == Reloc::Default)
+  if (CM == CodeModel::JITDefault)
+    RM = Reloc::Static;
+  else if (RM == Reloc::Default)
     RM = Reloc::PIC_;
   X->InitMCCodeGenInfo(RM, CM, OL);
   return X;