Update intrinsics for code sourcery gcc

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10262 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/Llvm_int_lib.h b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/Llvm_int_lib.h
index e2c00a2033a571864102930127046464f424f6f6..70e23e448adad16c4b4a02049dcdfa33a05da63b 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/Llvm_int_lib.h
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/Llvm_int_lib.h
@@ -75,6 +75,22 @@ typedef union {
     };
 } udwords;
 
     };
 } udwords;
 

+// __aeabi_ return values
+typedef struct {
+  UINT64  Quotent;
+  UINT64  Remainder;
+} ulldiv_t;
+
+typedef struct {
+  INT64   Quotent;
+  INT64   Remainder;
+} lldiv_t;
+
+typedef struct {
+  UINT32  Quotent;
+  UINT32  Remainder;
+} uidiv_return;
+

 #if __GNUC__
   #define COUNT_LEADING_ZEROS(_a)   __builtin_clz((_a))
   #define COUNT_TRAILING_ZEROS(_a)  __builtin_ctz((_a))
 #if __GNUC__
   #define COUNT_LEADING_ZEROS(_a)   __builtin_clz((_a))
   #define COUNT_TRAILING_ZEROS(_a)  __builtin_ctz((_a))

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.S
index ac2bdbafd0afa3366ac335eb0e6862d7b9bcc91f..6eca3fc6c0816acf48db46416fa5c2b06c6de6ac 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.S
@@ -14,13 +14,10 @@
 
        .text
        .align 2
 
        .text
        .align 2

-       .globl ___ashldi3
-___ashldi3:
-       @ args = 0, pretend = 0, frame = 0
-       @ frame_needed = 0, uses_anonymous_args = 0
-       @ link register save eliminated.
+       .globl ASM_PFX(__ashldi3)
+       
+ASM_PFX(__ashldi3):

        cmp     r2, #31
        cmp     r2, #31

-       @ lr needed for prologue

        bls     L2
        cmp     r2, #63
        subls   r2, r2, #32
        bls     L2
        cmp     r2, #63
        subls   r2, r2, #32

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S
index fb87c88a09c54ccf6926da88935c7d452a48a5c8..0bc765ba386fb0721fca50ded7f3db8c24e40684 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S
@@ -14,13 +14,10 @@
 
        .text
        .align 2
 
        .text
        .align 2

-       .globl ___ashrdi3
-___ashrdi3:
-       @ args = 0, pretend = 0, frame = 0
-       @ frame_needed = 0, uses_anonymous_args = 0
-       @ link register save eliminated.
+       .globl ASM_PFX(__ashrdi3)
+
+ASM_PFX(__ashrdi3):

        cmp     r2, #31
        cmp     r2, #31

-       @ lr needed for prologue

        bls     L2
        cmp     r2, #63
        subls   r2, r2, #32
        bls     L2
        cmp     r2, #63
        subls   r2, r2, #32

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.S
index 9b127316138dcc3158eb697ee490f56c145fc48c..7fcdbbd9fd3fde7045260788ecb7506387cd3b22 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.S
@@ -14,9 +14,9 @@
 
        .text
        .align 2
 
        .text
        .align 2

-       .globl ___clzsi2
-___clzsi2:
-       @ args = 0, pretend = 0, frame = 0
+       .globl ASM_PFX(__clzsi2)
+
+ASM_PFX(__clzsi2):

        @ frame_needed = 1, uses_anonymous_args = 0
        stmfd   sp!, {r7, lr}
        add     r7, sp, #0
        @ frame_needed = 1, uses_anonymous_args = 0
        stmfd   sp!, {r7, lr}
        add     r7, sp, #0

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S
index 78f29ec6074ab26e7c5753b47f1c48cdb4610fa2..9ad94684b45a6e90fc6ee57d7d3861330d0f6191 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S
@@ -14,11 +14,9 @@
 
        .text
        .align 2
 
        .text
        .align 2

