diff options
author | Gabor Greif <ggreif@gmail.com> | 2007-07-06 13:38:17 +0000 |
---|---|---|
committer | Gabor Greif <ggreif@gmail.com> | 2007-07-06 13:38:17 +0000 |
commit | e75ca3d809ff17260efa320a949cb91ea2b3981e (patch) | |
tree | 88b6c59641db2229ecfe183eeaf3ace8c31708f9 /lib/Linker | |
parent | 664e9546d674096c5a012536f1a424b1681ece51 (diff) | |
download | llvm-e75ca3d809ff17260efa320a949cb91ea2b3981e.tar.gz llvm-e75ca3d809ff17260efa320a949cb91ea2b3981e.tar.bz2 llvm-e75ca3d809ff17260efa320a949cb91ea2b3981e.tar.xz |
eliminate residual cruft related to recognizing bytecode
files.
bitcode files are the only LLVM format left.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@37945 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Linker')
-rw-r--r-- | lib/Linker/LinkItems.cpp | 6 | ||||
-rw-r--r-- | lib/Linker/Linker.cpp | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/lib/Linker/LinkItems.cpp b/lib/Linker/LinkItems.cpp index e66fa5b6e6..3cf1f6bd8c 100644 --- a/lib/Linker/LinkItems.cpp +++ b/lib/Linker/LinkItems.cpp @@ -82,9 +82,7 @@ bool Linker::LinkInLibrary(const std::string& Lib, bool& is_native) { case sys::Unknown_FileType: return warning("Supposed library '" + Lib + "' isn't a library."); - case sys::Bytecode_FileType: case sys::Bitcode_FileType: - case sys::CompressedBytecode_FileType: // LLVM ".so" file. if (LinkInFile(Pathname, is_native)) return error("Cannot link file '" + Pathname.toString() + "'"); @@ -176,9 +174,7 @@ bool Linker::LinkInFile(const sys::Path &File, bool &is_native) { return error("Cannot link archive '" + File.toString() + "'"); break; - case sys::Bitcode_FileType: - case sys::Bytecode_FileType: - case sys::CompressedBytecode_FileType: { + case sys::Bitcode_FileType: { verbose("Linking bitcode file '" + File.toString() + "'"); std::auto_ptr<Module> M(LoadObject(File)); if (M.get() == 0) diff --git a/lib/Linker/Linker.cpp b/lib/Linker/Linker.cpp index 4604305b6d..9f9a59d4d6 100644 --- a/lib/Linker/Linker.cpp +++ b/lib/Linker/Linker.cpp @@ -142,8 +142,6 @@ static inline sys::Path IsLibrary(const std::string& Name, FullPath.appendSuffix(&(LTDL_SHLIB_EXT[1])); if (FullPath.isDynamicLibrary()) // Native shared library? return FullPath; - if (FullPath.isBytecodeFile()) // .so file containing bytecode? - return FullPath; if (FullPath.isBitcodeFile()) // .so file containing bitcode? return FullPath; |