diff mbox series

[RFC,08/23] hurd: Drop x86-specific assembly from init-first.c

Message ID 20240103171502.1358371-9-bugaevc@gmail.com
State Committed
Commit b44ad8944b84dd83e89b50e298ee15701c8f2706
Headers
Series aarch64-gnu port |

Checks

Context Check Description
redhat-pt-bot/TryBot-apply_patch success Patch applied to master at the time it was sent
linaro-tcwg-bot/tcwg_glibc_build--master-arm fail Patch failed to apply
redhat-pt-bot/TryBot-still_applies warning Patch no longer applies to master

Commit Message

Sergey Bugaev Jan. 3, 2024, 5:14 p.m. UTC 
  We already have the RETURN_TO macro for this exact use case, and it's already
used in the non-static code path. Use it here too.

Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
---

This was the last piece of x86 specifics in init-first.c!
(Remember, it started as sysdeps/mach/hurd/i386/init-first.c, with lots of
i386-specific assumptions about how arguments are passed and so on.)

 sysdeps/mach/hurd/x86/init-first.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

Comments

Samuel Thibault Jan. 4, 2024, 10:48 p.m. UTC | #1 
Applied, thanks!

Sergey Bugaev, le mer. 03 janv. 2024 20:14:41 +0300, a ecrit:
> We already have the RETURN_TO macro for this exact use case, and it's already
> used in the non-static code path. Use it here too.
> 
> Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
> ---
> 
> This was the last piece of x86 specifics in init-first.c!
> (Remember, it started as sysdeps/mach/hurd/i386/init-first.c, with lots of
> i386-specific assumptions about how arguments are passed and so on.)
> 
>  sysdeps/mach/hurd/x86/init-first.c | 10 +---------
>  1 file changed, 1 insertion(+), 9 deletions(-)
> 
> diff --git a/sysdeps/mach/hurd/x86/init-first.c b/sysdeps/mach/hurd/x86/init-first.c
> index 6f71d71b..211b2096 100644
> --- a/sysdeps/mach/hurd/x86/init-first.c
> +++ b/sysdeps/mach/hurd/x86/init-first.c
> @@ -218,15 +218,7 @@ _hurd_stack_setup (void **argptr)
>    void doinit (intptr_t *data)
>      {
>        init ((void **) data);
> -# ifdef __x86_64__
> -      asm volatile ("movq %0, %%rsp\n" /* Switch to new outermost stack.  */
> -                    "xorq %%rbp, %%rbp\n" /* Clear outermost frame pointer.  */
> -                    "jmp *%1" : : "r" (data), "r" (caller));
> -# else
> -      asm volatile ("movl %0, %%esp\n" /* Switch to new outermost stack.  */
> -		    "xorl %%ebp, %%ebp\n" /* Clear outermost frame pointer.  */
> -		    "jmp *%1" : : "r" (data), "r" (caller));
> -# endif
> +      RETURN_TO (data, caller, 0);
>        __builtin_unreachable ();
>      }
>  
> -- 
> 2.43.0
> 
>
diff mbox series

Patch

diff --git a/sysdeps/mach/hurd/x86/init-first.c b/sysdeps/mach/hurd/x86/init-first.c
index 6f71d71b..211b2096 100644
--- a/sysdeps/mach/hurd/x86/init-first.c
+++ b/sysdeps/mach/hurd/x86/init-first.c
@@ -218,15 +218,7 @@  _hurd_stack_setup (void **argptr)
   void doinit (intptr_t *data)
     {
       init ((void **) data);
-# ifdef __x86_64__
-      asm volatile ("movq %0, %%rsp\n" /* Switch to new outermost stack.  */
-                    "xorq %%rbp, %%rbp\n" /* Clear outermost frame pointer.  */
-                    "jmp *%1" : : "r" (data), "r" (caller));
-# else
-      asm volatile ("movl %0, %%esp\n" /* Switch to new outermost stack.  */
-		    "xorl %%ebp, %%ebp\n" /* Clear outermost frame pointer.  */
-		    "jmp *%1" : : "r" (data), "r" (caller));
-# endif
+      RETURN_TO (data, caller, 0);
       __builtin_unreachable ();
     }