Patchwork [committed,arm/ilp32] aarch64: Fix jmp_buf-macros.h for ILP32

login
register
mail settings
Submitter Szabolcs Nagy
Date Nov. 27, 2017, 8:02 p.m.
Message ID <5A1C6F3F.9050807@arm.com>
Download mbox | patch
Permalink /patch/24560/
State New
Headers show

Comments

Szabolcs Nagy - Nov. 27, 2017, 8:02 p.m.
rebased the arm/ilp32 branch, it needed this patch.
Joseph Myers - Nov. 27, 2017, 10:24 p.m.
Should use preprocessor indentation, "# define", in both halves of the 
#ifdef.
Szabolcs Nagy - Nov. 28, 2017, 10:06 a.m.
On 27/11/17 22:24, Joseph Myers wrote:
> Should use preprocessor indentation, "# define", in both halves of the 
> #ifdef.
> 

thanks, i will fix it in the next rebase.

Patch

From e79bccb0762f71c1c3f460ce7dd750bf0fb34741 Mon Sep 17 00:00:00 2001
From: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Fri, 10 Nov 2017 18:59:31 +0000
Subject: [PATCH 8/8] aarch64: Fix jmp_buf-macros.h for ILP32.

The offset is different on ILP32 because __saved_mask is 4 byte aligned.

2017-11-27  Szabolcs Nagy  <szabolcs.nagy@arm.com>

	* sysdeps/unix/sysv/linux/aarch64/jmp_buf-macros.h (SAVED_MASK_OFFSET):
	Fix for ILP32.
---
 sysdeps/unix/sysv/linux/aarch64/jmp_buf-macros.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sysdeps/unix/sysv/linux/aarch64/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/aarch64/jmp_buf-macros.h
index 608a7ad1f7..adda020e2c 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
+#ifdef __ILP32__
+#define SAVED_MASK_OFFSET 180
+#else
 #define SAVED_MASK_OFFSET 184
+#endif
-- 
2.11.0