3 files changed, 1 insertions, 31 deletions

diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
index 81b8eb2238f..fb53ba96055 100644
--- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
+++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
@@ -168,7 +168,6 @@ RuntimeDyldImpl::loadObjectImpl(const object::ObjectFile &Obj) {
     uint32_t Flags = I->getFlags();
 
     bool IsCommon = Flags & SymbolRef::SF_Common;
-    bool IsWeak = Flags & SymbolRef::SF_Weak;
     if (IsCommon)
       CommonSymbols.push_back(*I);
     else {
@@ -189,11 +188,6 @@ RuntimeDyldImpl::loadObjectImpl(const object::ObjectFile &Obj) {
           continue;
         StringRef SectionData;
         Check(SI->getContents(SectionData));
-        // TODO: It make make sense to delay emitting the section for weak
-        // symbols until they are actually required, but that's not possible
-        // currently, because we only know whether we will need the symbol
-        // in resolveRelocations, which happens after we have already finalized
-        // the Load.
         bool IsCode = SI->isText();
         unsigned SectionID =
             findOrEmitSection(Obj, *SI, IsCode, LocalSections);
@@ -204,11 +198,7 @@ RuntimeDyldImpl::loadObjectImpl(const object::ObjectFile &Obj) {
         SymbolInfo::Visibility Vis =
           (Flags & SymbolRef::SF_Exported) ?
             SymbolInfo::Default : SymbolInfo::Hidden;
-        if (!IsWeak) {
-          GlobalSymbolTable[Name] = SymbolInfo(SectionID, SectOffset, Vis);
-        } else {
-          WeakSymbolTable[Name] = SymbolInfo(SectionID, SectOffset, Vis);
-        }
+        GlobalSymbolTable[Name] = SymbolInfo(SectionID, SectOffset, Vis);
       }
     }
   }
@@ -778,21 +768,6 @@ void RuntimeDyldImpl::resolveExternalSymbols() {
                SymInfo.getOffset();
       }
 
-      // If we didn't find the symbol yet, and it is present in the weak symbol
-      // table, the definition from this object file needs to be used, so emit
-      // it now
-      if (!Addr) {
-        RTDyldSymbolTable::const_iterator Loc = WeakSymbolTable.find(Name);
-        if (Loc != WeakSymbolTable.end()) {
-          SymbolInfo SymInfo = Loc->second;
-          Addr = getSectionLoadAddress(SymInfo.getSectionID()) + SymInfo.getOffset();
-          // Since the weak symbol is now, materialized, add it to the
-          // GlobalSymbolTable. If somebody later asks the ExecutionEngine
-          // for the address of this symbol that's where it'll look
-          GlobalSymbolTable[Name] = SymInfo;
-        }
-      }
-
       // FIXME: Implement error handling that doesn't kill the host program!
       if (!Addr)
         report_fatal_error("Program used external function '" + Name +
@@ -809,7 +784,6 @@ void RuntimeDyldImpl::resolveExternalSymbols() {
 
     ExternalSymbolRelocations.erase(i);
   }
-  WeakSymbolTable.clear();
 }
 
 //===----------------------------------------------------------------------===//
diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
index a01b063831a..0f3ca0f2f39 100644
--- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
+++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
@@ -947,7 +947,6 @@ relocation_iterator RuntimeDyldELF::processRelocationRef(
       break;
     }
     case SymbolRef::ST_Data:
-    case SymbolRef::ST_Function:
     case SymbolRef::ST_Unknown: {
       Value.SymbolName = TargetName.data();
       Value.Addend = Addend;
diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h
index 69d6cf53034..f37a9a768a2 100644
--- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h
+++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h
@@ -203,9 +203,6 @@ protected:
   // A global symbol table for symbols from all loaded modules.
   RTDyldSymbolTable GlobalSymbolTable;
 
-  // Like the global symbol table but for weak symbols
-  RTDyldSymbolTable WeakSymbolTable;
-
   // Keep a map of common symbols to their info pairs
   typedef std::vector<SymbolRef> CommonSymbolList;