Sync up ArmPkg with patch from mailing list. Changed name of BdsLib.h to BdsUnixLib.h and fixed a lot of issues with Xcode building.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11293 6f19259b-4bc3-4df7-8a09-765794883524
2011-02-02 22:35:30 +00:00
parent 7373d15a98
commit 1bfda055df
113 changed files with 7979 additions and 964 deletions
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.S
@@ -14,8 +14,7 @@

 	.text
 	.align 2
-	.globl ASM_PFX(__ashldi3)
-  INTERWORK_FUNC(__ashldi3)
+	GCC_ASM_EXPORT(__ashldi3)
 	
 ASM_PFX(__ashldi3):
 	cmp	r2, #31
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S
@@ -14,8 +14,7 @@

 	.text
 	.align 2
-	.globl ASM_PFX(__ashrdi3)
-  INTERWORK_FUNC(__ashrdi3)
+	GCC_ASM_EXPORT(__ashrdi3)

 ASM_PFX(__ashrdi3):
 	cmp	r2, #31
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.S
@@ -14,8 +14,7 @@

 	.text
 	.align 2
-	.globl ASM_PFX(__clzsi2)
-  INTERWORK_FUNC(__clzsi2)
+	GCC_ASM_EXPORT(__clzsi2)

 ASM_PFX(__clzsi2):
 	@ frame_needed = 1, uses_anonymous_args = 0
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S
@@ -14,8 +14,7 @@

 	.text
 	.align 2
-	.globl ASM_PFX(__ctzsi2)
-  INTERWORK_FUNC(__ctzsi2)
+	GCC_ASM_EXPORT(__ctzsi2)
 	
 ASM_PFX(__ctzsi2):
 	uxth	r3, r0
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divdi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divdi3.S
@@ -14,8 +14,7 @@

 	.text
 	.align 2
-	.globl ASM_PFX(__divdi3)
-  INTERWORK_FUNC(__divdi3)
+	GCC_ASM_EXPORT(__divdi3)
 	
 ASM_PFX(__divdi3):
 	@ args = 0, pretend = 0, frame = 0
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divsi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divsi3.S
@@ -14,8 +14,7 @@

 	.text
 	.align 2
-	.globl ASM_PFX(__divsi3)
-  INTERWORK_FUNC(__divsi3)
+	GCC_ASM_EXPORT(__divsi3)
 	
 ASM_PFX(__divsi3):
 	eor	r3, r0, r0, asr #31
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.S
@@ -15,8 +15,7 @@

 	.text
 	.align 2
-	.globl ASM_PFX(__aeabi_ldivmod)
-  INTERWORK_FUNC(__aeabi_ldivmod)
+	GCC_ASM_EXPORT(__aeabi_ldivmod)

 //
 // A pair of (unsigned) long longs is returned in {{r0, r1}, {r2, r3}}, 
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S
@@ -14,8 +14,7 @@

 	.text
 	.align 2
-	.globl ASM_PFX(__lshrdi3)
-  INTERWORK_FUNC(__lshrdi3)
+	GCC_ASM_EXPORT(__lshrdi3)
 	
 ASM_PFX(__lshrdi3):
 	cmp	r2, #31
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memcpy.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memcpy.S
@@ -14,8 +14,7 @@

 	.text
 	.align 2
-	.globl ASM_PFX(memcpy)
-  INTERWORK_FUNC(memcpy)
+	GCC_ASM_EXPORT(memcpy)

 ASM_PFX(memcpy):
 	stmfd	sp!, {r7, lr}
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memset.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memset.S
@@ -15,8 +15,7 @@

  .text
 	.align 2
-	.globl ASM_PFX(memset)
-  INTERWORK_FUNC(memset)
+	GCC_ASM_EXPORT (memset)

 ASM_PFX(memset):
 	@ args = 0, pretend = 0, frame = 0
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/moddi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/moddi3.S
@@ -14,8 +14,7 @@

 	.text
 	.align 2
-	.globl ASM_PFX(__moddi3)
-  INTERWORK_FUNC(__moddi3)
+	GCC_ASM_EXPORT(__moddi3)

 ASM_PFX(__moddi3):
 	stmfd	sp!, {r4, r5, r7, lr}
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S
@@ -14,8 +14,7 @@

 	.text
 	.align 2
-	.globl ASM_PFX(__modsi3)
-  INTERWORK_FUNC(__modsi3)
+	GCC_ASM_EXPORT(__modsi3)

 ASM_PFX(__modsi3):
 	stmfd	sp!, {r4, r5, r7, lr}
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/muldi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/muldi3.S
@@ -14,8 +14,7 @@

 	.text
 	.align 2
