summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2021-04-24 06:08:42 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2021-04-24 06:08:42 +0000
commitc69311f4a3fe9c9313a4b5686dc7971619f0a3b5 (patch)
tree66b0ab9b2d6d2270448ad4163ec925ac50a384a9 /sys
parentfa0170077c5605f56a659c21e21acf667ae66177 (diff)
reduce diff to other archs
ok deraadt@ mlarkin@
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/riscv64/conf/Makefile.riscv6412
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/riscv64/conf/Makefile.riscv64 b/sys/arch/riscv64/conf/Makefile.riscv64
index 08112bbd630..17138e750d1 100644
--- a/sys/arch/riscv64/conf/Makefile.riscv64
+++ b/sys/arch/riscv64/conf/Makefile.riscv64
@@ -51,23 +51,23 @@ CMACHFLAGS+= -fno-stack-protector
.endif
.if ${IDENT:M-DSMALL_KERNEL}
SORTR= cat
-COPTS?= -Oz
+COPTIMIZE?= -Oz
.endif
DEBUG?= -g
-COPTS?= -O2 # XXX Optimization Disabled for Debugging
-CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE}
+COPTIMIZE?= -O2
+CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTIMIZE} ${COPTS} ${PIPE}
AFLAGS= -D_LOCORE -x assembler-with-cpp ${CWARNFLAGS} ${CMACHFLAGS}
-LINKFLAGS= -T ld.script -X --warn-common -no-pie
+LINKFLAGS= -T ld.script -X --warn-common -nopie
HOSTCC?= ${CC}
HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//}
HOSTED_CFLAGS= ${CFLAGS}
HOSTED_C= ${HOSTCC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $<
-NORMAL_C_NOP= ${CC} ${CFLAGS} ${CPPFLAGS} -c $<
+NORMAL_C_NOP= ${CC} ${CFLAGS} ${CPPFLAGS} -fno-ret-protector -c $<
NORMAL_C= ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
+NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} ${PROF} -c $<
%OBJS