From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2138) id 0AB9C3857C42; Wed, 5 Aug 2020 19:54:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0AB9C3857C42 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Andreas Schwab To: glibc-cvs@sourceware.org Subject: [glibc/schwab/ilp32-2.32] aarch64: Fix jmp_buf-macros.h for ILP32. X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/schwab/ilp32-2.32 X-Git-Oldrev: d125954f7818a9092dd1973ade4fb95e35dc9aa0 X-Git-Newrev: a1568fd439ce52b483eab93320eb31b5d9b701ed Message-Id: <20200805195411.0AB9C3857C42@sourceware.org> Date: Wed, 5 Aug 2020 19:54:11 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Aug 2020 19:54:11 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=a1568fd439ce52b483eab93320eb31b5d9b701ed commit a1568fd439ce52b483eab93320eb31b5d9b701ed Author: Szabolcs Nagy Date: Fri Nov 10 18:59:31 2017 +0000 aarch64: Fix jmp_buf-macros.h for ILP32. The offset is different on ILP32 because __saved_mask is 4 byte aligned. 2017-11-28 Szabolcs Nagy * sysdeps/unix/sysv/linux/aarch64/jmp_buf-macros.h (SAVED_MASK_OFFSET): Fix for ILP32. Diff: --- sysdeps/unix/sysv/linux/aarch64/jmp_buf-macros.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sysdeps/unix/sysv/linux/aarch64/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/aarch64/jmp_buf-macros.h index 608a7ad1f7..d0ced8761c 100644 --- a/sysdeps/unix/sysv/linux/aarch64/jmp_buf-macros.h +++ b/sysdeps/unix/sysv/linux/aarch64/jmp_buf-macros.h @@ -3,4 +3,8 @@ #define JMP_BUF_ALIGN 8 #define SIGJMP_BUF_ALIGN 8 #define MASK_WAS_SAVED_OFFSET 176 -#define SAVED_MASK_OFFSET 184 +#ifdef __ILP32__ +# define SAVED_MASK_OFFSET 180 +#else +# define SAVED_MASK_OFFSET 184 +#endif