From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1792) id E8C883858D33; Tue, 14 Feb 2023 19:29:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E8C883858D33 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1676402999; bh=pJ0+iaWxS5+mqYo1TQxWqmucrrqhVAQMUQvXbVMFPqw=; h=From:To:Subject:Date:From; b=ylyb6edHaYXD0Mq/251eFyshtX4/rZOOrRqITHVV5BX9BXOV0KygQ4YOIqTN8slG0 MVRZkwqRq4OD9X95A3pbgrqFS4iBE7vCp1odaUIHMMovDwxiSZZX1dg6PS/ZQZEC49 WXaOxJkkkGNBRunsOYxUHlWZPo1tQM2U9v1d8CWs= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Samuel Thibault To: glibc-cvs@sourceware.org Subject: [glibc] mach: undef ENTRY2 X-Act-Checkin: glibc X-Git-Author: Sergey Bugaev X-Git-Refname: refs/heads/master X-Git-Oldrev: 748511f0bb61785f976e18843d707a8ba8fffe29 X-Git-Newrev: c57c53fa53dead8edb1ebef6e937bbb92dfe9d09 Message-Id: <20230214192959.E8C883858D33@sourceware.org> Date: Tue, 14 Feb 2023 19:29:59 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c57c53fa53dead8edb1ebef6e937bbb92dfe9d09 commit c57c53fa53dead8edb1ebef6e937bbb92dfe9d09 Author: Sergey Bugaev Date: Tue Feb 14 20:37:21 2023 +0300 mach: undef ENTRY2 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 Message-Id: <20230214173722.428140-3-bugaevc@gmail.com> Diff: --- sysdeps/mach/sysdep.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sysdeps/mach/sysdep.h b/sysdeps/mach/sysdep.h index fe26bcb384..1c869f5cb2 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; \