From 83ffe9db490cb9c94b6cf794f1731217a0062192 Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Sat, 20 Jan 2018 23:57:44 +0000
Subject: [PATCH] use virt instructions with clang instead of equivalent raw
 bytes

---
 sys/arch/armv7/armv7/locore0.S | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sys/arch/armv7/armv7/locore0.S b/sys/arch/armv7/armv7/locore0.S
index b683e00027f..62bbcb1bc39 100644
--- a/sys/arch/armv7/armv7/locore0.S
+++ b/sys/arch/armv7/armv7/locore0.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore0.S,v 1.3 2017/07/25 19:37:27 kettenis Exp $	*/
+/*	$OpenBSD: locore0.S,v 1.4 2018/01/20 23:57:44 jsg Exp $	*/
 /*	$NetBSD: lubbock_start.S,v 1.1 2003/06/18 10:51:15 bsh Exp $ */
 
 /*
@@ -38,8 +38,14 @@
 #undef	DOMAIN_CLIENT	/* XXX */
 #include "assym.h"
 
+#ifdef __clang__
+.arch_extension virt
+#define ELR	msr	ELR_hyp, lr
+#define ERET	eret
+#else
 #define ELR	.long	0xe12ef30e		@ msr	ELR_hyp, lr
 #define ERET	.long	0xe160006e		@ eret
+#endif
 
 /*
  * Kernel start routine for OMAP
-- 
2.20.1