From: miod <miod@openbsd.org>
Date: Mon, 20 Nov 2023 16:11:45 +0000 (+0000)
Subject: Revert 1.18 and randomly sort kernel object files again now that the issue
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=412334f5942ef3f2dc423585e40c33e01e6a276d;p=openbsd

Revert 1.18 and randomly sort kernel object files again now that the issue
has been addressed.
---

diff --git a/sys/arch/riscv64/conf/Makefile.riscv64 b/sys/arch/riscv64/conf/Makefile.riscv64
index ef6e918ed99..94017a6a52e 100644
--- a/sys/arch/riscv64/conf/Makefile.riscv64
+++ b/sys/arch/riscv64/conf/Makefile.riscv64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.riscv64,v 1.18 2023/11/11 18:00:36 jca Exp $
+#	$OpenBSD: Makefile.riscv64,v 1.19 2023/11/20 16:11:45 miod Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -34,7 +34,7 @@ CWARNFLAGS=	-Werror -Wall -Wimplicit-function-declaration \
 CMACHFLAGS=	-march=rv64gc -mcmodel=medany -mno-relax \
 		-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
 CMACHFLAGS+=	-ffreestanding ${NOPIE_FLAGS}
-SORTR=		cat
+SORTR=		sort -R
 .if ${IDENT:M-DNO_PROPOLICE}
 CMACHFLAGS+=	-fno-stack-protector
 .endif