From 1fc08f5e9ef733ef1ce6f363fecedc2260e78974 Mon Sep 17 00:00:00 2001 From: dim Date: Sat, 14 Apr 2012 13:54:10 +0000 Subject: Vendor import of llvm trunk r154661: http://llvm.org/svn/llvm-project/llvm/trunk@r154661 --- lib/Linker/LinkArchives.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lib/Linker/LinkArchives.cpp') diff --git a/lib/Linker/LinkArchives.cpp b/lib/Linker/LinkArchives.cpp index 2c4ed7f..c16d195 100644 --- a/lib/Linker/LinkArchives.cpp +++ b/lib/Linker/LinkArchives.cpp @@ -16,7 +16,6 @@ #include "llvm/Module.h" #include "llvm/ADT/SetOperations.h" #include "llvm/Bitcode/Archive.h" -#include "llvm/Config/config.h" #include #include using namespace llvm; @@ -141,7 +140,7 @@ Linker::LinkInArchive(const sys::Path &Filename, bool &is_native) { // Find the modules we need to link into the target module. Note that arch // keeps ownership of these modules and may return the same Module* from a // subsequent call. - std::set Modules; + SmallVector Modules; if (!arch->findModulesDefiningSymbols(UndefinedSymbols, Modules, &ErrMsg)) return error("Cannot find symbols in '" + Filename.str() + "': " + ErrMsg); @@ -158,7 +157,7 @@ Linker::LinkInArchive(const sys::Path &Filename, bool &is_native) { UndefinedSymbols.end()); // Loop over all the Modules that we got back from the archive - for (std::set::iterator I=Modules.begin(), E=Modules.end(); + for (SmallVectorImpl::iterator I=Modules.begin(), E=Modules.end(); I != E; ++I) { // Get the module we must link in. -- cgit v1.1