From 8b469195de79780015a1f46ea59f1bda33e2aae3 Mon Sep 17 00:00:00 2001
From: Joel Dice <joel.dice@gmail.com>
Date: Sun, 6 Nov 2016 19:16:11 -0700
Subject: [PATCH] add missing Unsafe calls for recent JDK 7 updates

---
 makefile                  |  3 ++-
 src/classpath-openjdk.cpp | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/makefile b/makefile
index 0e77ff2d0b..da193feab0 100755
--- a/makefile
+++ b/makefile
@@ -1588,6 +1588,7 @@ endif
 
 ifeq (7,$(java-version))
 	test-sources := $(subst $(test)/InvokeDynamic.java,,$(test-sources))
+	test-sources := $(subst $(test)/Interfaces.java,,$(test-sources))
 endif
 
 test-cpp-sources = $(wildcard $(test)/*.cpp)
@@ -2330,7 +2331,7 @@ ifeq ($(platform),windows)
 	echo 'static int getAddrsFromAdapter(IP_ADAPTER_ADDRESSES *ptr, netaddr **netaddrPP);' >> $(build)/openjdk/NetworkInterface.h
 endif
 
-ifeq ($(kernel),darwin)	
+ifeq ($(kernel),darwin)
 	mkdir -p $(build)/openjdk/netinet
 	for file in \
 		$(header-sysroot)/usr/include/netinet/ip.h \
diff --git a/src/classpath-openjdk.cpp b/src/classpath-openjdk.cpp
index bbfc94a6e8..08fe2e1e59 100644
--- a/src/classpath-openjdk.cpp
+++ b/src/classpath-openjdk.cpp
@@ -3134,6 +3134,18 @@ extern "C" AVIAN_EXPORT void JNICALL
   release(t, reinterpret_cast<object>(arguments[1]));
 }
 
+extern "C" AVIAN_EXPORT jboolean JNICALL
+    Avian_sun_misc_Unsafe_isBigEndian0(Thread*, object, uintptr_t*)
+{
+  return false;
+}
+
+extern "C" AVIAN_EXPORT jboolean JNICALL
+    Avian_sun_misc_Unsafe_unalignedAccess0(Thread*, object, uintptr_t*)
+{
+  return false;
+}
+
 namespace {
 
 namespace local {