From 45beda6228c27ecaf7798fed8bad8a041faa428c Mon Sep 17 00:00:00 2001 From: OpenJDK Team Date: Sat, 12 Nov 2016 10:36:19 +0000 Subject: [PATCH] it-jamvm-8158260-unsafe-methods Gbp-Pq: Name it-jamvm-8158260-unsafe-methods.patch --- Makefile.am | 3 ++- patches/jamvm/8158260-fix.patch | 36 +++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 patches/jamvm/8158260-fix.patch diff --git a/Makefile.am b/Makefile.am index 94912c8..a90c3fe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -404,7 +404,8 @@ endif if BUILD_JAMVM ICEDTEA_PATCHES += \ patches/jamvm/noexecstack.patch \ - patches/jamvm/pr2665.patch + patches/jamvm/pr2665.patch \ + patches/jamvm/8158260-fix.patch endif if ENABLE_NSS diff --git a/patches/jamvm/8158260-fix.patch b/patches/jamvm/8158260-fix.patch new file mode 100644 index 0000000..8577596 --- /dev/null +++ b/patches/jamvm/8158260-fix.patch @@ -0,0 +1,36 @@ +--- jamvm.orig/jamvm/src/classlib/openjdk/natives.c 2014-03-24 21:34:58.000000000 -0300 ++++ jamvm/jamvm/src/classlib/openjdk/natives.c 2016-08-09 19:26:36.205775539 -0300 +@@ -34,6 +33,7 @@ + #include "reflect.h" + #include "natives.h" + #include "openjdk.h" ++#include "properties.h" + #include "trace.h" + + int classlibInitialiseNatives() { +@@ -470,6 +465,16 @@ + return ostack; + } + ++uintptr_t *isBigEndian0(Class *clazz, MethodBlock *mb, uintptr_t *ostack) { ++ *ostack++ = IS_BIG_ENDIAN; ++ return ostack; ++} ++ ++uintptr_t *unalignedAccess0(Class *clazz, MethodBlock *mb, uintptr_t *ostack) { ++ *ostack++ = FALSE; ++ return ostack; ++} ++ + VMMethod sun_misc_unsafe[] = { + {"registerNatives", "()V", unsafeRegisterNatives}, + {"objectFieldOffset", "(Ljava/lang/reflect/Field;)J", +@@ -569,6 +574,8 @@ + {"fullFence", "()V", fullFence}, + {"loadFence", "()V", loadFence}, + {"storeFence", "()V", storeFence}, ++ {"isBigEndian0", "()Z", isBigEndian0}, ++ {"unalignedAccess0", "()Z", unalignedAccess0}, + {NULL, NULL, NULL} + }; + -- 2.30.2