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) {