-	.globl ASM_PFX(__muldi3)
-	INTERWORK_FUNC(__muldi3)
+	GCC_ASM_EXPORT(__muldi3)

 ASM_PFX(__muldi3):
 	stmfd	sp!, {r4, r5, r6, r7, lr}
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/sourcery.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/sourcery.S
@@ -15,8 +15,7 @@

       .text
       .align 2
-       .globl ASM_PFX(__aeabi_ulcmp)
- 	     INTERWORK_FUNC(__aeabi_ulcmp)
+       GCC_ASM_EXPORT(__aeabi_ulcmp)

 ASM_PFX(__aeabi_ulcmp):
       stmfd   sp!, {r4, r5, r8}
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch16.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch16.S
@@ -16,8 +16,7 @@
 .text
 .p2align 2

-.globl ASM_PFX(__switch16)
-INTERWORK_FUNC(__switch16)
+GCC_ASM_EXPORT(__switch16)

 ASM_PFX(__switch16):
    ldrh      ip, [lr, #-1]
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S
@@ -16,8 +16,7 @@
 .text
 .p2align 2

-.globl ASM_PFX(__switch32)
-INTERWORK_FUNC(__switch32)
+GCC_ASM_EXPORT(__switch32)

 ASM_PFX(__switch32):    
    ldr     ip, [lr, #-1]
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S
@@ -16,9 +16,7 @@
 .text
 .p2align 2

-.globl ASM_PFX(__switch8)
-INTERWORK_FUNC(__switch8)
-
+GCC_ASM_EXPORT(__switch8)

 ASM_PFX(__switch8):
    ldrb      ip, [lr, #-1]
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S
@@ -16,8 +16,7 @@
 .text
 .p2align 2

-.globl ASM_PFX(__switchu8)
-INTERWORK_FUNC(__switchu8)
+GCC_ASM_EXPORT(__switchu8)


 ASM_PFX(__switchu8):
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S
@@ -14,8 +14,7 @@

 	.text
 	.align 2
-	.globl ASM_PFX(__ucmpdi2)
-  INTERWORK_FUNC(__ucmpdi2)
+	GCC_ASM_EXPORT(__ucmpdi2)
 	
 ASM_PFX(__ucmpdi2):
 	stmfd	sp!, {r4, r5, r8, lr}
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.S
@@ -14,8 +14,7 @@

 	.text
 	.align 2
-	.globl ASM_PFX(__udivdi3)
-  INTERWORK_FUNC(__udivdi3)
+	GCC_ASM_EXPORT(__udivdi3)

 ASM_PFX(__udivdi3):
 	stmfd	sp!, {r7, lr}
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S
@@ -14,9 +14,8 @@

 	.text
 	.align 2
-	.globl ASM_PFX(__udivmoddi4)
-	INTERWORK_FUNC(__udivmoddi4)
-
+	GCC_ASM_EXPORT(__udivmoddi4)
+	
 ASM_PFX(__udivmoddi4):
 	stmfd	sp!, {r4, r5, r6, r7, lr}
 	add	r7, sp, #12
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S
@@ -14,8 +14,7 @@

 	.text
 	.align 2
-	.globl ASM_PFX(__udivsi3)
-	INTERWORK_FUNC(__udivsi3)
+	GCC_ASM_EXPORT(__udivsi3)

 ASM_PFX(__udivsi3):
 	cmp	r1, #0
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uldiv.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uldiv.S
@@ -16,8 +16,7 @@

 	.text
 	.align 2
-	.globl ASM_PFX(__aeabi_uldivmod)
-	INTERWORK_FUNC(__aeabi_uldivmod)
+	GCC_ASM_EXPORT(__aeabi_uldivmod)

 //        
 //UINT64
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.S
@@ -14,8 +14,7 @@

 	.text
 	.align 2
-	.globl ASM_PFX(__umoddi3)
-	INTERWORK_FUNC(__umoddi3)
+	GCC_ASM_EXPORT(__umoddi3)
 	
 ASM_PFX(__umoddi3):
 	stmfd	sp!, {r7, lr}
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.S
@@ -14,8 +14,7 @@

 	.text
 	.align 2
-	.globl  ASM_PFX(__umodsi3)
-	 INTERWORK_FUNC(__umodsi3)
+	GCC_ASM_EXPORT(__umodsi3)
 	
 ASM_PFX(__umodsi3):
 	stmfd	sp!, {r4, r5, r7, lr}