diff options
Diffstat (limited to 'ArmPkg/Library/CompilerIntrinsicsLib')
12 files changed, 25 insertions, 37 deletions
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lasr.asm b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lasr.asm index feb267a65e..35723ff173 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lasr.asm +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lasr.asm @@ -13,9 +13,8 @@ //------------------------------------------------------------------------------
- EXPORT __aeabi_lasr
- AREA Math, CODE, READONLY
+ INCLUDE AsmMacroExport.inc
;
;UINT32
@@ -25,7 +24,7 @@ ; IN UINT32 Divisor
; );
;
-__aeabi_lasr
+ RVCT_ASM_EXPORT __aeabi_lasr
SUBS r3,r2,#0x20
BPL {pc} + 0x18 ; 0x1c
RSB r3,r2,#0x20
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.asm b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.asm index 9c14e89a01..c71bd59e45 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.asm +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.asm @@ -13,10 +13,9 @@ //------------------------------------------------------------------------------
- EXPORT __aeabi_ldivmod
EXTERN __aeabi_uldivmod
- AREA Math, CODE, READONLY
+ INCLUDE AsmMacroExport.inc
;
;UINT32
@@ -27,7 +26,7 @@ ; );
;
-__aeabi_ldivmod
+ RVCT_ASM_EXPORT __aeabi_ldivmod
PUSH {r4,lr}
ASRS r4,r1,#1
EOR r4,r4,r3,LSR #1
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsl.asm b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsl.asm index f6fc208dee..a31e18666a 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsl.asm +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsl.asm @@ -13,9 +13,8 @@ //------------------------------------------------------------------------------
- EXPORT __aeabi_llsl
- AREA Math, CODE, READONLY
+ INCLUDE AsmMacroExport.inc
;
;VOID
@@ -27,7 +26,7 @@ ; );
;
-__aeabi_llsl
+ RVCT_ASM_EXPORT __aeabi_llsl
SUBS r3,r2,#0x20
BPL {pc} + 0x18 ; 0x1c
RSB r3,r2,#0x20
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsr.asm b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsr.asm index 829c871d94..881db106d9 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsr.asm +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsr.asm @@ -13,9 +13,8 @@ //------------------------------------------------------------------------------
- EXPORT __aeabi_llsr
- AREA Math, CODE, READONLY
+ INCLUDE AsmMacroExport.inc
;
;VOID
@@ -26,7 +25,7 @@ ; IN UINT32 Size
; );
;
-__aeabi_llsr
+ RVCT_ASM_EXPORT __aeabi_llsr
SUBS r3,r2,#0x20
BPL {pc} + 0x18 ; 0x1c
RSB r3,r2,#0x20
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memcpy.asm b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memcpy.asm index 60556b105d..ae91197128 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memcpy.asm +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memcpy.asm @@ -13,9 +13,8 @@ //------------------------------------------------------------------------------
- EXPORT __aeabi_memcpy
- AREA Memcpy, CODE, READONLY
+ INCLUDE AsmMacroExport.inc
;
;VOID
@@ -26,7 +25,7 @@ ; IN UINT32 Size
; );
;
-__aeabi_memcpy
+ RVCT_ASM_EXPORT __aeabi_memcpy
cmp r2, #0
bxeq lr
push {lr}
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memcpy4.asm b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memcpy4.asm index ecaa86f51e..3465e89eba 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memcpy4.asm +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memcpy4.asm @@ -13,9 +13,8 @@ //------------------------------------------------------------------------------
- EXPORT __aeabi_memcpy4
- AREA Memcpy4, CODE, READONLY
+ INCLUDE AsmMacroExport.inc
;
;VOID
@@ -26,7 +25,7 @@ ; IN UINT32 Size
; );
;
-__aeabi_memcpy4
+ RVCT_ASM_EXPORT __aeabi_memcpy4
stmdb sp!, {r4, lr}
subs r2, r2, #32 ; 0x20
bcc memcpy4_label2
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memmove.asm b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memmove.asm index 2147e29dbd..09773b0c75 100755 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memmove.asm +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memmove.asm @@ -13,9 +13,8 @@ //------------------------------------------------------------------------------
- EXPORT __aeabi_memmove
- AREA Memmove, CODE, READONLY
+ INCLUDE AsmMacroExport.inc
;
;VOID
@@ -26,7 +25,7 @@ ; IN UINT32 Size
; );
;
-__aeabi_memmove
+ RVCT_ASM_EXPORT __aeabi_memmove
CMP r2, #0
BXEQ lr
CMP r0, r1
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch.asm b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch.asm index e09c90cda4..f23aa42d44 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch.asm +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch.asm @@ -14,11 +14,10 @@ - EXPORT __ARM_switch8
- AREA ArmSwitch, CODE, READONLY
+ INCLUDE AsmMacroExport.inc
-__ARM_switch8
+ RVCT_ASM_EXPORT __ARM_switch8
LDRB r12,[lr,#-1]
CMP r3,r12
LDRBCC r3,[lr,r3]
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uldiv.asm b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uldiv.asm index aed649b151..6b6184ebd3 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uldiv.asm +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uldiv.asm @@ -14,9 +14,8 @@ - EXPORT __aeabi_uldivmod
- AREA Uldivmod, CODE, READONLY
+ INCLUDE AsmMacroExport.inc
;
;UINT64
@@ -26,7 +25,7 @@ ; IN UINT64 Divisor
; )
;
-__aeabi_uldivmod
+ RVCT_ASM_EXPORT __aeabi_uldivmod
stmdb sp!, {r4, r5, r6, lr}
mov r4, r1
mov r5, r0
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uread.asm b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uread.asm index 3d589654f0..f369e4d251 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uread.asm +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uread.asm @@ -14,10 +14,8 @@ - EXPORT __aeabi_uread4
- EXPORT __aeabi_uread8
- AREA Uread4, CODE, READONLY
+ INCLUDE AsmMacroExport.inc
;
;UINT32
@@ -26,7 +24,7 @@ ; IN VOID *Pointer
; );
;
-__aeabi_uread4
+ RVCT_ASM_EXPORT __aeabi_uread4
ldrb r1, [r0]
ldrb r2, [r0, #1]
ldrb r3, [r0, #2]
@@ -43,7 +41,7 @@ __aeabi_uread4 ; IN VOID *Pointer
; );
;
-__aeabi_uread8
+ RVCT_ASM_EXPORT __aeabi_uread8
mov r3, r0
ldrb r1, [r3]
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uwrite.asm b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uwrite.asm index 85e1ba8d6d..434a652f78 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uwrite.asm +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uwrite.asm @@ -13,10 +13,8 @@ //------------------------------------------------------------------------------
- EXPORT __aeabi_uwrite4
- EXPORT __aeabi_uwrite8
- AREA Uwrite4, CODE, READONLY
+ INCLUDE AsmMacroExport.inc
;
;UINT32
@@ -27,7 +25,7 @@ ; );
;
;
-__aeabi_uwrite4
+ RVCT_ASM_EXPORT __aeabi_uwrite4
mov r2, r0, lsr #8
strb r0, [r1]
strb r2, [r1, #1]
@@ -46,7 +44,7 @@ __aeabi_uwrite4 ; );
;
;
-__aeabi_uwrite8
+ RVCT_ASM_EXPORT __aeabi_uwrite8
mov r3, r0, lsr #8
strb r0, [r2]
strb r3, [r2, #1]
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf b/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf index 3487787a9c..103f515064 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf +++ b/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf @@ -102,6 +102,7 @@ [Packages]
MdePkg/MdePkg.dec
+ ArmPkg/ArmPkg.dec
[LibraryClasses]
|