-       .globl ___ctzsi2
-___ctzsi2:
-       @ args = 0, pretend = 0, frame = 0
-       @ frame_needed = 0, uses_anonymous_args = 0
-       @ link register save eliminated.
+       .globl ASM_PFX(__ctzsi2)
+       
+ASM_PFX(__ctzsi2):

        uxth    r3, r0
        cmp     r3, #0
        moveq   ip, #16
        uxth    r3, r0
        cmp     r3, #0
        moveq   ip, #16

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divdi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divdi3.S
index b7d946ecc7e4f8abf57c5a5283f251c0cbc36bbf..f5213d87cd63d480fea26d07136424a2c982f987 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divdi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divdi3.S
@@ -14,8 +14,9 @@
 
        .text
        .align 2
 
        .text
        .align 2

-       .globl ___divdi3
-___divdi3:
+       .globl ASM_PFX(__divdi3)
+       
+ASM_PFX(__divdi3):

        @ args = 0, pretend = 0, frame = 0
        @ frame_needed = 1, uses_anonymous_args = 0
        stmfd   sp!, {r4, r5, r7, lr}
        @ args = 0, pretend = 0, frame = 0
        @ frame_needed = 1, uses_anonymous_args = 0
        stmfd   sp!, {r4, r5, r7, lr}


