Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/rump/Makefile.rump,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/rump/Makefile.rump,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- src/sys/rump/Makefile.rump	2018/01/18 00:32:49	1.123
+++ src/sys/rump/Makefile.rump	2018/03/03 22:46:30	1.124
@@ -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*)