. Update to 8u172.
This commit is contained in:
Greg Lewis
@@ -2,7 +2,6 @@
|
||||
|
||||
PORTNAME= openjdk
|
||||
PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= java devel
|
||||
MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \
|
||||
https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \
|
||||
@@ -32,7 +31,8 @@ PATCHFILES= patch-8u05-b13.xz \
|
||||
patch-8u131-b11.xz \
|
||||
patch-8u144-b01.xz \
|
||||
patch-8u152-b16.xz \
|
||||
patch-8u162-b12.xz
|
||||
patch-8u162-b12.xz \
|
||||
patch-8u172-b11.xz
|
||||
|
||||
MAINTAINER= java@FreeBSD.org
|
||||
COMMENT?= Java Development Kit ${JDK_MAJOR_VERSION}
|
||||
@@ -205,8 +205,8 @@ NO_CCACHE= yes
|
||||
NOPRECIOUSMAKEVARS= yes
|
||||
|
||||
JDK_MAJOR_VERSION= 8
|
||||
JDK_UPDATE_VERSION= 162
|
||||
JDK_BUILD_NUMBER= 12
|
||||
JDK_UPDATE_VERSION= 172
|
||||
JDK_BUILD_NUMBER= 11
|
||||
DIST_BUILD_NUMBER= 132
|
||||
JTREG_VERSION= 4.1
|
||||
JTREG_BUILD_NUMBER= b08
|
||||
|
||||
@@ -45,3 +45,5 @@ SHA256 (patch-8u152-b16.xz) = 51c57b8d60b8f71758fe03c45c70ab60d0423bf4699e71b21b
|
||||
SIZE (patch-8u152-b16.xz) = 454236
|
||||
SHA256 (patch-8u162-b12.xz) = 9f083cde406ead14e38f5423a6dcc0f0b0a3f7ef69fdc4c83a32b8fea4c3ddcb
|
||||
SIZE (patch-8u162-b12.xz) = 337248
|
||||
SHA256 (patch-8u172-b11.xz) = e338a1dc63cc08f9227d685e350e60609e43612f18773213b882d78c7c559934
|
||||
SIZE (patch-8u172-b11.xz) = 146716
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,50 +0,0 @@
|
||||
--- hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp.orig
|
||||
+++ hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
|
||||
@@ -2569,13 +2569,35 @@ run:
|
||||
|
||||
// this could definitely be cleaned up QQQ
|
||||
Method* callee;
|
||||
- Klass* iclass = cache->f1_as_klass();
|
||||
- // InstanceKlass* interface = (InstanceKlass*) iclass;
|
||||
+ Method *interface_method = cache->f2_as_interface_method();
|
||||
+ InstanceKlass* iclass = interface_method->method_holder();
|
||||
+
|
||||
// get receiver
|
||||
int parms = cache->parameter_size();
|
||||
oop rcvr = STACK_OBJECT(-parms);
|
||||
CHECK_NULL(rcvr);
|
||||
InstanceKlass* int2 = (InstanceKlass*) rcvr->klass();
|
||||
+
|
||||
+ // Receiver subtype check against resolved interface klass (REFC).
|
||||
+ {
|
||||
+ Klass* refc = cache->f1_as_klass();
|
||||
+ itableOffsetEntry* scan;
|
||||
+ for (scan = (itableOffsetEntry*) int2->start_of_itable();
|
||||
+ scan->interface_klass() != NULL;
|
||||
+ scan++) {
|
||||
+ if (scan->interface_klass() == refc) {
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+ // Check that the entry is non-null. A null entry means
|
||||
+ // that the receiver class doesn't implement the
|
||||
+ // interface, and wasn't the same as when the caller was
|
||||
+ // compiled.
|
||||
+ if (scan->interface_klass() == NULL) {
|
||||
+ VM_JAVA_ERROR(vmSymbols::java_lang_IncompatibleClassChangeError(), "", note_no_trap);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
itableOffsetEntry* ki = (itableOffsetEntry*) int2->start_of_itable();
|
||||
int i;
|
||||
for ( i = 0 ; i < int2->itable_length() ; i++, ki++ ) {
|
||||
@@ -2587,7 +2609,8 @@ run:
|
||||
if (i == int2->itable_length()) {
|
||||
VM_JAVA_ERROR(vmSymbols::java_lang_IncompatibleClassChangeError(), "", note_no_trap);
|
||||
}
|
||||
- int mindex = cache->f2_as_index();
|
||||
+ int mindex = interface_method->itable_index();
|
||||
+
|
||||
itableMethodEntry* im = ki->first_method_entry(rcvr->klass());
|
||||
callee = im[mindex].method();
|
||||
if (callee == NULL) {
|
||||
@@ -1,17 +1,15 @@
|
||||
--- jdk/make/lib/ServiceabilityLibraries.gmk.orig 2015-07-18 14:43:00.000000000 -0700
|
||||
+++ jdk/make/lib/ServiceabilityLibraries.gmk 2015-07-18 14:44:25.000000000 -0700
|
||||
@@ -247,15 +247,17 @@
|
||||
--- jdk/make/lib/ServiceabilityLibraries.gmk.orig 2018-05-20 12:20:24.536007000 -0700
|
||||
+++ jdk/make/lib/ServiceabilityLibraries.gmk 2018-05-20 12:22:29.309856000 -0700
|
||||
@@ -247,7 +247,7 @@
|
||||
endif
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS), bsd)
|
||||
- LIBINSTRUMENT_LDFLAGS_SUFFIX += -L$(PACKAGE_PATH)/lib -liconv $(LIBZ)
|
||||
+ LIBINSTRUMENT_LDFLAGS_SUFFIX += %%ICONV_LDFLAGS%% $(LIBZ)
|
||||
ifeq ($(BSD_STATIC_LIBJLI), bsd)
|
||||
LIBINSTRUMENT_LDFLAGS += -Xlinker --whole-archive $(JDK_OUTPUTDIR)/objs/libjli_static.a \
|
||||
- -Xlinker --no-whole-archive
|
||||
+ -Xlinker --no-whole-archive
|
||||
else
|
||||
LIBINSTRUMENT_LDFLAGS += $(call SET_SHARED_LIBRARY_ORIGIN,/jli)
|
||||
+ LIBINSTRUMENT_LDFLAGS_SUFFIX += -L$(INSTALL_LIBRARIES_HERE)/jli -ljli
|
||||
-Xlinker --no-whole-archive
|
||||
@@ -257,7 +257,7 @@
|
||||
endif
|
||||
BSD_ICONV_CFLAGS:= -I$(PACKAGE_PATH)/include
|
||||
ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd)
|
||||
@@ -20,11 +18,3 @@
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -283,7 +284,6 @@
|
||||
LDFLAGS_SUFFIX_solaris := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL) -lc, \
|
||||
LDFLAGS_SUFFIX_linux := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL), \
|
||||
LDFLAGS_SUFFIX_aix := $(LIBZ) -L$(JDK_OUTPUTDIR)/objs -ljli_static $(LIBDL),\
|
||||
- LDFLAGS_SUFFIX_bsd := -L$(PACKAGE_PATH)/lib -liconv $(LIBZ), \
|
||||
VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
|
||||
RC_FLAGS := $(RC_FLAGS) \
|
||||
-D "JDK_FNAME=instrument.dll" \
|
||||
|
||||
Reference in New Issue
Block a user