From 845b0e889b3400dfea3a4fb397ae309e458fa682 Mon Sep 17 00:00:00 2001 From: deraadt Date: Mon, 28 Jun 2021 15:45:15 +0000 Subject: [PATCH] delete .align inside sigtramp stubs, as the stack alignment requirement hasn't existed for many years, since the code was moved it into a unique page, with trap sleds. ok kettenis --- sys/arch/arm64/arm64/locore.S | 4 +--- sys/arch/riscv64/riscv64/locore.S | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/arch/arm64/arm64/locore.S b/sys/arch/arm64/arm64/locore.S index 1c61bbff5ae..857db50241a 100644 --- a/sys/arch/arm64/arm64/locore.S +++ b/sys/arch/arm64/arm64/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.37 2021/03/27 20:03:15 kettenis Exp $ */ +/* $OpenBSD: locore.S,v 1.38 2021/06/28 15:45:15 deraadt Exp $ */ /*- * Copyright (c) 2012-2014 Andrew Turner * All rights reserved. @@ -378,8 +378,6 @@ _C_LABEL(sigcoderet): dsb nsh isb END(sigcode) - /* This may be copied to the stack, keep it 16-byte aligned */ - .align 3 .global _C_LABEL(esigcode) _C_LABEL(esigcode): diff --git a/sys/arch/riscv64/riscv64/locore.S b/sys/arch/riscv64/riscv64/locore.S index 24d4290b92f..fc4fa910c0c 100644 --- a/sys/arch/riscv64/riscv64/locore.S +++ b/sys/arch/riscv64/riscv64/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.8 2021/06/26 17:38:40 kettenis Exp $ */ +/* $OpenBSD: locore.S,v 1.9 2021/06/28 15:45:16 deraadt Exp $ */ /*- * Copyright (c) 2015-2018 Ruslan Bukin @@ -317,8 +317,6 @@ _C_LABEL(sigcoderet): li t0, SYS_exit ecall END(sigcode) - /* This may be copied to the stack, keep it 16-byte aligned */ - .align 3 .globl _C_LABEL(esigcode) _C_LABEL(esigcode): -- 2.20.1