From ac55b5446c2bea146f5bff5f06f637ed6af2620d Mon Sep 17 00:00:00 2001
From: Adam Steen <adam@adamsteen.com.au>
Date: Mon, 5 Apr 2021 12:05:30 +0800
Subject: [PATCH] Clean Up OpenBSD a bit, 6.7 no longer supported, all support
 releases use ld.lld

---
 configure.sh     | 6 ------
 tests/tests.bats | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/configure.sh b/configure.sh
index f4f970e3..14bf5b0e 100755
--- a/configure.sh
+++ b/configure.sh
@@ -223,12 +223,6 @@ config_host_openbsd()
     cc_is_clang || die "Only 'clang' is supported on OpenBSD"
     [ "${CONFIG_ARCH}" = "x86_64" ] ||
         die "Only 'x86_64' is supported on OpenBSD"
-    if ! ld_is_lld; then
-        LD='/usr/bin/ld.lld'
-        warn "Using GNU 'ld' is not supported on OpenBSD"
-        warn "Falling back to 'ld.lld'"
-        [ -e ${LD} ] || die "/usr/bin/ld.lld does not exist"
-    fi
 
     # On OpenBSD/clang we use -nostdlibinc which gives us access to the
     # clang-provided headers for compiler instrinsics. We copy the rest
diff --git a/tests/tests.bats b/tests/tests.bats
index d2defac2..31781fb5 100644
--- a/tests/tests.bats
+++ b/tests/tests.bats
@@ -319,7 +319,7 @@ xen_expect_abort() {
 }
 
 @test "xnow hvt" {
-  skip_unless_host_is Linux OpenBSD_6.7
+  skip_unless_host_is Linux OpenBSD
 
   hvt_run test_xnow/test_xnow.hvt
   [ "$status" -eq 1 ] && [[ "$output" == *"host/guest translation fault"* ]]
@@ -336,7 +336,7 @@ xen_expect_abort() {
 }
 
 @test "wnox hvt" {
-  skip_unless_host_is OpenBSD_6.7
+  skip_unless_host_is OpenBSD
 
   hvt_run test_wnox/test_wnox.hvt
   [ "$status" -eq 1 ] && [[ "$output" == *"host/guest translation fault"* ]]