[llvm-commits] CVS: llvm/lib/Linker/LinkItems.cpp

[Reid Spencer]

Changes in directory llvm/lib/Linker:

LinkItems.cpp updated: 1.11 -> 1.12
---
Log message:

For PR1146: http://llvm.org/PR1146 :
Put the parameter attributes in their own ParamAttr name space. Adjust the
rest of llvm as a result.


---
Diffs of the changes:  (+12 -4)

 LinkItems.cpp |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)


Index: llvm/lib/Linker/LinkItems.cpp
diff -u llvm/lib/Linker/LinkItems.cpp:1.11 llvm/lib/Linker/LinkItems.cpp:1.12
--- llvm/lib/Linker/LinkItems.cpp:1.11	Wed Apr  4 01:44:18 2007
+++ llvm/lib/Linker/LinkItems.cpp	Tue Apr 10 21:44:19 2007
@@ -91,8 +91,12 @@
         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 @@
       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;