do not need .align 2 or 4 after .text, the ABI's .text will decide what

to do
ok kettenis

diff --git a/sys/arch/riscv64/riscv64/copy.S b/sys/arch/riscv64/riscv64/copy.S
index 96a4fa8..075159f 100644 (file)
--- a/sys/arch/riscv64/riscv64/copy.S
+++ b/sys/arch/riscv64/riscv64/copy.S
@@ -1,4 +1,4 @@
-/*     $OpenBSD: copy.S,v 1.5 2021/06/28 09:35:09 kettenis Exp $       */
+/*     $OpenBSD: copy.S,v 1.6 2021/06/28 18:53:10 deraadt Exp $        */
 
 /*
  * Copyright (c) 2020 Brian Bamsch <bbamsch@google.com>
@@ -27,7 +27,6 @@
 
 
        .text
-       .align 4
 
 /*
  * a0 = user space address

diff --git a/sys/arch/riscv64/riscv64/copystr.S b/sys/arch/riscv64/riscv64/copystr.S
index 45209bb..b1c94b8 100644 (file)
--- a/sys/arch/riscv64/riscv64/copystr.S
+++ b/sys/arch/riscv64/riscv64/copystr.S
@@ -1,4 +1,4 @@
-/*     $OpenBSD: copystr.S,v 1.3 2021/05/15 20:14:05 deraadt Exp $     */
+/*     $OpenBSD: copystr.S,v 1.4 2021/06/28 18:53:10 deraadt Exp $     */
 
 /*
  * Copyright (c) 2015 Dale Rahn <drahn@dalerahn.com>
@@ -25,7 +25,6 @@
 #include <sys/errno.h>
 
        .text
-       .align 4
 
 /*
  * a0 - from

diff --git a/sys/arch/riscv64/riscv64/cpufunc_asm.S b/sys/arch/riscv64/riscv64/cpufunc_asm.S
index f391a47..9817b30 100644 (file)
--- a/sys/arch/riscv64/riscv64/cpufunc_asm.S
+++ b/sys/arch/riscv64/riscv64/cpufunc_asm.S
@@ -1,4 +1,4 @@
-/*     $OpenBSD: cpufunc_asm.S,v 1.2 2021/05/12 01:20:52 jsg Exp $     */
+/*     $OpenBSD: cpufunc_asm.S,v 1.3 2021/06/28 18:53:10 deraadt Exp $ */
 
 /*-
  * Copyright (c) 2015-2017 Ruslan Bukin <br@bsdpad.com>
@@ -37,7 +37,6 @@
 #include <machine/asm.h>
 
        .text
-       .align  2
 
 ENTRY(riscv_nullop)
        ret