diff options
| author | Reid Spencer <rspencer@reidspencer.com> | 2007-04-11 02:44:20 +0000 |
|---|---|---|
| committer | Reid Spencer <rspencer@reidspencer.com> | 2007-04-11 02:44:20 +0000 |
| commit | 18da0720887527ed570e9703ae5f290beb491ee1 (patch) | |
| tree | 9a0a69b4dd6e5a5326680389f76724e0db1b98dd /lib/Linker/LinkItems.cpp | |
| parent | 947aa7de67c553a0bbf0ef60173f23a8747014bf (diff) | |
| download | llvm-18da0720887527ed570e9703ae5f290beb491ee1.tar.gz llvm-18da0720887527ed570e9703ae5f290beb491ee1.tar.bz2 llvm-18da0720887527ed570e9703ae5f290beb491ee1.tar.xz | |
For PR1146:
Put the parameter attributes in their own ParamAttr name space. Adjust the
rest of llvm as a result.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@35877 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Linker/LinkItems.cpp')
| -rw-r--r-- | lib/Linker/LinkItems.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/Linker/LinkItems.cpp b/lib/Linker/LinkItems.cpp index 6f9f9b2205..09af56c6a8 100644 --- a/lib/Linker/LinkItems.cpp +++ b/lib/Linker/LinkItems.cpp @@ -91,8 +91,12 @@ bool Linker::LinkInLibrary(const std::string& Lib, bool& is_native) { return error("Cannot link archive '" + Pathname.toString() + "'"); break; - case sys::ELF_FileType: - case sys::Mach_O_FileType: + case sys::ELF_Relocatable_FileType: + case sys::ELF_SharedObject_FileType: + case sys::Mach_O_Object_FileType: + case sys::Mach_O_FixedVirtualMemorySharedLib_FileType: + case sys::Mach_O_DynamicallyLinkedSharedLib_FileType: + case sys::Mach_O_DynamicallyLinkedSharedLibStub_FileType: case sys::COFF_FileType: is_native = true; break; @@ -181,8 +185,12 @@ bool Linker::LinkInFile(const sys::Path &File, bool &is_native) { break; } - case sys::ELF_FileType: - case sys::Mach_O_FileType: + case sys::ELF_Relocatable_FileType: + case sys::ELF_SharedObject_FileType: + case sys::Mach_O_Object_FileType: + case sys::Mach_O_FixedVirtualMemorySharedLib_FileType: + case sys::Mach_O_DynamicallyLinkedSharedLib_FileType: + case sys::Mach_O_DynamicallyLinkedSharedLibStub_FileType: case sys::COFF_FileType: is_native = true; break; |