From: deraadt <deraadt@openbsd.org>
Date: Thu, 29 Jun 2017 13:04:09 +0000 (+0000)
Subject: 0xd4d4d4d4 is a useful 'trap instruction' on arm64, but not on arm32.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=4c271be3007c11971d56fe135dc1df23bdd5226b;p=openbsd

0xd4d4d4d4 is a useful 'trap instruction' on arm64, but not on arm32.
0xffffffff seems better in userland and kernel. still not exactly happy
with the situation.
long discussion with kettenis.  anyone else have an opinion?
---

diff --git a/sys/arch/armv7/conf/Makefile.armv7 b/sys/arch/armv7/conf/Makefile.armv7
index dfef4e30db5..1c0d7df9740 100644
--- a/sys/arch/armv7/conf/Makefile.armv7
+++ b/sys/arch/armv7/conf/Makefile.armv7
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.armv7,v 1.29 2017/06/25 14:02:23 deraadt Exp $
+#	$OpenBSD: Makefile.armv7,v 1.30 2017/06/29 13:04:09 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -130,7 +130,7 @@ makegap.sh:
 	cp $S/conf/makegap.sh $@
 
 gap.o:	Makefile makegap.sh gapdummy.o
-	sh makegap.sh 0xd4d4d4d4 gapdummy.o
+	sh makegap.sh 0xffffffff gapdummy.o
 
 vers.o: ${SYSTEM_DEP:Ngap.o} ${SYSTEM_SWAP_DEP}
 	sh $S/conf/newvers.sh