diff mbox series

[2/3] mach: undef ENTRY2

Message ID 20230214173722.428140-3-bugaevc@gmail.com
State Committed, archived
Headers
Series x86_64-gnu follow-ups |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent

Commit Message

Sergey Bugaev Feb. 14, 2023, 5:37 p.m. UTC 
  This macro from Mach headers conflicts with how
sysdeps/x86_64/multiarch/strcmp-sse2.S expects it to be defined.

Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
---
 sysdeps/mach/sysdep.h | 1 +
 1 file changed, 1 insertion(+)

Comments

Samuel Thibault Feb. 14, 2023, 7:30 p.m. UTC | #1 
Applied, thanks!

Sergey Bugaev via Libc-alpha, le mar. 14 févr. 2023 20:37:21 +0300, a ecrit:
> This macro from Mach headers conflicts with how
> sysdeps/x86_64/multiarch/strcmp-sse2.S expects it to be defined.
> 
> Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
> ---
>  sysdeps/mach/sysdep.h | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/sysdeps/mach/sysdep.h b/sysdeps/mach/sysdep.h
> index fe26bcb3..1c869f5c 100644
> --- a/sysdeps/mach/sysdep.h
> +++ b/sysdeps/mach/sysdep.h
> @@ -30,6 +30,7 @@
>  /* For ELF we need to add the `.type' directive to make shared libraries
>     work right.  */
>  #undef ENTRY
> +#undef ENTRY2
>  #define ENTRY(name) \
>    .globl name; \
>    .align ALIGN; \
> -- 
> 2.39.1
>
diff mbox series

Patch

diff --git a/sysdeps/mach/sysdep.h b/sysdeps/mach/sysdep.h
index fe26bcb3..1c869f5c 100644
--- a/sysdeps/mach/sysdep.h
+++ b/sysdeps/mach/sysdep.h
@@ -30,6 +30,7 @@ 
 /* For ELF we need to add the `.type' directive to make shared libraries
    work right.  */
 #undef ENTRY
+#undef ENTRY2
 #define ENTRY(name) \
   .globl name; \
   .align ALIGN; \