@@ -36,7 +37,7 @@ ___divdi3:
        subs    r0, r0, r10
        sbc     r1, r1, r11
        str     ip, [sp, #0]
        subs    r0, r0, r10
        sbc     r1, r1, r11
        str     ip, [sp, #0]

-       bl      ___udivmoddi4
+       bl      ASM_PFX(__udivmoddi4)

        eor     r2, r10, r4
        eor     r3, r10, r4
        eor     r0, r0, r2
        eor     r2, r10, r4
        eor     r3, r10, r4
        eor     r0, r0, r2

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divsi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divsi3.S
index 2651572222302fcab34fce04b5156f44d3812921..9c9bdc031d2c4dd18edf3c373dfe028bc0de60b8 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divsi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divsi3.S
@@ -14,10 +14,9 @@
 
        .text
        .align 2
 
        .text
        .align 2

-       .globl ___divsi3
-___divsi3:
-       @ args = 0, pretend = 0, frame = 0
-       @ frame_needed = 1, uses_anonymous_args = 0
+       .globl ASM_PFX(__divsi3)
+       
+ASM_PFX(__divsi3):

        eor     r3, r0, r0, asr #31
        eor     r2, r1, r1, asr #31
        stmfd   sp!, {r4, r5, r7, lr}
        eor     r3, r0, r0, asr #31
        eor     r2, r1, r1, asr #31
        stmfd   sp!, {r4, r5, r7, lr}


@@ -26,7 +25,7 @@ ___divsi3:
        mov     r4, r1, asr #31
        sub     r0, r3, r0, asr #31
        sub     r1, r2, r1, asr #31
        mov     r4, r1, asr #31
        sub     r0, r3, r0, asr #31
        sub     r1, r2, r1, asr #31

-       bl      ___udivsi3
+       bl      ASM_PFX(__udivsi3)

        eor     r1, r5, r4
        eor     r0, r0, r1
        rsb     r0, r1, r0
        eor     r1, r5, r4
        eor     r0, r0, r1
        rsb     r0, r1, r0

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S
index 2257deef97781a41a37ed7b98377980f338fba6c..f9ed40e1a229680f69e4ae21dddc6171df8ee2ec 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S
@@ -14,13 +14,10 @@
 
        .text
        .align 2
 
        .text
        .align 2

-       .globl ___lshrdi3
-___lshrdi3:
-       @ args = 0, pretend = 0, frame = 0
-       @ frame_needed = 0, uses_anonymous_args = 0
-       @ link register save eliminated.
+       .globl ASM_PFX(__lshrdi3)
+       
+ASM_PFX(__lshrdi3):

        cmp     r2, #31
        cmp     r2, #31

-       @ lr needed for prologue

        bls     L2
        cmp     r2, #63
        subls   r2, r2, #32
        bls     L2
        cmp     r2, #63
        subls   r2, r2, #32

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memcpy.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memcpy.S
index 2582a81f904c60285c0d34f861e67cac749cd114..606741f4a115c20d37743b846adb37424b34b134 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memcpy.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memcpy.S
@@ -14,10 +14,9 @@
 
        .text
        .align 2
 
        .text
        .align 2

-       .globl _memcpy
-_memcpy:
-       @ args = 0, pretend = 0, frame = 0
-       @ frame_needed = 1, uses_anonymous_args = 0
+       .globl ASM_PFX(memcpy)
+
+ASM_PFX(memcpy):

        stmfd   sp!, {r7, lr}
        mov     ip, #0
        add     r7, sp, #0
        stmfd   sp!, {r7, lr}
        mov     ip, #0
        add     r7, sp, #0

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/moddi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/moddi3.S
index 7af8d21683406ff8c9235be7fc1527ec101c3433..6a3cb48802212c243c4531d36d438c72ef5ee7b0 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/moddi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/moddi3.S
@@ -14,10 +14,9 @@
 
        .text
        .align 2
 
        .text
        .align 2

-       .globl ___moddi3
-___moddi3:
-       @ args = 0, pretend = 0, frame = 8
-       @ frame_needed = 1, uses_anonymous_args = 0
+       .globl ASM_PFX(__moddi3)
+
+ASM_PFX(__moddi3):

        stmfd   sp!, {r4, r5, r7, lr}
        mov     r4, r1, asr #31
        add     r7, sp, #8
        stmfd   sp!, {r4, r5, r7, lr}
        mov     r4, r1, asr #31
        add     r7, sp, #8


@@ -36,7 +35,7 @@ ___moddi3:
        subs    r2, r2, r10
        sbc     r3, r3, r11
        str     ip, [sp, #0]
        subs    r2, r2, r10
        sbc     r3, r3, r11
        str     ip, [sp, #0]

-       bl      ___udivmoddi4
+       bl      ASM_PFX(__udivmoddi4)

        ldrd    r0, [sp, #8]
        eor     r0, r0, r4
        eor     r1, r1, r4
        ldrd    r0, [sp, #8]
        eor     r0, r0, r4
        eor     r1, r1, r4

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S
index 14d85421989a2d8ce4b013c3f0a47375b5fd7baf..d34da4f06cd99c81057d212284d0e89ffa6a6f19 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S
@@ -14,10 +14,9 @@
 
        .text
        .align 2
 
        .text
        .align 2

-       .globl ___modsi3
-___modsi3:
-       @ args = 0, pretend = 0, frame = 0
-       @ frame_needed = 1, uses_anonymous_args = 0
+       .globl ASM_PFX(__modsi3)
+
+ASM_PFX(__modsi3):

        stmfd   sp!, {r4, r5, r7, lr}
        add     r7, sp, #8
        mov     r5, r0
        stmfd   sp!, {r4, r5, r7, lr}
        add     r7, sp, #8
        mov     r5, r0

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/muldi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/muldi3.S
index a36dbff8c3cd0822bd8edc6546d0d05273290a4a..a28f0d67b86351d29941e36b20827deef818245e 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/muldi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/muldi3.S
@@ -14,10 +14,9 @@
 
        .text
        .align 2
 
        .text
        .align 2

-       .globl ___muldi3
-___muldi3:
-       @ args = 0, pretend = 0, frame = 8
-       @ frame_needed = 1, uses_anonymous_args = 0
+       .globl ASM_PFX(__muldi3)
+       
+ASM_PFX(__muldi3):

        stmfd   sp!, {r4, r5, r6, r7, lr}
        add     r7, sp, #12
        stmfd   sp!, {r8, r10, r11}
        stmfd   sp!, {r4, r5, r6, r7, lr}
        add     r7, sp, #12
        stmfd   sp!, {r8, r10, r11}

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/sourcery.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/sourcery.S
new file mode 100755 (executable)
index 0000000..7521057
--- /dev/null
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/sourcery.S
@@ -0,0 +1,54 @@
+#------s------------------------------------------------------------------------ 
+#
+# Copyright (c) 2008-2010 Apple Inc. All rights reserved.
+#
+# All rights reserved. This program and the accompanying materials
+# are licensed and made available under the terms and conditions of the BSD License
+# which accompanies this distribution.  The full text of the license may be found at
+# http://opensource.org/licenses/bsd-license.php
+#
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
+#------------------------------------------------------------------------------
+
+
+       .text\r
+       .align 2\r
+       .globl ASM_PFX(__aeabi_ulcmp)\r
+ASM_PFX(__aeabi_ulcmp):\r
+       stmfd   sp!, {r4, r5, r8}\r
+       cmp     r3, r1\r
+       mov     r8, r0\r
+       mov     r9, r1\r
+       mov     r4, r2\r
+       mov     r5, r3\r
+       bls     L16\r
+L2:\r
+       mvn     r0, #0\r
+L1:\r
+       ldmfd   sp!, {r4, r5, r8}\r
+       bx      lr\r
+L16:\r
+       beq     L17\r
+L4:\r
+       cmp     r9, r5\r
+       bhi     L7\r
+       beq     L18\r
+       cmp     r8, r4\r
+L14:\r
+       cmpeq   r9, r5\r
+       moveq   r0, #0\r
+       beq     L1\r
+       b       L1\r
+L18:\r
+       cmp     r8, r4\r
+       bls     L14\r
+L7:\r
+       mov     r0, #1\r
+       b       L1\r
+L17:\r
+       cmp     r2, r0\r
+       bhi     L2\r
+       b       L4\r
+       \r

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S
index a6ecc733491f2abe6e7c7ed91f43ca69fdfd90bb..dadec3c1568b97b8495c926153681e0bcb4c95d5 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S
@@ -14,10 +14,9 @@
 
        .text
        .align 2
 
        .text
        .align 2

-       .globl ___ucmpdi2
-___ucmpdi2:
-       @ args = 0, pretend = 0, frame = 0
-       @ frame_needed = 0, uses_anonymous_args = 0
+       .globl ASM_PFX(__ucmpdi2)
+       
+ASM_PFX(__ucmpdi2):

        stmfd   sp!, {r4, r5, r8, lr}
        cmp     r1, r3
        mov     r8, r0
        stmfd   sp!, {r4, r5, r8, lr}
        cmp     r1, r3
        mov     r8, r0

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.S
index fd7715da66ecfdcf5c4fdb5cad455b418af9755c..0b1cf63367984d6f95365cab92e6038c35f23d54 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.S
@@ -14,15 +14,14 @@
 
        .text
        .align 2
 
        .text
        .align 2

-       .globl ___udivdi3
-___udivdi3:
-       @ args = 0, pretend = 0, frame = 0
-       @ frame_needed = 1, uses_anonymous_args = 0
+       .globl ASM_PFX(__udivdi3)
+
+ASM_PFX(__udivdi3):

        stmfd   sp!, {r7, lr}
        add     r7, sp, #0
        sub     sp, sp, #8
        mov     ip, #0
        str     ip, [sp, #0]
        stmfd   sp!, {r7, lr}
        add     r7, sp, #0
        sub     sp, sp, #8
        mov     ip, #0
        str     ip, [sp, #0]

-       bl      ___udivmoddi4
+       bl      ASM_PFX(__udivmoddi4)

        sub     sp, r7, #0
        ldmfd   sp!, {r7, pc}
        sub     sp, r7, #0
        ldmfd   sp!, {r7, pc}

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S
index 1e54baec2430170b2a8cdc71d11d193316e4e649..03959d6c49c65e298b0b84580ca48b929451fac3 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S
@@ -14,10 +14,9 @@
 
        .text
        .align 2
 
        .text
        .align 2

-       .globl ___udivmoddi4
-___udivmoddi4:
-       @ args = 8, pretend = 0, frame = 16
-       @ frame_needed = 1, uses_anonymous_args = 0
+       .globl ASM_PFX(__udivmoddi4)
+       
+ASM_PFX(__udivmoddi4):

        stmfd   sp!, {r4, r5, r6, r7, lr}
        add     r7, sp, #12
        stmfd   sp!, {r10, r11}
        stmfd   sp!, {r4, r5, r6, r7, lr}
        add     r7, sp, #12
        stmfd   sp!, {r10, r11}


@@ -35,7 +34,7 @@ ___udivmoddi4:
        cmp     r6, #0
        beq     L8
        mov     r1, r2
        cmp     r6, #0
        beq     L8
        mov     r1, r2

-       bl      ___umodsi3
+       bl      ASM_PFX(__umodsi3)

        mov     r1, #0
        stmia   r6, {r0-r1}
 L8:
        mov     r1, #0
        stmia   r6, {r0-r1}
 L8:


@@ -58,14 +57,14 @@ L4:
        beq     L16
        mov     r1, r2
        mov     r0, r11
        beq     L16
        mov     r1, r2
        mov     r0, r11

-       bl      ___umodsi3
+       bl      ASM_PFX(__umodsi3)

        mov     r1, #0
        stmia   r6, {r0-r1}
 L16:
        ldr     r1, [sp, #4]
        mov     r0, r11
 L45:
        mov     r1, #0
        stmia   r6, {r0-r1}
 L16:
        ldr     r1, [sp, #4]
        mov     r0, r11
 L45:

-       bl      ___udivsi3
+       bl      ASM_PFX(__udivsi3)

 L46:
        mov     r10, r0
        mov     r11, #0
 L46:
        mov     r10, r0
        mov     r11, #0


@@ -77,7 +76,7 @@ L14:
        beq     L16
        ldr     r1, [sp, #4]
        mov     r0, r11
        beq     L16
        ldr     r1, [sp, #4]
        mov     r0, r11

-       bl      ___umodsi3
+       bl      ASM_PFX(__umodsi3)

        mov     r4, r10
        mov     r5, r0
        stmia   r6, {r4-r5}
        mov     r4, r10
        mov     r5, r0
        stmia   r6, {r4-r5}

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S
index e5a0afa05329e43297e0e84c5e974cded12c6202..bfe2006151fa1261a7c505e2c289534da95cc010 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S
@@ -14,10 +14,9 @@
 
        .text
        .align 2
 
        .text
        .align 2

-       .globl ___udivsi3
-___udivsi3:
-       @ args = 0, pretend = 0, frame = 0
-       @ frame_needed = 1, uses_anonymous_args = 0
+       .globl ASM_PFX(__udivsi3)
+
+ASM_PFX(__udivsi3):

        cmp     r1, #0
        cmpne   r0, #0
        stmfd   sp!, {r4, r5, r7, lr}
        cmp     r1, #0
        cmpne   r0, #0
        stmfd   sp!, {r4, r5, r7, lr}


@@ -55,3 +54,4 @@ L8:
 L2:
        mov     r0, #0
        ldmfd   sp!, {r4, r5, r7, pc}
 L2:
        mov     r0, #0
        ldmfd   sp!, {r4, r5, r7, pc}

+

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uldivmod.c b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uldivmod.c
new file mode 100755 (executable)
index 0000000..c28de78
--- /dev/null
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uldivmod.c
@@ -0,0 +1,43 @@
+/** @file
+
+  Copyright (c) 2008-2010, Apple Inc. All rights reserved.
+  
+  All rights reserved. This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD License
+  which accompanies this distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#include "Llvm_int_lib.h"
+#include <Library/BaseLib.h>
+
+
+UINT32 __udivsi3(UINT32 n, UINT32 d);
+UINT32 __umodsi3(UINT32 a, UINT32 b);
+
+
+UINT64 
+__aeabi_uidivmod(unsigned numerator, unsigned denominator)
+{
+  UINT64  Return;
+
+  Return = __udivsi3 (numerator, denominator);
+  Return |= LShiftU64 (__umodsi3 (numerator, denominator), 32);
+
+  return Return;
+}
+
+unsigned
+__aeabi_uidiv (unsigned n, unsigned d) 
+{
+  return __udivsi3 (n, d);
+}
+
+
+
+
+

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.S
index 6396036c041076aecb9db313745007eda579d9b3..f987943bea8d07929ad0503ac2c42b7588c8dfc6 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.S
@@ -14,16 +14,15 @@
 
        .text
        .align 2
 
        .text
        .align 2

-       .globl ___umoddi3
-___umoddi3:
-       @ args = 0, pretend = 0, frame = 8
-       @ frame_needed = 1, uses_anonymous_args = 0
+       .globl ASM_PFX(__umoddi3)
+       
+ASM_PFX(__umoddi3):

        stmfd   sp!, {r7, lr}
        add     r7, sp, #0
        sub     sp, sp, #16
        add     ip, sp, #8
        str     ip, [sp, #0]
        stmfd   sp!, {r7, lr}
        add     r7, sp, #0
        sub     sp, sp, #16
        add     ip, sp, #8
        str     ip, [sp, #0]

-       bl      ___udivmoddi4
+       bl      ASM_PFX(__udivmoddi4)

        ldrd    r0, [sp, #8]
        sub     sp, r7, #0
        ldmfd   sp!, {r7, pc}
        ldrd    r0, [sp, #8]
        sub     sp, r7, #0
        ldmfd   sp!, {r7, pc}

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.S
index 4cde76beb52561c1e5bee83671464791ad496aa9..129cedff958e88a86efa82bc31c5ca05ff69ad98 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.S
@@ -14,27 +14,15 @@
 
        .text
        .align 2
 
        .text
        .align 2

-       .globl ___umodsi3
-___umodsi3:
-       @ args = 0, pretend = 0, frame = 0
-       @ frame_needed = 1, uses_anonymous_args = 0
+       .globl  ASM_PFX(__umodsi3)
+       
+ASM_PFX(__umodsi3):

        stmfd   sp!, {r4, r5, r7, lr}
        add     r7, sp, #8
        mov     r5, r0
        mov     r4, r1
        stmfd   sp!, {r4, r5, r7, lr}
        add     r7, sp, #8
        mov     r5, r0
        mov     r4, r1

-       bl      L___udivsi3$stub
+       bl      ASM_PFX(__udivsi3)

        mul     r0, r4, r0
        rsb     r0, r0, r5
        ldmfd   sp!, {r4, r5, r7, pc}
        mul     r0, r4, r0
        rsb     r0, r0, r5
        ldmfd   sp!, {r4, r5, r7, pc}

-       .section __TEXT,__symbol_stub4,symbol_stubs,none,12
-       .align 2
-L___udivsi3$stub:
-       .indirect_symbol ___udivsi3
-       ldr     ip, L___udivsi3$slp
-       ldr     pc, [ip, #0]
-L___udivsi3$slp:
-       .long   L___udivsi3$lazy_ptr
-       .lazy_symbol_pointer
-L___udivsi3$lazy_ptr:
-       .indirect_symbol        ___udivsi3
-       .long   dyld_stub_binding_helper
+

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf b/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
index b9c5130d50a15a6d52bcad4474c8964128379efd..692a2d0a5b97c46210a4c6f6f1341f2d6c8b5492 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
@@ -87,6 +87,8 @@
   Arm/switch16.S   | GCC
   Arm/switch32.S   | GCC
 
   Arm/switch16.S   | GCC
   Arm/switch32.S   | GCC
 

+  Arm/sourcery.S   | GCC
+  Arm/uldivmod.c   | GCC

 
 [Packages]
   MdePkg/MdePkg.dec
 
 [Packages]
   MdePkg/MdePkg.dec