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 | a472f66dd0ec371399ed5d52271dff4f58833eb0 (patch) | |
| tree | 7552d0bd1980e118653eaa9160d1119ec6f26287 /llvm/lib/Linker/LinkItems.cpp | |
| parent | d3f622e0d5216247d773532bed0a9ec47d021f07 (diff) | |
| download | bcm5719-llvm-a472f66dd0ec371399ed5d52271dff4f58833eb0.tar.gz bcm5719-llvm-a472f66dd0ec371399ed5d52271dff4f58833eb0.zip | |
For PR1146:
Put the parameter attributes in their own ParamAttr name space. Adjust the
rest of llvm as a result.
llvm-svn: 35877
Diffstat (limited to 'llvm/lib/Linker/LinkItems.cpp')
| -rw-r--r-- | llvm/lib/Linker/LinkItems.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/llvm/lib/Linker/LinkItems.cpp b/llvm/lib/Linker/LinkItems.cpp index 6f9f9b2205d..09af56c6a8b 100644 --- a/llvm/lib/Linker/LinkItems.cpp +++ b/llvm/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; |
