diff mbox series

libgcc: arm: fix build for FDPIC target

Message ID 20240322201441.2161826-1-jcmvbkbc@gmail.com
State New
Headers show
Series libgcc: arm: fix build for FDPIC target | expand

Commit Message

Max Filippov March 22, 2024, 8:14 p.m. UTC 
libgcc/
	* unwind-arm-common.inc (__gnu_personality_sigframe_fdpic): Cast
	last argument of _Unwind_VRS_Set to void *.
---
 libgcc/unwind-arm-common.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Christophe Lyon March 25, 2024, 10:08 a.m. UTC | #1 
Hi,

On 3/22/24 21:14, Max Filippov wrote:
> libgcc/
> 	* unwind-arm-common.inc (__gnu_personality_sigframe_fdpic): Cast
> 	last argument of _Unwind_VRS_Set to void *.
> ---
>   libgcc/unwind-arm-common.inc | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libgcc/unwind-arm-common.inc b/libgcc/unwind-arm-common.inc
> index 5453f38186b5..576f7e93e8a8 100644
> --- a/libgcc/unwind-arm-common.inc
> +++ b/libgcc/unwind-arm-common.inc
> @@ -248,7 +248,7 @@ __gnu_personality_sigframe_fdpic (_Unwind_State state,
>   	  + ARM_SIGCONTEXT_R0;
>       /* Restore regs saved on stack by the kernel.  */
>       for (i = 0; i < 16; i++)
> -	_Unwind_VRS_Set (context, _UVRSC_CORE, i, _UVRSD_UINT32, sp + 4 * i);
> +	_Unwind_VRS_Set (context, _UVRSC_CORE, i, _UVRSD_UINT32, (void *)(sp + 4 * i));

LGTM (but I'm not a maintainer).

Thanks,

Christophe

>   
>       return _URC_CONTINUE_UNWIND;
>   }
Max Filippov March 25, 2024, 6:23 p.m. UTC | #2 
On Fri, Mar 22, 2024 at 1:15 PM Max Filippov <jcmvbkbc@gmail.com> wrote:
>
> libgcc/
>         * unwind-arm-common.inc (__gnu_personality_sigframe_fdpic): Cast
>         last argument of _Unwind_VRS_Set to void *.
> ---
>  libgcc/unwind-arm-common.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Build-tested for arm-gnu-uclinuxfdpiceabi, committed as obvious.
diff mbox series

Patch

diff --git a/libgcc/unwind-arm-common.inc b/libgcc/unwind-arm-common.inc
index 5453f38186b5..576f7e93e8a8 100644
--- a/libgcc/unwind-arm-common.inc
+++ b/libgcc/unwind-arm-common.inc
@@ -248,7 +248,7 @@  __gnu_personality_sigframe_fdpic (_Unwind_State state,
 	  + ARM_SIGCONTEXT_R0;
     /* Restore regs saved on stack by the kernel.  */
     for (i = 0; i < 16; i++)
-	_Unwind_VRS_Set (context, _UVRSC_CORE, i, _UVRSD_UINT32, sp + 4 * i);
+	_Unwind_VRS_Set (context, _UVRSC_CORE, i, _UVRSD_UINT32, (void *)(sp + 4 * i));
 
     return _URC_CONTINUE_UNWIND;
 }