Skip to content

Commit 01e11d8

Browse files
authored
Merge pull request #510 from dicej/master
add missing Unsafe calls for recent JDK 7 updates
2 parents e55c8eb + 8b46919 commit 01e11d8

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1588,6 +1588,7 @@ endif
15881588

15891589
ifeq (7,$(java-version))
15901590
test-sources := $(subst $(test)/InvokeDynamic.java,,$(test-sources))
1591+
test-sources := $(subst $(test)/Interfaces.java,,$(test-sources))
15911592
endif
15921593

15931594
test-cpp-sources = $(wildcard $(test)/*.cpp)
@@ -2330,7 +2331,7 @@ ifeq ($(platform),windows)
23302331
echo 'static int getAddrsFromAdapter(IP_ADAPTER_ADDRESSES *ptr, netaddr **netaddrPP);' >> $(build)/openjdk/NetworkInterface.h
23312332
endif
23322333

2333-
ifeq ($(kernel),darwin)
2334+
ifeq ($(kernel),darwin)
23342335
mkdir -p $(build)/openjdk/netinet
23352336
for file in \
23362337
$(header-sysroot)/usr/include/netinet/ip.h \

src/classpath-openjdk.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3134,6 +3134,18 @@ extern "C" AVIAN_EXPORT void JNICALL
31343134
release(t, reinterpret_cast<object>(arguments[1]));
31353135
}
31363136

3137+
extern "C" AVIAN_EXPORT jboolean JNICALL
3138+
Avian_sun_misc_Unsafe_isBigEndian0(Thread*, object, uintptr_t*)
3139+
{
3140+
return false;
3141+
}
3142+
3143+
extern "C" AVIAN_EXPORT jboolean JNICALL
3144+
Avian_sun_misc_Unsafe_unalignedAccess0(Thread*, object, uintptr_t*)
3145+
{
3146+
return false;
3147+
}
3148+
31373149
namespace {
31383150

31393151
namespace local {

0 commit comments

Comments
 (0)