diff mbox series

[06/23] mach: Drop SNARF_ARGS macro

Message ID 20240103171502.1358371-7-bugaevc@gmail.com
State Committed
Commit 0d4a2f3576ebd92ca0001645a533bf70289f264e
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

Commit Message

Sergey Bugaev Jan. 3, 2024, 5:14 p.m. UTC 
  We're obtaining arguments from the stack differently, see init-first.c.

Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
---
 sysdeps/mach/sysdep.h     |  7 -------
 sysdeps/mach/x86/sysdep.h | 14 --------------
 2 files changed, 21 deletions(-)

Comments

Samuel Thibault Jan. 3, 2024, 9 p.m. UTC | #1 
Applied, thanks!

Sergey Bugaev, le mer. 03 janv. 2024 20:14:39 +0300, a ecrit:
> We're obtaining arguments from the stack differently, see init-first.c.
> 
> Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
> ---
>  sysdeps/mach/sysdep.h     |  7 -------
>  sysdeps/mach/x86/sysdep.h | 14 --------------
>  2 files changed, 21 deletions(-)
> 
> diff --git a/sysdeps/mach/sysdep.h b/sysdeps/mach/sysdep.h
> index 8eeac45b..3e0553d8 100644
> --- a/sysdeps/mach/sysdep.h
> +++ b/sysdeps/mach/sysdep.h
> @@ -56,13 +56,6 @@
>  /* This is not used on all machines.  */
>  #endif
>  
> -/* Set variables ARGC, ARGV, and ENVP for the arguments
> -   left on the stack by the microkernel.  */
> -#ifndef SNARF_ARGS
> -#define SNARF_ARGS(argc, argv, envp)
> -#error SNARF_ARGS not defined by sysdeps/mach/MACHINE/sysdep.h
> -#endif
> -
>  /* LOSE can be defined as the `halt' instruction or something
>     similar which will cause the process to die in a characteristic
>     way suggesting a bug.  */
> diff --git a/sysdeps/mach/x86/sysdep.h b/sysdeps/mach/x86/sysdep.h
> index ed9f7f46..63be5638 100644
> --- a/sysdeps/mach/x86/sysdep.h
> +++ b/sysdeps/mach/x86/sysdep.h
> @@ -25,20 +25,6 @@
>  
>  #define LOSE asm volatile ("hlt")
>  
> -#define SNARF_ARGS(entry_sp, argc, argv, envp)				      \
> -  do									      \
> -    {									      \
> -      char **p;								      \
> -      argc = (int) *entry_sp;						      \
> -      argv = (char **) (entry_sp + 1);					      \
> -      p = argv;								      \
> -      while (*p++ != NULL)						      \
> -	;								      \
> -      if (p >= (char **) argv[0])					      \
> -	--p;								      \
> -      envp = p;							      \
> -    } while (0)
> -
>  #define STACK_GROWTH_DOWN
>  
>  /* Get the machine-independent Mach definitions.  */
> -- 
> 2.43.0
> 
>
diff mbox series

Patch

diff --git a/sysdeps/mach/sysdep.h b/sysdeps/mach/sysdep.h
index 8eeac45b..3e0553d8 100644
--- a/sysdeps/mach/sysdep.h
+++ b/sysdeps/mach/sysdep.h
@@ -56,13 +56,6 @@ 
 /* This is not used on all machines.  */
 #endif
 
-/* Set variables ARGC, ARGV, and ENVP for the arguments
-   left on the stack by the microkernel.  */
-#ifndef SNARF_ARGS
-#define SNARF_ARGS(argc, argv, envp)
-#error SNARF_ARGS not defined by sysdeps/mach/MACHINE/sysdep.h
-#endif
-
 /* LOSE can be defined as the `halt' instruction or something
    similar which will cause the process to die in a characteristic
    way suggesting a bug.  */
diff --git a/sysdeps/mach/x86/sysdep.h b/sysdeps/mach/x86/sysdep.h
index ed9f7f46..63be5638 100644
--- a/sysdeps/mach/x86/sysdep.h
+++ b/sysdeps/mach/x86/sysdep.h
@@ -25,20 +25,6 @@ 
 
 #define LOSE asm volatile ("hlt")
 
-#define SNARF_ARGS(entry_sp, argc, argv, envp)				      \
-  do									      \
-    {									      \
-      char **p;								      \
-      argc = (int) *entry_sp;						      \
-      argv = (char **) (entry_sp + 1);					      \
-      p = argv;								      \
-      while (*p++ != NULL)						      \
-	;								      \
-      if (p >= (char **) argv[0])					      \
-	--p;								      \
-      envp = p;							      \
-    } while (0)
-
 #define STACK_GROWTH_DOWN
 
 /* Get the machine-independent Mach definitions.  */