Module Name: src
Committed By: christos
Date: Sat Mar 3 22:46:30 UTC 2018
Modified Files:
src/sys/rump: Makefile.rump
Log Message:
Disable NULL pointer check deletion like we do for the kernel in
src/sys/conf/Makefile.kern.inc. This is the same code we are compiling after
all and it has the same issues.
To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 src/sys/rump/Makefile.rump
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.123 src/sys/rump/Makefile.rump:1.124
--- src/sys/rump/Makefile.rump:1.123 Wed Jan 17 19:32:49 2018
+++ src/sys/rump/Makefile.rump Sat Mar 3 17:46:30 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.123 2018/01/18 00:32:49 mrg Exp $
+# $NetBSD: Makefile.rump,v 1.124 2018/03/03 22:46:30 christos Exp $
#
.if !defined(_RUMP_MK)
@@ -19,6 +19,11 @@ CPPFLAGS:= -I${RUMPTOP}/include ${CPPFLA
CPPFLAGS+= -D_RUMPKERNEL -I${RUMPTOP}/librump/rumpkern
.endif
+# We are compiling the kernel code with no-delete-null-pointer-checks,
+# and compiling without it, causes issues at least on sh3 by adding
+# aborts after kern_assert on NULL pointer checks.
+CFLAGS+= ${${ACTIVE_CC} == "gcc":? -fno-delete-null-pointer-checks :}
+
# Define baseline cpu for mips ports, required for
# rumpcomp_sync_icache() hypercall.
.if !empty(MACHINE_ARCH:Mmips*)
