[vmkit-commits] [vmkit] r62188 - in /vmkit/trunk: lib/JnJVM/VMCore/JnjvmModule.cpp tools/vmjc/vmjc.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Tue Jan 13 16:20:42 2009
New Revision: 62188

URL: http://llvm.org/viewvc/llvm-project?rev=62188&view=rev
Log:
Set the target triple when static compiling.


Modified:
    vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp
    vmkit/trunk/tools/vmjc/vmjc.cpp

Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp?rev=62188&r1=62187&r2=62188&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp Tue Jan 13 16:20:42 2009
@@ -2096,9 +2096,7 @@
 JnjvmModule::JnjvmModule(const std::string &ModuleID, bool sc) : 
   MvmModule(ModuleID) {
   
-  if (sc) {
-    setDataLayout("");
-  } else {
+  if (!sc) {
     std::string str = 
       executionEngine->getTargetData()->getStringRepresentation();
     setDataLayout(str);

Modified: vmkit/trunk/tools/vmjc/vmjc.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmjc/vmjc.cpp?rev=62188&r1=62187&r2=62188&view=diff

==============================================================================
--- vmkit/trunk/tools/vmjc/vmjc.cpp (original)
+++ vmkit/trunk/tools/vmjc/vmjc.cpp Tue Jan 13 16:20:42 2009
@@ -17,8 +17,9 @@
 
 #include "llvm/Module.h"
 #include "llvm/PassManager.h"
-#include "llvm/Bitcode/ReaderWriter.h"
 #include "llvm/Assembly/PrintModulePass.h"
+#include "llvm/Config/config.h"
+#include "llvm/Bitcode/ReaderWriter.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/MemoryBuffer.h"
@@ -69,6 +70,10 @@
 StandardCompileOpts("std-compile-opts", 
                    cl::desc("Include the standard compile time optimizations"));
 
+static cl::opt<std::string>
+TargetTriple("mtriple", cl::desc("Override target triple for module"));
+
+
 inline void addPass(FunctionPassManager *PM, Pass *P) {
   // Add the pass to the pass manager...
   PM->add(P);
@@ -134,6 +139,13 @@
     Collector::enable(0);
 
     mvm::CompilationUnit* CU = mvm::VirtualMachine::initialiseJVM(true);
+
+    if (!TargetTriple.empty())
+      CU->TheModule->setTargetTriple(TargetTriple);
+    else
+      CU->TheModule->setTargetTriple(LLVM_HOSTTRIPLE);
+
+
     addCommandLinePass(CU, argv);    
     mvm::VirtualMachine* vm = mvm::VirtualMachine::createJVM(CU);
     vm->compile(InputFilename.c_str());