From: kettenis <kettenis@openbsd.org>
Date: Sat, 15 May 2021 20:51:12 +0000 (+0000)
Subject: Add back -mno-relax for now.  Retain the -target option but put it on
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=f60f962c636258ac1573fb4ed70e3eece34bf748;p=openbsd

Add back -mno-relax for now.  Retain the -target option but put it on
a line of its own to improve diffability with other architectures.

ok drahn@
---

diff --git a/sys/arch/riscv64/conf/Makefile.riscv64 b/sys/arch/riscv64/conf/Makefile.riscv64
index 779ee60c63a..46d6e80886a 100644
--- a/sys/arch/riscv64/conf/Makefile.riscv64
+++ b/sys/arch/riscv64/conf/Makefile.riscv64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.riscv64,v 1.8 2021/05/15 20:05:05 deraadt Exp $
+#	$OpenBSD: Makefile.riscv64,v 1.9 2021/05/15 20:51:12 kettenis Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -28,10 +28,10 @@ CWARNFLAGS=	-Werror -Wall -Wimplicit-function-declaration \
 		-Wno-constant-conversion -Wno-address-of-packed-member \
 		-Wframe-larger-than=2047
 
-CMACHFLAGS=	--target=riscv64-unknown-openbsd -march=rv64gc \
-		-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer \
-		-mcmodel=medany
+CMACHFLAGS=	-march=rv64gc -mcmodel=medany -mno-relax \
+		-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
 CMACHFLAGS+=	-ffreestanding ${NOPIE_FLAGS}
+CMACHFLAGS+=	-target riscv64-unknown-openbsd
 SORTR=		sort -R
 .if ${IDENT:M-DNO_PROPOLICE}
 CMACHFLAGS+=	-fno-stack-protector