From bca79675ee0d9017d78768fbf5e69bca621f7e47 Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Wed, 23 Mar 2016 11:53:54 -0700
Subject: [PATCH] [master] fix x64 NOP, silence set but not used warning

---
 lib/isc/rwlock.c     | 2 +-
 win32utils/Configure | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/isc/rwlock.c b/lib/isc/rwlock.c
index 6e290088654..2bb605317d6 100644
--- a/lib/isc/rwlock.c
+++ b/lib/isc/rwlock.c
@@ -659,7 +659,7 @@ isc_rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type) {
 
 	rwl->spins += (cnt - rwl->spins) / 8;
 
-	return (ISC_R_SUCCESS);
+	return (result);
 }
 
 isc_result_t
diff --git a/win32utils/Configure b/win32utils/Configure
index 36766c911a1..4fb2ae07ead 100644
--- a/win32utils/Configure
+++ b/win32utils/Configure
@@ -700,8 +700,7 @@ if (($want_win32 eq "yes") && ($want_x64 eq "yes")) {
     $configvar{"BUILD_PLATFORM"} = "x64";
     $configvar{"MACHINE"} = "/machine:X64";
     $configvar{"BUILD_MACHINE"} = "/machine:X64";
-    # inline assembly not supported in x64 builds
-    #$configdefp{"ISC_PLATFORM_BUSYWAITNOP"} = "__asm { rep nop }";
+    $configdefp{"ISC_PLATFORM_BUSYWAITNOP"} = "_mm_pause()";
 }
 
 # get the version information
-- 
2.47.3