commit 8afed380cda0bc4b3d325064fc44b181312651ad
author Shih-wei Liao <sliao@google.com> Tue Jan 10 15:57:24 2012 +0800
committer Shih-wei Liao <sliao@google.com> Tue Jan 17 00:30:02 2012 -0800
tree 5bebb134d781acfa665e22d7a5e872276062d3aa
parent 2fcbd02086984b45301d69104808e89772c8de90

Have separate prepareSharedObject and prepareObject.

Also, provide option for prepareObject to specify relocation model.

Change-Id: Ia9f51f1a463165d069dc918654e0f55189e7a274

lib/ExecutionEngine/Script.cpp

diff --git a/lib/ExecutionEngine/Script.cpp b/lib/ExecutionEngine/Script.cpp
index aae0692..2751299 100644
--- a/lib/ExecutionEngine/Script.cpp
+++ b/lib/ExecutionEngine/Script.cpp
@@ -180,9 +180,10 @@
   return 0;
 }
 
-int Script::prepareSharedObject(char const *cacheDir,
-                                char const *cacheName,
-                                unsigned long flags) {
+int Script::prepareObject(char const *cacheDir,
+                          char const *cacheName,
+                          llvm::Reloc::Model RelocModel,
+                          unsigned long flags) {
 #if USE_CACHE
   if (cacheDir && cacheName) {
     // Set Cache Directory and File Name
@@ -201,6 +202,7 @@
 #endif
 
   CompilerOption option;
+  option.RelocModelOpt = RelocModel;
   option.LoadAfterCompile = false;
   int status = internalCompile(option);
   if (status != 0) {

lib/ExecutionEngine/Script.h

diff --git a/lib/ExecutionEngine/Script.h b/lib/ExecutionEngine/Script.h
index 83cc948..9138db5 100644
--- a/lib/ExecutionEngine/Script.h
+++ b/lib/ExecutionEngine/Script.h
@@ -22,6 +22,8 @@
 
 #include "Compiler.h"
 
+#include <llvm/Support/CodeGen.h>
+
 #include <vector>
 #include <string>
 
@@ -118,9 +120,10 @@
                           char const *cacheName,
                           unsigned long flags);
 
-    int prepareSharedObject(char const *cacheDir,
-                          char const *cacheName,
-                          unsigned long flags);
+    int prepareObject(char const *cacheDir,
+                      char const *cacheName,
+                      llvm::Reloc::Model RelocModel,
+                      unsigned long flags);
 
     char const *getCompilerErrorMessage();
 

lib/ExecutionEngine/bcc.cpp

diff --git a/lib/ExecutionEngine/bcc.cpp b/lib/ExecutionEngine/bcc.cpp
index 60cefc4..075d6c1 100644
--- a/lib/ExecutionEngine/bcc.cpp
+++ b/lib/ExecutionEngine/bcc.cpp
@@ -29,6 +29,7 @@
 #include <string>
 
 #include <utils/StopWatch.h>
+#include <llvm/Support/CodeGen.h>
 
 using namespace bcc;
 
@@ -123,11 +124,26 @@
 }
 
 
-extern "C" int bccPrepareSharedObject(BCCScriptRef script,
-                                      char const *cacheDir,
-                                      char const *cacheName,
-                                      unsigned long flags) {
-  return unwrap(script)->prepareSharedObject(cacheDir, cacheName, flags);
+extern "C" int bccPrepareObject(BCCScriptRef script,
+                                char const *cacheDir,
+                                char const *cacheName,
+                                bccRelocModelEnum RelocModel,
+                                unsigned long flags) {
+  BCC_FUNC_LOGGER();
+  llvm::Reloc::Model RM;
+
+  switch (RelocModel) {
+    case bccRelocDefault:      RM = llvm::Reloc::Default;      break;
+    case bccRelocStatic:       RM = llvm::Reloc::Static;       break;
+    case bccRelocPIC:          RM = llvm::Reloc::PIC_;         break;
+    case bccRelocDynamicNoPIC: RM = llvm::Reloc::DynamicNoPIC; break;
+    default: {
+      ALOGE("Unrecognized relocation model for bccPrepareObject!");
+      return BCC_INVALID_VALUE;
+    }
+  }
+
+  return unwrap(script)->prepareObject(cacheDir, cacheName, RM, flags);
 }
 
 
@@ -202,4 +218,3 @@
 #endif
   }
 }
-