commit 6a60f4ee19940a3e4a8ac0b3719493736d54caaf
author Shih-wei Liao <sliao@google.com> Tue Jan 17 02:58:40 2012 -0800
committer Shih-wei Liao <sliao@google.com> Tue Jan 17 02:58:40 2012 -0800
tree e96bd968425283e7b489de9384e0434b19678eb1
parent 6692ab57b5b8dc40f6406751a5597016eb764507

Follow the ELF spec. Use the terms relocatable.

Also, clean up the code.

Change-Id: I135050b1c3072ebb33ea0b48f9e2902c9eccd587

lib/ExecutionEngine/Script.cpp

diff --git a/lib/ExecutionEngine/Script.cpp b/lib/ExecutionEngine/Script.cpp
index bfa914b..085e7c8 100644
--- a/lib/ExecutionEngine/Script.cpp
+++ b/lib/ExecutionEngine/Script.cpp
@@ -76,8 +76,9 @@
     break;
   }
 
-  for (size_t i = 0; i < 2; ++i)
+  for (size_t i = 0; i < 2; ++i) {
     delete mSourceList[i];
+  }
 }
 
 
@@ -179,10 +180,10 @@
   return 0;
 }
 
-int Script::prepareObject(char const *cacheDir,
-                          char const *cacheName,
-                          llvm::Reloc::Model RelocModel,
-                          unsigned long flags) {
+int Script::prepareRelocatable(char const *cacheDir,
+                               char const *cacheName,
+                               llvm::Reloc::Model RelocModel,
+                               unsigned long flags) {
   mObjectType = ScriptObject::Relocatable;
 #if USE_CACHE
   if (cacheDir && cacheName) {

lib/ExecutionEngine/Script.h

diff --git a/lib/ExecutionEngine/Script.h b/lib/ExecutionEngine/Script.h
index 7fe3e03..ef682a6 100644
--- a/lib/ExecutionEngine/Script.h
+++ b/lib/ExecutionEngine/Script.h
@@ -158,10 +158,10 @@
                           char const *cacheName,
                           unsigned long flags);
 
-    int prepareObject(char const *cacheDir,
-                      char const *cacheName,
-                      llvm::Reloc::Model RelocModel,
-                      unsigned long flags);
+    int prepareRelocatable(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 075d6c1..45ab1ee 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;
@@ -124,26 +125,38 @@
 }
 
 
-extern "C" int bccPrepareObject(BCCScriptRef script,
-                                char const *cacheDir,
-                                char const *cacheName,
-                                bccRelocModelEnum RelocModel,
-                                unsigned long flags) {
+extern "C" int bccPrepareRelocatable(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;
+    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);
+  return unwrap(script)->prepareRelocatable(cacheDir, cacheName, RM, flags);
 }