summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaddy <naddy@openbsd.org>2020-10-19 17:57:40 +0000
committernaddy <naddy@openbsd.org>2020-10-19 17:57:40 +0000
commit5bbf88322ed6a7a68da69a643f5f3b793160f0cd (patch)
tree7d82d88571db666dec26e8992d2666b43fde160a
parentHandle NO_PROPOSAL_CHOSEN as IKE_AUTH initiator. (diff)
downloadwireguard-openbsd-5bbf88322ed6a7a68da69a643f5f3b793160f0cd.tar.xz
wireguard-openbsd-5bbf88322ed6a7a68da69a643f5f3b793160f0cd.zip
replace ad-hoc illegal instruction with the architecturally defined one
("permanently undefined") ok deraadt@ kettenis@
-rw-r--r--lib/csu/aarch64/md_init.h4
-rw-r--r--lib/csu/arm/md_init.h4
-rw-r--r--lib/libc/arch/aarch64/sys/tfork_thread.S4
-rw-r--r--lib/libc/arch/arm/sys/tfork_thread.S4
-rw-r--r--sys/arch/arm/arm/sigcode.S4
-rw-r--r--sys/arch/arm64/arm64/locore.S4
6 files changed, 12 insertions, 12 deletions
diff --git a/lib/csu/aarch64/md_init.h b/lib/csu/aarch64/md_init.h
index de8b2512c0c..c8420cabeb8 100644
--- a/lib/csu/aarch64/md_init.h
+++ b/lib/csu/aarch64/md_init.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: md_init.h,v 1.9 2020/10/15 16:30:21 deraadt Exp $ */
+/* $OpenBSD: md_init.h,v 1.10 2020/10/19 17:57:40 naddy Exp $ */
/*-
* Copyright (c) 2001 Ross Harvey
@@ -115,5 +115,5 @@
" svc #0 \n" \
" dsb nsh \n" \
" isb \n" \
- " .word 0xa000f7f0 /* illegal */ \n" \
+ " udf #0 \n" \
".previous");
diff --git a/lib/csu/arm/md_init.h b/lib/csu/arm/md_init.h
index d80c0cccbb5..3a9b581b6dc 100644
--- a/lib/csu/arm/md_init.h
+++ b/lib/csu/arm/md_init.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: md_init.h,v 1.16 2020/10/15 16:30:23 deraadt Exp $ */
+/* $OpenBSD: md_init.h,v 1.17 2020/10/19 17:57:40 naddy Exp $ */
/*-
* Copyright (c) 2001 Ross Harvey
@@ -159,5 +159,5 @@
" swi #0 \n" \
" dsb nsh \n" \
" isb \n" \
- " .word 0xa000f7f0 /* illegal */ \n" \
+ " udf #0 \n" \
".previous");
diff --git a/lib/libc/arch/aarch64/sys/tfork_thread.S b/lib/libc/arch/aarch64/sys/tfork_thread.S
index 18cb9fa474e..20e87b1c12a 100644
--- a/lib/libc/arch/aarch64/sys/tfork_thread.S
+++ b/lib/libc/arch/aarch64/sys/tfork_thread.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: tfork_thread.S,v 1.5 2020/10/18 14:28:16 deraadt Exp $ */
+/* $OpenBSD: tfork_thread.S,v 1.6 2020/10/19 17:57:40 naddy Exp $ */
/*
* Copyright (c) 2005 Dale Rahn <drahn@openbsd.org>
*
@@ -43,6 +43,6 @@ ENTRY(__tfork_thread)
mov x0, x3
blr x2
SYSTRAP(__threxit)
- .word 0xa000f7f0 /* illegal on all cpus? */
+ udf #0
.cfi_endproc
END(__tfork_thread)
diff --git a/lib/libc/arch/arm/sys/tfork_thread.S b/lib/libc/arch/arm/sys/tfork_thread.S
index b5714d7ac53..d772458abc9 100644
--- a/lib/libc/arch/arm/sys/tfork_thread.S
+++ b/lib/libc/arch/arm/sys/tfork_thread.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: tfork_thread.S,v 1.5 2020/10/18 14:28:17 deraadt Exp $ */
+/* $OpenBSD: tfork_thread.S,v 1.6 2020/10/19 17:57:40 naddy Exp $ */
/*
* Copyright (c) 2005 Dale Rahn <drahn@openbsd.org>
*
@@ -37,5 +37,5 @@ ENTRY(__tfork_thread)
mov pc, r2
nop
SYSTRAP(__threxit)
- .word 0xa000f7f0 /* illegal on all cpus? */
+ udf #0
END(__tfork_thread)
diff --git a/sys/arch/arm/arm/sigcode.S b/sys/arch/arm/arm/sigcode.S
index 9637bbef6db..ee53fcfe09d 100644
--- a/sys/arch/arm/arm/sigcode.S
+++ b/sys/arch/arm/arm/sigcode.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: sigcode.S,v 1.9 2020/03/13 08:46:50 deraadt Exp $ */
+/* $OpenBSD: sigcode.S,v 1.10 2020/10/19 17:57:40 naddy Exp $ */
/* $NetBSD: sigcode.S,v 1.6 2003/10/05 19:44:58 matt Exp $ */
/*
@@ -72,7 +72,7 @@ _C_LABEL(esigcode):
.globl sigfill
sigfill:
- .word 0xa000f7f0 /* illegal on all cpus? */
+ udf #0
esigfill:
.data
diff --git a/sys/arch/arm64/arm64/locore.S b/sys/arch/arm64/arm64/locore.S
index 6de148c1f5e..cfd87085bf9 100644
--- a/sys/arch/arm64/arm64/locore.S
+++ b/sys/arch/arm64/arm64/locore.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore.S,v 1.31 2020/03/13 00:14:38 kettenis Exp $ */
+/* $OpenBSD: locore.S,v 1.32 2020/10/19 17:57:40 naddy Exp $ */
/*-
* Copyright (c) 2012-2014 Andrew Turner
* All rights reserved.
@@ -366,7 +366,7 @@ _C_LABEL(esigcode):
.globl sigfill
sigfill:
- .word 0xa000f7f0 /* FIXME: illegal on all cpus? */
+ udf #0
esigfill:
.data