ArmPkg: Fix modsi3.S compilation across toolchains.

[edk2] [PATCH] ArmPkg: Fix modsi3.S compilation across toolchains.

Posted by Marvin Häuser 7 years, 1 month ago

modsi3.S references the symbol '__divsi3' by '___divsi3' which assumes
the prefix is always required and supported.  Use ASM_PFX() instead
to support all compilers.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Marvin Haeuser <Marvin.Haeuser@outlook.com>
---
 ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S
index 29e2df92b02f..d5624b90f9d5 100644
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S
@@ -19,7 +19,7 @@ ASM_FUNC(__modsi3)
   add  r7, sp, #8
   mov  r5, r0
   mov  r4, r1
-  bl  ___divsi3
+  bl  ASM_PFX(__divsi3)
   mul  r0, r4, r0
   rsb  r0, r0, r5
   ldmfd  sp!, {r4, r5, r7, pc}
-- 
2.12.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [PATCH] ArmPkg: Fix modsi3.S compilation across toolchains.

Posted by Ard Biesheuvel 7 years, 1 month ago

On 11 March 2017 at 23:05, Marvin Häuser <Marvin.Haeuser@outlook.com> wrote:
> modsi3.S references the symbol '__divsi3' by '___divsi3' which assumes
> the prefix is always required and supported.  Use ASM_PFX() instead
> to support all compilers.
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Marvin Haeuser <Marvin.Haeuser@outlook.com>

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Pushed, thanks.

> ---
>  ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S
> index 29e2df92b02f..d5624b90f9d5 100644
> --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S
> +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S
> @@ -19,7 +19,7 @@ ASM_FUNC(__modsi3)
>    add  r7, sp, #8
>    mov  r5, r0
>    mov  r4, r1
> -  bl  ___divsi3
> +  bl  ASM_PFX(__divsi3)
>    mul  r0, r4, r0
>    rsb  r0, r0, r5
>    ldmfd  sp!, {r4, r5, r7, pc}
> --
> 2.12.0.windows.1
>
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel