Mercurial > hg > icedtea8
changeset 2930:662064459ec9
Bump aarch32 to jdk8u232-ga-aarch32-191016.
2019-11-10 Andrew John Hughes <gnu_andrew@member.fsf.org>
Bump aarch32 to jdk8u232-ga-aarch32-191016.
* patches/hotspot/aarch32/8038392-rh1064383.patch,
* patches/hotspot/aarch32/8141570-pr3548.patch,
* patches/hotspot/aarch32/8187667-pr3517-readdir_r.patch,
* patches/hotspot/aarch32/8196978-pr3517-gcc_4_pragmas.patch,
* patches/hotspot/aarch32/8223511.patch:
Remove patches now included upstream.
* Makefile.am:
(ICEDTEA_PATCHES): Remove above patches.
* NEWS: Updated.
* hotspot.map.in: Bump aarch32 to jdk8u232-ga-aarch32-191016.
* patches/hotspot/aarch32/6424123-pr3696.patch,
* patches/hotspot/aarch32/8143245-pr3548.patch,
* patches/hotspot/aarch32/pr1368.patch:
Replace with symlinks to Shenandoah versions now
both are again based on the same upstream 8u version.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Mon, 11 Nov 2019 17:08:16 +0000 |
| parents | 3437f0481b40 |
| children | e53426cefce0 |
| files | ChangeLog Makefile.am NEWS hotspot.map.in patches/hotspot/aarch32/6424123-pr3696.patch patches/hotspot/aarch32/8038392-rh1064383.patch patches/hotspot/aarch32/8141570-pr3548.patch patches/hotspot/aarch32/8143245-pr3548.patch patches/hotspot/aarch32/8187667-pr3517-readdir_r.patch patches/hotspot/aarch32/8196978-pr3517-gcc_4_pragmas.patch patches/hotspot/aarch32/8223511.patch patches/hotspot/aarch32/pr1368.patch |
| diffstat | 12 files changed, 44 insertions(+), 1371 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Nov 08 18:32:17 2019 +0000 +++ b/ChangeLog Mon Nov 11 17:08:16 2019 +0000 @@ -1,3 +1,22 @@ +2019-11-10 Andrew John Hughes <gnu_andrew@member.fsf.org> + + Bump aarch32 to jdk8u232-ga-aarch32-191016. + * patches/hotspot/aarch32/8038392-rh1064383.patch, + * patches/hotspot/aarch32/8141570-pr3548.patch, + * patches/hotspot/aarch32/8187667-pr3517-readdir_r.patch, + * patches/hotspot/aarch32/8196978-pr3517-gcc_4_pragmas.patch, + * patches/hotspot/aarch32/8223511.patch: + Remove patches now included upstream. + * Makefile.am: + (ICEDTEA_PATCHES): Remove above patches. + * NEWS: Updated. + * hotspot.map.in: Bump aarch32 to jdk8u232-ga-aarch32-191016. + * patches/hotspot/aarch32/6424123-pr3696.patch, + * patches/hotspot/aarch32/8143245-pr3548.patch, + * patches/hotspot/aarch32/pr1368.patch: + Replace with symlinks to Shenandoah versions now + both are again based on the same upstream 8u version. + 2019-11-08 Andrew John Hughes <gnu_andrew@member.fsf.org> Bump to icedtea-3.14.0.
--- a/Makefile.am Fri Nov 08 18:32:17 2019 +0000 +++ b/Makefile.am Mon Nov 11 17:08:16 2019 +0000 @@ -350,12 +350,7 @@ if WITH_AARCH32_HSBUILD ICEDTEA_PATCHES += \ patches/hotspot/$(HSBUILD)/pr3548-aarch32.patch \ - patches/hotspot/$(HSBUILD)/8078628-pr3208.patch \ - patches/hotspot/$(HSBUILD)/8187667-pr3517-readdir_r.patch \ - patches/hotspot/$(HSBUILD)/8196978-pr3517-gcc_4_pragmas.patch \ - patches/hotspot/$(HSBUILD)/8223511.patch \ - patches/hotspot/$(HSBUILD)/8038392-rh1064383.patch \ - patches/hotspot/$(HSBUILD)/8141570-pr3548.patch + patches/hotspot/$(HSBUILD)/8078628-pr3208.patch endif ICEDTEA_PATCHES += \
--- a/NEWS Fri Nov 08 18:32:17 2019 +0000 +++ b/NEWS Mon Nov 11 17:08:16 2019 +0000 @@ -159,6 +159,26 @@ - S8229124, PR3762: Revert disassembler.cpp changes - S8229145, PR3762: Revert TemplateTable::bytecode() visibility change - PR3762: profile_has_unique_klass gives wrong result +* AArch32 port + - [aarch32] Fix debug build failure introduced at feec5f4cea8b + - c1: misc bugfixes + - [c1] [Spec98] _228_jack crash + - CCC: align doubles on stack + - CritcalJNI support + - Fix ARMv6 target causes some asserts to fail + - Fix ccc: float args should go to stack after first double allocated there + - Fix for jtreg TestArrayCopy6769124 -Xcomp + - Fix for single-core config crash + - Fix JVMTI PopFrame: should skip runtime call if next bytecode is not invokestatic + - Fix native_wrapper faste unlock register used for temp, avoid clobbering lock_obj register + - Fix operand value corruption in arraycopy + - Fix SIGSEGV in System.arraycopy + - Fix wrong fault_pc in safefetch stubs + - Follow-up the fix for 8161598 + - JTReg test compiler/uncommontrap/TestDeoptOOM.java causes JVM assert + - Raw long address should be converted to sizeof(ptr) one when it is required + - S8207838: AArch32: Float registers incorrectly restored in JNI call + - save_args/restore_args misses second part of VMRegPair New in release 3.13.0 (2019-07-18):
--- a/hotspot.map.in Fri Nov 08 18:32:17 2019 +0000 +++ b/hotspot.map.in Mon Nov 11 17:08:16 2019 +0000 @@ -1,4 +1,4 @@ # version type(drop/hg) url changeset sha256sum default drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 4ccc1ae03940 adc660a9ad3853325d3bec8fb0d9e533a37058d051a069c4421620e75f23b908 shenandoah drop https://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 9e52f8d3b511 90f4871a86424df7ce47c1f603df8102207be0ae452b98c6b53c17ded45afcd6 -aarch32 drop https://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 26d64a5c4b9a 68816570a5953d9b04f9b8b15f53f47f2ef4ea76bc16f9935bd94cebc07679c8 +aarch32 drop https://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 0d7b61c79fee 93c26a3aa43044ab093ad702c44664708a8410ff4b597a700a437c4ecb4c9201
--- a/patches/hotspot/aarch32/6424123-pr3696.patch Fri Nov 08 18:32:17 2019 +0000 +++ b/patches/hotspot/aarch32/6424123-pr3696.patch Mon Nov 11 17:08:16 2019 +0000 @@ -1,446 +1,1 @@ -# HG changeset patch -# User zgu -# Date 1549941040 0 -# Tue Feb 12 03:10:40 2019 +0000 -# Node ID cfb34db6589e222d34e5b736b99ed4f69c261c4f -# Parent f8beb13aec9f8c291282ee8ec4473c8627aa7e07 -6424123, PR3696: JVM crashes on failed 'strdup' call -Summary: Calling os::malloc()/os::strdup() and new os::strdup_check_oom() instead of ::malloc()/::strdup() for native memory tracking purpose -Reviewed-by: coleenp, ctornqvi, kvn - -diff -Nru openjdk.orig/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp ---- openjdk.orig/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp 2019-05-24 18:37:52.434845994 +0100 -+++ openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp 2019-05-24 18:40:20.600564335 +0100 -@@ -29,6 +29,7 @@ - #include "compiler/disassembler.hpp" - #include "memory/resourceArea.hpp" - #include "runtime/java.hpp" -+#include "runtime/os.hpp" - #include "runtime/stubCodeGenerator.hpp" - #include "utilities/defaultStream.hpp" - #include "vm_version_ppc.hpp" -@@ -127,7 +128,7 @@ - (has_vsx() ? " vsx" : "") - // Make sure number of %s matches num_features! - ); -- _features_str = strdup(buf); -+ _features_str = os::strdup(buf); - if (Verbose) { - print_features(); - } -diff -Nru openjdk.orig/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp openjdk/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp ---- openjdk.orig/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp 2019-05-24 18:37:52.434845994 +0100 -+++ openjdk/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp 2019-05-24 18:40:00.480874165 +0100 -@@ -26,6 +26,7 @@ - #include "asm/macroAssembler.inline.hpp" - #include "memory/resourceArea.hpp" - #include "runtime/java.hpp" -+#include "runtime/os.hpp" - #include "runtime/stubCodeGenerator.hpp" - #include "vm_version_sparc.hpp" - #ifdef TARGET_OS_FAMILY_linux -@@ -270,7 +271,7 @@ - (!has_hardware_fsmuld() ? ", no-fsmuld" : "")); - - // buf is started with ", " or is empty -- _features_str = strdup(strlen(buf) > 2 ? buf + 2 : buf); -+ _features_str = os::strdup(strlen(buf) > 2 ? buf + 2 : buf); - - // UseVIS is set to the smallest of what hardware supports and what - // the command line requires. I.e., you cannot set UseVIS to 3 on -@@ -485,7 +486,7 @@ - int VM_Version::parse_features(const char* implementation) { - int features = unknown_m; - // Convert to UPPER case before compare. -- char* impl = os::strdup(implementation); -+ char* impl = os::strdup_check_oom(implementation); - - for (int i = 0; impl[i] != 0; i++) - impl[i] = (char)toupper((uint)impl[i]); -diff -Nru openjdk.orig/hotspot/src/cpu/x86/vm/vm_version_x86.cpp openjdk/hotspot/src/cpu/x86/vm/vm_version_x86.cpp ---- openjdk.orig/hotspot/src/cpu/x86/vm/vm_version_x86.cpp 2019-05-24 18:37:52.438845932 +0100 -+++ openjdk/hotspot/src/cpu/x86/vm/vm_version_x86.cpp 2019-05-24 18:40:00.484874104 +0100 -@@ -27,6 +27,7 @@ - #include "asm/macroAssembler.inline.hpp" - #include "memory/resourceArea.hpp" - #include "runtime/java.hpp" -+#include "runtime/os.hpp" - #include "runtime/stubCodeGenerator.hpp" - #include "vm_version_x86.hpp" - #ifdef TARGET_OS_FAMILY_linux -@@ -527,7 +528,7 @@ - (supports_bmi1() ? ", bmi1" : ""), - (supports_bmi2() ? ", bmi2" : ""), - (supports_adx() ? ", adx" : "")); -- _features_str = strdup(buf); -+ _features_str = os::strdup(buf); - - // UseSSE is set to the smaller of what hardware supports and what - // the command line requires. I.e., you cannot set UseSSE to 2 on -diff -Nru openjdk.orig/hotspot/src/os/aix/vm/os_aix.cpp openjdk/hotspot/src/os/aix/vm/os_aix.cpp ---- openjdk.orig/hotspot/src/os/aix/vm/os_aix.cpp 2019-05-02 01:23:49.000000000 +0100 -+++ openjdk/hotspot/src/os/aix/vm/os_aix.cpp 2019-05-24 18:40:00.484874104 +0100 -@@ -56,6 +56,7 @@ - #include "runtime/mutexLocker.hpp" - #include "runtime/objectMonitor.hpp" - #include "runtime/orderAccess.inline.hpp" -+#include "runtime/os.hpp" - #include "runtime/osThread.hpp" - #include "runtime/perfMemory.hpp" - #include "runtime/sharedRuntime.hpp" -@@ -389,10 +390,10 @@ - // default should be 4K. - size_t data_page_size = SIZE_4K; - { -- void* p = ::malloc(SIZE_16M); -+ void* p = os::malloc(SIZE_16M, mtInternal); - guarantee(p != NULL, "malloc failed"); - data_page_size = os::Aix::query_pagesize(p); -- ::free(p); -+ os::free(p); - } - - // query default shm page size (LDR_CNTRL SHMPSIZE) -diff -Nru openjdk.orig/hotspot/src/os/aix/vm/porting_aix.cpp openjdk/hotspot/src/os/aix/vm/porting_aix.cpp ---- openjdk.orig/hotspot/src/os/aix/vm/porting_aix.cpp 2019-05-02 01:23:49.000000000 +0100 -+++ openjdk/hotspot/src/os/aix/vm/porting_aix.cpp 2019-05-24 18:40:00.484874104 +0100 -@@ -23,6 +23,8 @@ - */ - - #include "asm/assembler.hpp" -+#include "memory/allocation.inline.hpp" -+#include "runtime/os.hpp" - #include "loadlib_aix.hpp" - #include "porting_aix.hpp" - #include "utilities/debug.hpp" -@@ -82,7 +84,7 @@ - while (n) { - node* p = n; - n = n->next; -- free(p->v); -+ os::free(p->v); - delete p; - } - } -@@ -94,7 +96,7 @@ - } - } - node* p = new node; -- p->v = strdup(s); -+ p->v = os::strdup_check_oom(s); - p->next = first; - first = p; - return p->v; -diff -Nru openjdk.orig/hotspot/src/os/windows/vm/perfMemory_windows.cpp openjdk/hotspot/src/os/windows/vm/perfMemory_windows.cpp ---- openjdk.orig/hotspot/src/os/windows/vm/perfMemory_windows.cpp 2019-05-02 01:23:49.000000000 +0100 -+++ openjdk/hotspot/src/os/windows/vm/perfMemory_windows.cpp 2019-05-24 18:40:00.484874104 +0100 -@@ -29,6 +29,7 @@ - #include "oops/oop.inline.hpp" - #include "os_windows.inline.hpp" - #include "runtime/handles.inline.hpp" -+#include "runtime/os.hpp" - #include "runtime/perfMemory.hpp" - #include "services/memTracker.hpp" - #include "utilities/exceptions.hpp" -@@ -1388,7 +1389,7 @@ - // the file has been successfully created and the file mapping - // object has been created. - sharedmem_fileHandle = fh; -- sharedmem_fileName = strdup(filename); -+ sharedmem_fileName = os::strdup(filename); - - return fmh; - } -diff -Nru openjdk.orig/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp openjdk/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp ---- openjdk.orig/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp 2019-05-02 01:23:49.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp 2019-05-24 18:40:00.484874104 +0100 -@@ -30,6 +30,7 @@ - #include "c1/c1_MacroAssembler.hpp" - #include "c1/c1_ValueStack.hpp" - #include "ci/ciInstance.hpp" -+#include "runtime/os.hpp" - #ifdef TARGET_ARCH_x86 - # include "nativeInst_x86.hpp" - # include "vmreg_x86.inline.hpp" -@@ -883,7 +884,7 @@ - stringStream st; - st.print("bad oop %s at %d", r->as_Register()->name(), _masm->offset()); - #ifdef SPARC -- _masm->_verify_oop(r->as_Register(), strdup(st.as_string()), __FILE__, __LINE__); -+ _masm->_verify_oop(r->as_Register(), os::strdup(st.as_string(), mtCompiler), __FILE__, __LINE__); - #else - _masm->verify_oop(r->as_Register()); - #endif -diff -Nru openjdk.orig/hotspot/src/share/vm/classfile/classLoader.cpp openjdk/hotspot/src/share/vm/classfile/classLoader.cpp ---- openjdk.orig/hotspot/src/share/vm/classfile/classLoader.cpp 2019-05-02 01:23:49.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/classLoader.cpp 2019-05-24 18:40:00.484874104 +0100 -@@ -324,7 +324,7 @@ - } - - LazyClassPathEntry::LazyClassPathEntry(const char* path, const struct stat* st, bool throw_exception) : ClassPathEntry() { -- _path = strdup(path); -+ _path = os::strdup_check_oom(path); - _st = *st; - _meta_index = NULL; - _resolved_entry = NULL; -@@ -332,6 +332,10 @@ - _throw_exception = throw_exception; - } - -+LazyClassPathEntry::~LazyClassPathEntry() { -+ os::free((void*) _path); -+} -+ - bool LazyClassPathEntry::is_jar_file() { - return ((_st.st_mode & S_IFREG) == S_IFREG); - } -@@ -538,7 +542,7 @@ - default: - { - if (!skipCurrentJar && cur_entry != NULL) { -- char* new_name = strdup(package_name); -+ char* new_name = os::strdup_check_oom(package_name); - boot_class_path_packages.append(new_name); - } - } -diff -Nru openjdk.orig/hotspot/src/share/vm/classfile/classLoader.hpp openjdk/hotspot/src/share/vm/classfile/classLoader.hpp ---- openjdk.orig/hotspot/src/share/vm/classfile/classLoader.hpp 2019-05-02 01:23:49.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/classLoader.hpp 2019-05-24 18:40:00.484874104 +0100 -@@ -134,6 +134,8 @@ - bool is_jar_file(); - const char* name() { return _path; } - LazyClassPathEntry(const char* path, const struct stat* st, bool throw_exception); -+ virtual ~LazyClassPathEntry(); -+ - u1* open_entry(const char* name, jint* filesize, bool nul_terminate, TRAPS); - ClassFileStream* open_stream(const char* name, TRAPS); - void set_meta_index(MetaIndex* meta_index) { _meta_index = meta_index; } -diff -Nru openjdk.orig/hotspot/src/share/vm/compiler/compilerOracle.cpp openjdk/hotspot/src/share/vm/compiler/compilerOracle.cpp ---- openjdk.orig/hotspot/src/share/vm/compiler/compilerOracle.cpp 2019-05-02 01:23:49.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/compiler/compilerOracle.cpp 2019-05-24 18:40:00.484874104 +0100 -@@ -33,6 +33,7 @@ - #include "oops/symbol.hpp" - #include "runtime/handles.inline.hpp" - #include "runtime/jniHandles.hpp" -+#include "runtime/os.hpp" - - class MethodMatcher : public CHeapObj<mtCompiler> { - public: -@@ -219,7 +220,7 @@ - const T value, MethodMatcher* next) : - MethodMatcher(class_name, class_mode, method_name, method_mode, signature, next), - _type(get_type_for<T>()), _value(copy_value<T>(value)) { -- _option = strdup(opt); -+ _option = os::strdup_check_oom(opt); - } - - ~TypedMethodOptionMatcher() { -diff -Nru openjdk.orig/hotspot/src/share/vm/opto/runtime.cpp openjdk/hotspot/src/share/vm/opto/runtime.cpp ---- openjdk.orig/hotspot/src/share/vm/opto/runtime.cpp 2019-05-02 01:23:49.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/runtime.cpp 2019-05-24 18:40:00.484874104 +0100 -@@ -1567,11 +1567,11 @@ - } - NamedCounter* c; - if (tag == NamedCounter::BiasedLockingCounter) { -- c = new BiasedLockingNamedCounter(strdup(st.as_string())); -+ c = new BiasedLockingNamedCounter(st.as_string()); - } else if (tag == NamedCounter::RTMLockingCounter) { -- c = new RTMLockingNamedCounter(strdup(st.as_string())); -+ c = new RTMLockingNamedCounter(st.as_string()); - } else { -- c = new NamedCounter(strdup(st.as_string()), tag); -+ c = new NamedCounter(st.as_string(), tag); - } - - // atomically add the new counter to the head of the list. We only -diff -Nru openjdk.orig/hotspot/src/share/vm/opto/runtime.hpp openjdk/hotspot/src/share/vm/opto/runtime.hpp ---- openjdk.orig/hotspot/src/share/vm/opto/runtime.hpp 2019-05-02 01:23:49.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/runtime.hpp 2019-05-24 18:40:00.484874104 +0100 -@@ -74,11 +74,17 @@ - - public: - NamedCounter(const char *n, CounterTag tag = NoTag): -- _name(n), -+ _name(n == NULL ? NULL : os::strdup(n)), - _count(0), - _next(NULL), - _tag(tag) {} - -+ ~NamedCounter() { -+ if (_name != NULL) { -+ os::free((void*)_name); -+ } -+ } -+ - const char * name() const { return _name; } - int count() const { return _count; } - address addr() { return (address)&_count; } -diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp openjdk/hotspot/src/share/vm/runtime/arguments.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp 2019-05-24 18:37:55.414800103 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2019-05-24 18:40:00.484874104 +0100 -@@ -805,7 +805,7 @@ - } else { - *bldarray = REALLOC_C_HEAP_ARRAY(char*, *bldarray, new_count, mtInternal); - } -- (*bldarray)[*count] = strdup(arg); -+ (*bldarray)[*count] = os::strdup_check_oom(arg); - *count = new_count; - } - -@@ -2256,7 +2256,7 @@ - } - - void Arguments::process_java_launcher_argument(const char* launcher, void* extra_info) { -- _sun_java_launcher = strdup(launcher); -+ _sun_java_launcher = os::strdup_check_oom(launcher); - if (strcmp("gamma", _sun_java_launcher) == 0) { - _created_by_gamma_launcher = true; - } -@@ -3416,7 +3416,7 @@ - // Redirect GC output to the file. -Xloggc:<filename> - // ostream_init_log(), when called will use this filename - // to initialize a fileStream. -- _gc_log_filename = strdup(tail); -+ _gc_log_filename = os::strdup_check_oom(tail); - if (!is_filename_valid(_gc_log_filename)) { - jio_fprintf(defaultStream::output_stream(), - "Invalid file name for use with -Xloggc: Filename can only contain the " -diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/fprofiler.cpp openjdk/hotspot/src/share/vm/runtime/fprofiler.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/fprofiler.cpp 2019-05-02 01:23:49.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/fprofiler.cpp 2019-05-24 18:40:00.484874104 +0100 -@@ -628,10 +628,16 @@ - } - - vmNode(const char* name, const TickPosition where) : ProfilerNode() { -- _name = name; -+ _name = os::strdup(name); - update(where); - } - -+ ~vmNode() { -+ if (_name != NULL) { -+ os::free((void*)_name); -+ } -+ } -+ - const char *name() const { return _name; } - bool is_compiled() const { return true; } - -@@ -783,7 +789,7 @@ - assert(index >= 0, "Must be positive"); - // Note that we call strdup below since the symbol may be resource allocated - if (!table[index]) { -- table[index] = new (this) vmNode(os::strdup(name), where); -+ table[index] = new (this) vmNode(name, where); - } else { - ProfilerNode* prev = table[index]; - for(ProfilerNode* node = prev; node; node = node->next()) { -@@ -793,7 +799,7 @@ - } - prev = node; - } -- prev->set_next(new (this) vmNode(os::strdup(name), where)); -+ prev->set_next(new (this) vmNode(name, where)); - } - } - -diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/os.cpp openjdk/hotspot/src/share/vm/runtime/os.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/os.cpp 2019-05-02 01:23:49.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/os.cpp 2019-05-24 18:40:00.484874104 +0100 -@@ -550,6 +550,14 @@ - } - - -+char* os::strdup_check_oom(const char* str, MEMFLAGS flags) { -+ char* p = os::strdup(str, flags); -+ if (p == NULL) { -+ vm_exit_out_of_memory(strlen(str) + 1, OOM_MALLOC_ERROR, "os::strdup_check_oom"); -+ } -+ return p; -+} -+ - - #define paranoid 0 /* only set to 1 if you suspect checking code has bug */ - -diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/os.hpp openjdk/hotspot/src/share/vm/runtime/os.hpp ---- openjdk.orig/hotspot/src/share/vm/runtime/os.hpp 2019-05-02 01:23:49.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/os.hpp 2019-05-24 18:40:00.484874104 +0100 -@@ -720,6 +720,8 @@ - static void free (void *memblock, MEMFLAGS flags = mtNone); - static bool check_heap(bool force = false); // verify C heap integrity - static char* strdup(const char *, MEMFLAGS flags = mtInternal); // Like strdup -+ // Like strdup, but exit VM when strdup() returns NULL -+ static char* strdup_check_oom(const char*, MEMFLAGS flags = mtInternal); - - #ifndef PRODUCT - static julong num_mallocs; // # of calls to malloc/realloc -diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/vmStructs.cpp openjdk/hotspot/src/share/vm/runtime/vmStructs.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/vmStructs.cpp 2019-05-02 01:23:49.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/vmStructs.cpp 2019-05-24 18:40:00.488874042 +0100 -@@ -51,6 +51,7 @@ - #include "interpreter/bytecodes.hpp" - #include "interpreter/interpreter.hpp" - #include "memory/allocation.hpp" -+#include "memory/allocation.inline.hpp" - #include "memory/cardTableRS.hpp" - #include "memory/defNewGeneration.hpp" - #include "memory/freeBlockDictionary.hpp" -@@ -92,6 +93,7 @@ - #include "runtime/globals.hpp" - #include "runtime/java.hpp" - #include "runtime/javaCalls.hpp" -+#include "runtime/os.hpp" - #include "runtime/perfMemory.hpp" - #include "runtime/serviceThread.hpp" - #include "runtime/sharedRuntime.hpp" -@@ -3328,14 +3330,14 @@ - } - } - if (strstr(typeName, " const") == typeName + len - 6) { -- char * s = strdup(typeName); -+ char * s = os::strdup_check_oom(typeName); - s[len - 6] = '\0'; - // tty->print_cr("checking \"%s\" for \"%s\"", s, typeName); - if (recursiveFindType(origtypes, s, true) == 1) { -- free(s); -+ os::free(s); - return 1; - } -- free(s); -+ os::free(s); - } - if (!isRecurse) { - tty->print_cr("type \"%s\" not found", typeName); -diff -Nru openjdk.orig/hotspot/src/share/vm/services/management.cpp openjdk/hotspot/src/share/vm/services/management.cpp ---- openjdk.orig/hotspot/src/share/vm/services/management.cpp 2019-05-02 01:23:49.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/services/management.cpp 2019-05-24 18:40:00.488874042 +0100 -@@ -1793,7 +1793,7 @@ - ResourceMark rm(THREAD); // thread->name() uses ResourceArea - - assert(thread->name() != NULL, "All threads should have a name"); -- _names_chars[_count] = strdup(thread->name()); -+ _names_chars[_count] = os::strdup(thread->name()); - _times->long_at_put(_count, os::is_thread_cpu_time_supported() ? - os::thread_cpu_time(thread) : -1); - _count++; -@@ -1811,7 +1811,7 @@ - - ThreadTimesClosure::~ThreadTimesClosure() { - for (int i = 0; i < _count; i++) { -- free(_names_chars[i]); -+ os::free(_names_chars[i]); - } - FREE_C_HEAP_ARRAY(char *, _names_chars, mtInternal); - } -diff -Nru openjdk.orig/hotspot/src/share/vm/shark/sharkBuilder.cpp openjdk/hotspot/src/share/vm/shark/sharkBuilder.cpp ---- openjdk.orig/hotspot/src/share/vm/shark/sharkBuilder.cpp 2019-05-02 01:23:49.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/shark/sharkBuilder.cpp 2019-05-24 18:40:00.488874042 +0100 -@@ -413,7 +413,7 @@ - const char *name; - if (value->hasName()) - // XXX this leaks, but it's only debug code -- name = strdup(value->getName().str().c_str()); -+ name = os::strdup(value->getName().str().c_str()); - else - name = "unnamed_value"; - +../shenandoah/6424123-pr3696.patch \ No newline at end of file
--- a/patches/hotspot/aarch32/8038392-rh1064383.patch Fri Nov 08 18:32:17 2019 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,79 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1400254787 -3600 -# Fri May 16 16:39:47 2014 +0100 -# Node ID c2767d7216058484f87920557a3f9282506e5ce5 -# Parent 2b4f89de39c2c4fd09f927adacb3781454dbee44 -8038392: Generating prelink cache breaks JAVA 'jinfo' utility normal behavior -Summary: See RH1064383 (https://bugzilla.redhat.com/show_bug.cgi?id=1064383) -Contributed-by: Carlos Santos <casantos@redhat.com> - -diff -r 2b4f89de39c2 -r c2767d721605 agent/src/os/linux/ps_proc.c ---- openjdk/hotspot/agent/src/os/linux/ps_proc.c Thu Apr 24 16:21:06 2014 +0100 -+++ openjdk/hotspot/agent/src/os/linux/ps_proc.c Fri May 16 16:39:47 2014 +0100 -@@ -263,7 +263,7 @@ - - static bool read_lib_info(struct ps_prochandle* ph) { - char fname[32]; -- char buf[256]; -+ char buf[PATH_MAX]; - FILE *fp = NULL; - - sprintf(fname, "/proc/%d/maps", ph->pid); -@@ -273,10 +273,52 @@ - return false; - } - -- while(fgets_no_cr(buf, 256, fp)){ -- char * word[6]; -- int nwords = split_n_str(buf, 6, word, ' ', '\0'); -- if (nwords > 5 && find_lib(ph, word[5]) == false) { -+ while(fgets_no_cr(buf, PATH_MAX, fp)){ -+ char * word[7]; -+ int nwords = split_n_str(buf, 7, word, ' ', '\0'); -+ -+ if (nwords < 6) { -+ // not a shared library entry. ignore. -+ continue; -+ } -+ -+ if (word[5][0] == '[') { -+ // not a shared library entry. ignore. -+ if (strncmp(word[5],"[stack",6) == 0) { -+ continue; -+ } -+ if (strncmp(word[5],"[heap]",6) == 0) { -+ continue; -+ } -+ -+ // SA don't handle VDSO -+ if (strncmp(word[5],"[vdso]",6) == 0) { -+ continue; -+ } -+ if (strncmp(word[5],"[vsyscall]",6) == 0) { -+ continue; -+ } -+ } -+ -+ if (nwords > 6) { -+ // prelink altered mapfile when the program is running. -+ // Entries like one below have to be skipped -+ // /lib64/libc-2.15.so (deleted) -+ // SO name in entries like one below have to be stripped. -+ // /lib64/libpthread-2.15.so.#prelink#.EECVts -+ char *s = strstr(word[5],".#prelink#"); -+ if (s == NULL) { -+ // No prelink keyword. skip deleted library -+ print_debug("skip shared object %s deleted by prelink\n", word[5]); -+ continue; -+ } -+ -+ // Fall through -+ print_debug("rectifing shared object name %s changed by prelink\n", word[5]); -+ *s = 0; -+ } -+ -+ if (find_lib(ph, word[5]) == false) { - intptr_t base; - lib_info* lib; - #ifdef _LP64
--- a/patches/hotspot/aarch32/8141570-pr3548.patch Fri Nov 08 18:32:17 2019 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,55 +0,0 @@ -# HG changeset patch -# User coleenp -# Date 1525713256 -3600 -# Mon May 07 18:14:16 2018 +0100 -# Node ID bcbc64dfb629c5f188bbf59b8f986ad95963ed60 -# Parent 07a1135a327362f157955d470fad5df07cc35164 -8141570, PR3548: Fix Zero interpreter build for --disable-precompiled-headers -Summary: change to include atomic.inline.hpp and allocation.inline.hpp only in .cpp files and some build fixes from Kim to build on ubuntu without devkits -Reviewed-by: kbarrett, sgehwolf, erikj - -diff -Nru openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make ---- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make 2019-07-11 03:20:53.000000000 +0100 -+++ openjdk/hotspot/make/linux/makefiles/zeroshark.make 2019-07-18 02:59:04.550133133 +0100 -@@ -1,5 +1,5 @@ - # --# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. -+# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. - # Copyright 2007, 2008 Red Hat, Inc. - # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - # -@@ -25,8 +25,15 @@ - - # Setup common to Zero (non-Shark) and Shark versions of VM - --# override this from the main file because some version of llvm do not like -Wundef --WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wunused-function -Wunused-value -+# Some versions of llvm do not like -Wundef -+ifeq ($(USE_CLANG), true) -+ WARNING_FLAGS += -Wno-undef -+endif -+# Suppress some warning flags that are normally turned on for hotspot, -+# because some of the zero code has not been updated accordingly. -+WARNING_FLAGS += -Wno-return-type \ -+ -Wno-format-nonliteral -Wno-format-security \ -+ -Wno-maybe-uninitialized - - # If FDLIBM_CFLAGS is non-empty it holds CFLAGS needed to be passed to - # the compiler so as to be able to produce optimized objects -@@ -48,5 +55,3 @@ - ifeq ($(ARCH_DATA_MODEL), 64) - CFLAGS += -D_LP64=1 - endif -- --OPT_CFLAGS/compactingPermGenGen.o = -O1 -diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/java.cpp openjdk/hotspot/src/share/vm/runtime/java.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/java.cpp 2019-07-11 03:20:53.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/java.cpp 2019-07-18 02:58:37.142553196 +0100 -@@ -45,6 +45,7 @@ - #include "runtime/arguments.hpp" - #include "runtime/biasedLocking.hpp" - #include "runtime/compilationPolicy.hpp" -+#include "runtime/deoptimization.hpp" - #include "runtime/fprofiler.hpp" - #include "runtime/init.hpp" - #include "runtime/interfaceSupport.hpp"
--- a/patches/hotspot/aarch32/8143245-pr3548.patch Fri Nov 08 18:32:17 2019 +0000 +++ b/patches/hotspot/aarch32/8143245-pr3548.patch Mon Nov 11 17:08:16 2019 +0000 @@ -1,146 +1,1 @@ -# HG changeset patch -# User sgehwolf -# Date 1525714161 -3600 -# Mon May 07 18:29:21 2018 +0100 -# Node ID afb31413c73cbc06420fdb447aa90a7a38258904 -# Parent bcbc64dfb629c5f188bbf59b8f986ad95963ed60 -8143245, PR3548: Zero build requires disabled warnings -Reviewed-by: dholmes, coleenp - -diff -Nru openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make ---- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make 2019-07-18 03:01:29.631909551 +0100 -+++ openjdk/hotspot/make/linux/makefiles/zeroshark.make 2019-07-18 03:06:00.171763146 +0100 -@@ -1,5 +1,5 @@ - # --# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. -+# Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. - # Copyright 2007, 2008 Red Hat, Inc. - # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - # -@@ -29,11 +29,6 @@ - ifeq ($(USE_CLANG), true) - WARNING_FLAGS += -Wno-undef - endif --# Suppress some warning flags that are normally turned on for hotspot, --# because some of the zero code has not been updated accordingly. --WARNING_FLAGS += -Wno-return-type \ -- -Wno-format-nonliteral -Wno-format-security \ -- -Wno-maybe-uninitialized - - # If FDLIBM_CFLAGS is non-empty it holds CFLAGS needed to be passed to - # the compiler so as to be able to produce optimized objects -diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp ---- openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp 2019-07-11 03:20:53.000000000 +0100 -+++ openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp 2019-07-18 03:05:46.751968822 +0100 -@@ -100,7 +100,7 @@ - case T_DOUBLE: - case T_VOID: - return result; -- default : ShouldNotReachHere(); -+ default : ShouldNotReachHere(); return NULL_WORD; - } - } - -diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp openjdk/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp ---- openjdk.orig/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp 2019-07-11 03:20:53.000000000 +0100 -+++ openjdk/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp 2019-07-18 03:05:46.751968822 +0100 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. - * Copyright 2007, 2008, 2010 Red Hat, Inc. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * -@@ -62,7 +62,7 @@ - } - - void InterpreterRuntime::SignatureHandlerGeneratorBase::push(BasicType type) { -- ffi_type *ftype; -+ ffi_type *ftype = NULL; - switch (type) { - case T_VOID: - ftype = &ffi_type_void; -diff -Nru openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp ---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 2019-07-11 03:20:53.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 2019-07-18 03:05:46.751968822 +0100 -@@ -1,6 +1,6 @@ - /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. -- * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc. -+ * Copyright 2016 Red Hat, Inc. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -61,6 +61,7 @@ - - frame os::get_sender_for_C_frame(frame* fr) { - ShouldNotCallThis(); -+ return frame(NULL, NULL); // silence compile warning. - } - - frame os::current_frame() { -@@ -98,16 +99,19 @@ - - address os::Linux::ucontext_get_pc(ucontext_t* uc) { - ShouldNotCallThis(); -+ return NULL; // silence compile warnings - } - - ExtendedPC os::fetch_frame_from_context(void* ucVoid, - intptr_t** ret_sp, - intptr_t** ret_fp) { - ShouldNotCallThis(); -+ return NULL; // silence compile warnings - } - - frame os::fetch_frame_from_context(void* ucVoid) { - ShouldNotCallThis(); -+ return frame(NULL, NULL); // silence compile warnings - } - - extern "C" JNIEXPORT int -@@ -247,11 +251,16 @@ - } - #endif // !PRODUCT - -- const char *fmt = "caught unhandled signal %d"; - char buf[64]; - -- sprintf(buf, fmt, sig); -+ sprintf(buf, "caught unhandled signal %d", sig); -+ -+// Silence -Wformat-security warning for fatal() -+PRAGMA_DIAG_PUSH -+PRAGMA_FORMAT_NONLITERAL_IGNORED - fatal(buf); -+PRAGMA_DIAG_POP -+ return true; // silence compiler warnings - } - - void os::Linux::init_thread_fpu_state(void) { -@@ -260,6 +269,7 @@ - - int os::Linux::get_fpu_control_word() { - ShouldNotCallThis(); -+ return -1; // silence compile warnings - } - - void os::Linux::set_fpu_control_word(int fpu) { -diff -Nru openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp ---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp 2019-07-11 03:20:53.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp 2019-07-18 03:05:46.751968822 +0100 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. - * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * -@@ -110,6 +110,7 @@ - void* ucontext, - bool isInJava) { - ShouldNotCallThis(); -+ return false; // silence compile warning - } - - // These routines are only used on cpu architectures that +../shenandoah/8143245-pr3548.patch \ No newline at end of file
--- a/patches/hotspot/aarch32/8187667-pr3517-readdir_r.patch Fri Nov 08 18:32:17 2019 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -# HG changeset patch -# User ehelin -# Date 1517861444 0 -# Mon Feb 05 20:10:44 2018 +0000 -# Node ID 3df435e5c2807c1596d5ff98698b493c82384317 -# Parent fb479b2ec08dc13d45b22180bc48807d6796b857 -8187667, PR3517: Disable deprecation warning for readdir_r -Reviewed-by: dholmes, sjohanss - -diff --git a/src/os/linux/vm/os_linux.inline.hpp b/src/os/linux/vm/os_linux.inline.hpp ---- openjdk/hotspot/src/os/linux/vm/os_linux.inline.hpp -+++ openjdk/hotspot/src/os/linux/vm/os_linux.inline.hpp -@@ -116,6 +116,11 @@ - - inline struct dirent* os::readdir(DIR* dirp, dirent *dbuf) - { -+// readdir_r has been deprecated since glibc 2.24. -+// See https://sourceware.org/bugzilla/show_bug.cgi?id=19056 for more details. -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -+ - dirent* p; - int status; - assert(dirp != NULL, "just checking"); -@@ -129,6 +134,8 @@ - return NULL; - } else - return p; -+ -+#pragma GCC diagnostic pop - } - - inline int os::closedir(DIR *dirp) {
--- a/patches/hotspot/aarch32/8196978-pr3517-gcc_4_pragmas.patch Fri Nov 08 18:32:17 2019 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1518051572 0 -# Thu Feb 08 00:59:32 2018 +0000 -# Node ID 3ade0115344b77e6d00462044e0cf68722685bfe -# Parent 3df435e5c2807c1596d5ff98698b493c82384317 -8196978, PR3517: JDK-8187667 fails on GCC 4.4.7 as found on RHEL 6 -Summary: Move pragma to above function definition and turn off push/pop pragma warnings on GCC < 4.6 -Reviewed-by: aph - -diff --git a/src/os/linux/vm/os_linux.inline.hpp b/src/os/linux/vm/os_linux.inline.hpp ---- openjdk/hotspot/src/os/linux/vm/os_linux.inline.hpp -+++ openjdk/hotspot/src/os/linux/vm/os_linux.inline.hpp -@@ -114,12 +114,12 @@ - return ::ftruncate64(fd, length); - } - -+// readdir_r has been deprecated since glibc 2.24. -+// See https://sourceware.org/bugzilla/show_bug.cgi?id=19056 for more details. -+PRAGMA_DIAG_PUSH -+#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - inline struct dirent* os::readdir(DIR* dirp, dirent *dbuf) - { --// readdir_r has been deprecated since glibc 2.24. --// See https://sourceware.org/bugzilla/show_bug.cgi?id=19056 for more details. --#pragma GCC diagnostic push --#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - - dirent* p; - int status; -@@ -135,8 +135,8 @@ - } else - return p; - --#pragma GCC diagnostic pop - } -+PRAGMA_DIAG_POP - - inline int os::closedir(DIR *dirp) { - assert(dirp != NULL, "argument is NULL");
--- a/patches/hotspot/aarch32/8223511.patch Fri Nov 08 18:32:17 2019 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1562260843 -3600 -# Thu Jul 04 18:20:43 2019 +0100 -# Node ID 55f693ba975d445d83a59cc32367ec4c2452b0c5 -# Parent 9deea71d83dd9ddef034f11fdbde6bdcad96b74f -8223511: Extended AES support -Reviewed-by: phh, mbalao, bae - -diff --git openjdk.orig/hotspot/src/share/vm/classfile/vmSymbols.hpp openjdk/hotspot/src/share/vm/classfile/vmSymbols.hpp ---- openjdk.orig/hotspot/src/share/vm/classfile/vmSymbols.hpp -+++ openjdk/hotspot/src/share/vm/classfile/vmSymbols.hpp -@@ -832,21 +832,21 @@ - do_class(com_sun_crypto_provider_aescrypt, "com/sun/crypto/provider/AESCrypt") \ - do_intrinsic(_aescrypt_encryptBlock, com_sun_crypto_provider_aescrypt, encryptBlock_name, byteArray_int_byteArray_int_signature, F_R) \ - do_intrinsic(_aescrypt_decryptBlock, com_sun_crypto_provider_aescrypt, decryptBlock_name, byteArray_int_byteArray_int_signature, F_R) \ -- do_name( encryptBlock_name, "encryptBlock") \ -- do_name( decryptBlock_name, "decryptBlock") \ -+ do_name( encryptBlock_name, "implEncryptBlock") \ -+ do_name( decryptBlock_name, "implDecryptBlock") \ - do_signature(byteArray_int_byteArray_int_signature, "([BI[BI)V") \ - \ - do_class(com_sun_crypto_provider_cipherBlockChaining, "com/sun/crypto/provider/CipherBlockChaining") \ - do_intrinsic(_cipherBlockChaining_encryptAESCrypt, com_sun_crypto_provider_cipherBlockChaining, encrypt_name, byteArray_int_int_byteArray_int_signature, F_R) \ - do_intrinsic(_cipherBlockChaining_decryptAESCrypt, com_sun_crypto_provider_cipherBlockChaining, decrypt_name, byteArray_int_int_byteArray_int_signature, F_R) \ -- do_name( encrypt_name, "encrypt") \ -- do_name( decrypt_name, "decrypt") \ -+ do_name( encrypt_name, "implEncrypt") \ -+ do_name( decrypt_name, "implDecrypt") \ - do_signature(byteArray_int_int_byteArray_int_signature, "([BII[BI)I") \ - \ - /* support for sun.security.provider.SHA */ \ - do_class(sun_security_provider_sha, "sun/security/provider/SHA") \ - do_intrinsic(_sha_implCompress, sun_security_provider_sha, implCompress_name, implCompress_signature, F_R) \ -- do_name( implCompress_name, "implCompress") \ -+ do_name( implCompress_name, "implCompress0") \ - do_signature(implCompress_signature, "([BI)V") \ - \ - /* support for sun.security.provider.SHA2 */ \ -@@ -860,7 +860,7 @@ - /* support for sun.security.provider.DigestBase */ \ - do_class(sun_security_provider_digestbase, "sun/security/provider/DigestBase") \ - do_intrinsic(_digestBase_implCompressMB, sun_security_provider_digestbase, implCompressMB_name, implCompressMB_signature, F_R) \ -- do_name( implCompressMB_name, "implCompressMultiBlock") \ -+ do_name( implCompressMB_name, "implCompressMultiBlock0") \ - do_signature(implCompressMB_signature, "([BII)I") \ - \ - /* support for java.util.zip */ \
--- a/patches/hotspot/aarch32/pr1368.patch Fri Nov 08 18:32:17 2019 +0000 +++ b/patches/hotspot/aarch32/pr1368.patch Mon Nov 11 17:08:16 2019 +0000 @@ -1,517 +1,1 @@ -# HG changeset patch -# User andrew -# Date 1452532602 0 -# Mon Jan 11 17:16:42 2016 +0000 -# Node ID be477dd4629d2155bde02047cc81ca4f8b657a49 -# Parent e04f994581e23e89757774cd2033413bc650a831 -PR1368: Ensure debug data is available for all libraries and binaries without redundant files - -diff -Nru openjdk.orig/hotspot/make/aix/makefiles/defs.make openjdk/hotspot/make/aix/makefiles/defs.make ---- openjdk.orig/hotspot/make/aix/makefiles/defs.make 2019-01-16 07:13:59.000000000 +0000 -+++ openjdk/hotspot/make/aix/makefiles/defs.make 2019-01-25 14:24:31.999871188 +0000 -@@ -186,12 +186,14 @@ - # client and server subdirectories have symbolic links to ../libjsig.so - EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX) - #ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) -+#ifneq ($(STRIP_POLICY),no_strip) - # ifeq ($(ZIP_DEBUGINFO_FILES),1) - # EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.diz - # else - # EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo - # endif - #endif -+#endif - EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server - EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client - EXPORT_MINIMAL_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/minimal -@@ -200,24 +202,28 @@ - EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt - EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) - # ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) -+# ifneq ($(STRIP_POLICY),no_strip) - # ifeq ($(ZIP_DEBUGINFO_FILES),1) - # EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz - # else - # EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo - # endif - # endif -+# endif - endif - - ifeq ($(JVM_VARIANT_CLIENT),true) - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) - # ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) -+# ifneq ($(STRIP_POLICY),no_strip) - # ifeq ($(ZIP_DEBUGINFO_FILES),1) - # EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz - # else - # EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo - # endif - # endif -+# endif - endif - - # Serviceability Binaries -diff -Nru openjdk.orig/hotspot/make/aix/makefiles/jsig.make openjdk/hotspot/make/aix/makefiles/jsig.make ---- openjdk.orig/hotspot/make/aix/makefiles/jsig.make 2019-01-16 07:13:59.000000000 +0000 -+++ openjdk/hotspot/make/aix/makefiles/jsig.make 2019-01-25 14:24:31.999871188 +0000 -@@ -60,6 +60,7 @@ - $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $< -ldl - - #ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) -+#ifneq ($(STRIP_POLICY),no_strip) - # $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO) - # $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@ - # ifeq ($(STRIP_POLICY),all_strip) -@@ -75,6 +76,7 @@ - # $(RM) $(LIBJSIG_DEBUGINFO) - # endif - #endif -+#endif - - install_jsig: $(LIBJSIG) - @echo "Copying $(LIBJSIG) to $(DEST_JSIG)" -diff -Nru openjdk.orig/hotspot/make/aix/makefiles/saproc.make openjdk/hotspot/make/aix/makefiles/saproc.make ---- openjdk.orig/hotspot/make/aix/makefiles/saproc.make 2019-01-16 07:13:59.000000000 +0000 -+++ openjdk/hotspot/make/aix/makefiles/saproc.make 2019-01-25 14:24:31.999871188 +0000 -@@ -88,8 +88,10 @@ - -o $@ \ - -lthread_db - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) -+ ifneq ($(STRIP_POLICY),no_strip) - $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO) - $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@ -+ endif - ifeq ($(STRIP_POLICY),all_strip) - $(QUIETLY) $(STRIP) $@ - else -@@ -99,8 +101,10 @@ - endif - endif - ifeq ($(ZIP_DEBUGINFO_FILES),1) -+ ifneq ($(STRIP_POLICY),no_strip) - $(ZIPEXE) -q -y $(LIBSAPROC_DIZ) $(LIBSAPROC_DEBUGINFO) - $(RM) $(LIBSAPROC_DEBUGINFO) -+ endif - endif - endif - -diff -Nru openjdk.orig/hotspot/make/aix/makefiles/vm.make openjdk/hotspot/make/aix/makefiles/vm.make ---- openjdk.orig/hotspot/make/aix/makefiles/vm.make 2019-01-16 07:13:59.000000000 +0000 -+++ openjdk/hotspot/make/aix/makefiles/vm.make 2019-01-25 14:24:31.999871188 +0000 -@@ -330,6 +330,7 @@ - # } - - #ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) -+#ifneq ($(STRIP_POLICY),no_strip) - # $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO) - # $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@ - # ifeq ($(STRIP_POLICY),all_strip) -@@ -345,6 +346,7 @@ - # $(RM) $(LIBJVM_DEBUGINFO) - # endif - #endif -+#endif - - DEST_SUBDIR = $(JDK_LIBDIR)/$(VM_SUBDIR) - DEST_JVM = $(DEST_SUBDIR)/$(LIBJVM) -diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/defs.make openjdk/hotspot/make/bsd/makefiles/defs.make ---- openjdk.orig/hotspot/make/bsd/makefiles/defs.make 2019-01-16 07:13:59.000000000 +0000 -+++ openjdk/hotspot/make/bsd/makefiles/defs.make 2019-01-25 14:24:31.999871188 +0000 -@@ -269,6 +269,7 @@ - EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX) - - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) -+ifneq ($(STRIP_POLICY),no_strip) - ifeq ($(ZIP_DEBUGINFO_FILES),1) - EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.diz - else -@@ -279,6 +280,7 @@ - endif - endif - endif -+endif - - EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server - EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client -@@ -289,6 +291,7 @@ - EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) - - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) -+ ifneq ($(STRIP_POLICY),no_strip) - ifeq ($(ZIP_DEBUGINFO_FILES),1) - EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz - else -@@ -299,6 +302,7 @@ - endif - endif - endif -+ endif - endif - - ifeq ($(JVM_VARIANT_CLIENT),true) -@@ -306,6 +310,7 @@ - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) - - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) -+ ifneq ($(STRIP_POLICY),no_strip) - ifeq ($(ZIP_DEBUGINFO_FILES),1) - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz - else -@@ -316,6 +321,7 @@ - endif - endif - endif -+ endif - endif - - ifeq ($(JVM_VARIANT_MINIMAL1),true) -@@ -329,6 +335,7 @@ - $(EXPORT_LIB_DIR)/sa-jdi.jar - - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) -+ifneq ($(STRIP_POLICY),no_strip) - ifeq ($(ZIP_DEBUGINFO_FILES),1) - ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz - else -@@ -346,6 +353,7 @@ - $(EXPORT_LIB_DIR)/sa-jdi.jar - - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) -+ifneq ($(STRIP_POLICY),no_strip) - ifeq ($(ZIP_DEBUGINFO_FILES),1) - ADD_SA_BINARIES/universal += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz - else -@@ -356,6 +364,7 @@ - endif - endif - endif -+endif - - ADD_SA_BINARIES/ppc = - ADD_SA_BINARIES/ia64 = -@@ -398,6 +407,7 @@ - UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/server/Xusage.txt - UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/client/Xusage.txt - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) -+ ifneq ($(STRIP_POLICY),no_strip) - ifeq ($(ZIP_DEBUGINFO_FILES),1) - UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/server/libjvm.diz - UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/client/libjvm.diz -@@ -410,6 +420,7 @@ - UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/libsaproc.$(LIBRARY_SUFFIX).dSYM - endif - endif -+ endif - - endif - endif -diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/jsig.make openjdk/hotspot/make/bsd/makefiles/jsig.make ---- openjdk.orig/hotspot/make/bsd/makefiles/jsig.make 2019-01-16 07:13:59.000000000 +0000 -+++ openjdk/hotspot/make/bsd/makefiles/jsig.make 2019-01-25 14:29:06.939548251 +0000 -@@ -64,6 +64,7 @@ - $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \ - $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(EXTRA_CFLAGS) -o $@ $< - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) -+ifneq ($(STRIP_POLICY),no_strip) - ifeq ($(OS_VENDOR), Darwin) - $(DSYMUTIL) $@ - ifeq ($(ZIP_DEBUGINFO_FILES),1) -@@ -87,6 +88,7 @@ - endif - endif - endif -+endif - - install_jsig: $(LIBJSIG) - @echo "Copying $(LIBJSIG) to $(DEST_JSIG)" -diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/saproc.make openjdk/hotspot/make/bsd/makefiles/saproc.make ---- openjdk.orig/hotspot/make/bsd/makefiles/saproc.make 2019-01-16 07:13:59.000000000 +0000 -+++ openjdk/hotspot/make/bsd/makefiles/saproc.make 2019-01-25 14:24:31.999871188 +0000 -@@ -137,6 +137,7 @@ - -o $@ \ - $(SALIBS) - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) -+ifneq ($(STRIP_POLICY),no_strip) - ifeq ($(OS_VENDOR), Darwin) - $(DSYMUTIL) $@ - ifeq ($(ZIP_DEBUGINFO_FILES),1) -@@ -160,6 +161,7 @@ - endif - endif - endif -+endif - - install_saproc: $(BUILDLIBSAPROC) - @echo "Copying $(LIBSAPROC) to $(DEST_SAPROC)" -diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/vm.make openjdk/hotspot/make/bsd/makefiles/vm.make ---- openjdk.orig/hotspot/make/bsd/makefiles/vm.make 2019-01-16 07:13:59.000000000 +0000 -+++ openjdk/hotspot/make/bsd/makefiles/vm.make 2019-01-25 14:24:31.999871188 +0000 -@@ -342,6 +342,7 @@ - } - - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) -+ifneq ($(STRIP_POLICY),no_strip) - ifeq ($(OS_VENDOR), Darwin) - $(DSYMUTIL) $@ - ifeq ($(ZIP_DEBUGINFO_FILES),1) -@@ -365,6 +366,7 @@ - endif - endif - endif -+endif - - DEST_SUBDIR = $(JDK_LIBDIR)/$(VM_SUBDIR) - DEST_JVM = $(DEST_SUBDIR)/$(LIBJVM) -diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/defs.make openjdk/hotspot/make/solaris/makefiles/defs.make ---- openjdk.orig/hotspot/make/solaris/makefiles/defs.make 2019-01-16 07:13:59.000000000 +0000 -+++ openjdk/hotspot/make/solaris/makefiles/defs.make 2019-01-25 14:24:31.999871188 +0000 -@@ -226,12 +226,14 @@ - # client and server subdirectories have symbolic links to ../libjsig.$(LIBRARY_SUFFIX) - EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX) - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) -+ifneq ($(STRIP_POLICY),no_strip) - ifeq ($(ZIP_DEBUGINFO_FILES),1) - EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.diz - else - EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo - endif - endif -+endif - - EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server - EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client -@@ -246,6 +248,7 @@ - EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX) - endif - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) -+ ifneq ($(STRIP_POLICY),no_strip) - ifeq ($(ZIP_DEBUGINFO_FILES),1) - EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz - EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.diz -@@ -264,6 +267,7 @@ - endif - endif - endif -+ endif - endif - ifeq ($(JVM_VARIANT_CLIENT),true) - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt -@@ -275,6 +279,7 @@ - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX) - endif - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) -+ ifneq ($(STRIP_POLICY),no_strip) - ifeq ($(ZIP_DEBUGINFO_FILES),1) - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.diz -@@ -293,10 +298,12 @@ - endif - endif - endif -+ endif - endif - - EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) -+ifneq ($(STRIP_POLICY),no_strip) - ifeq ($(ZIP_DEBUGINFO_FILES),1) - EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz - else -diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/jsig.make openjdk/hotspot/make/solaris/makefiles/jsig.make ---- openjdk.orig/hotspot/make/solaris/makefiles/jsig.make 2019-01-16 07:13:59.000000000 +0000 -+++ openjdk/hotspot/make/solaris/makefiles/jsig.make 2019-01-25 14:24:31.999871188 +0000 -@@ -52,8 +52,10 @@ - $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \ - $(LFLAGS_JSIG) -o $@ $(JSIGSRCDIR)/jsig.c -ldl - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) -+ ifneq ($(STRIP_POLICY),no_strip) - $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO) - $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@ -+ endif - ifeq ($(STRIP_POLICY),all_strip) - $(QUIETLY) $(STRIP) $@ - else -@@ -62,10 +64,12 @@ - # implied else here is no stripping at all - endif - endif -+ ifneq ($(STRIP_POLICY),no_strip) - ifeq ($(ZIP_DEBUGINFO_FILES),1) - $(ZIPEXE) -q -y $(LIBJSIG_DIZ) $(LIBJSIG_DEBUGINFO) - $(RM) $(LIBJSIG_DEBUGINFO) - endif -+ endif - endif - - install_jsig: $(LIBJSIG) -diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/saproc.make openjdk/hotspot/make/solaris/makefiles/saproc.make ---- openjdk.orig/hotspot/make/solaris/makefiles/saproc.make 2019-01-16 07:13:59.000000000 +0000 -+++ openjdk/hotspot/make/solaris/makefiles/saproc.make 2019-01-25 14:24:31.999871188 +0000 -@@ -121,8 +121,10 @@ - -c -o $(SADISOBJ) - - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) -+ ifneq ($(STRIP_POLICY),no_strip) - $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO) - $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@ -+ endif - ifeq ($(STRIP_POLICY),all_strip) - $(QUIETLY) $(STRIP) $@ - else -@@ -132,8 +134,10 @@ - endif - endif - ifeq ($(ZIP_DEBUGINFO_FILES),1) -+ ifneq ($(STRIP_POLICY),no_strip) - $(ZIPEXE) -q -y $(LIBSAPROC_DIZ) $(LIBSAPROC_DEBUGINFO) - $(RM) $(LIBSAPROC_DEBUGINFO) -+ endif - endif - endif - -diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/vm.make openjdk/hotspot/make/solaris/makefiles/vm.make ---- openjdk.orig/hotspot/make/solaris/makefiles/vm.make 2019-01-16 07:13:59.000000000 +0000 -+++ openjdk/hotspot/make/solaris/makefiles/vm.make 2019-01-25 14:24:32.003871126 +0000 -@@ -299,8 +299,10 @@ - $(QUIETLY) $(LINK_LIB.CXX/POST_HOOK) - $(QUIETLY) rm -f $@.1 && ln -s $@ $@.1 - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) -+ ifneq ($(STRIP_POLICY),no_strip) - $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO) - $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@ -+ endif - ifeq ($(STRIP_POLICY),all_strip) - $(QUIETLY) $(STRIP) $@ - else -@@ -309,10 +311,12 @@ - # implied else here is no stripping at all - endif - endif -+ ifneq ($(STRIP_POLICY),no_strip) - ifeq ($(ZIP_DEBUGINFO_FILES),1) - $(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO) - $(RM) $(LIBJVM_DEBUGINFO) - endif -+ endif - endif - endif # filter -sbfast -xsbfast - -diff -Nru openjdk.orig/hotspot/make/windows/makefiles/debug.make openjdk/hotspot/make/windows/makefiles/debug.make ---- openjdk.orig/hotspot/make/windows/makefiles/debug.make 2019-01-16 07:13:59.000000000 +0000 -+++ openjdk/hotspot/make/windows/makefiles/debug.make 2019-01-25 14:24:32.003871126 +0000 -@@ -60,11 +60,13 @@ - $(MT) /manifest $@.manifest /outputresource:$@;#2 - !endif - !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" -+!if "$(STRIP_POLICY)" != "no_strip" - !if "$(ZIP_DEBUGINFO_FILES)" == "1" - $(ZIPEXE) -q $*.diz $*.map $*.pdb - $(RM) $*.map $*.pdb - !endif - !endif -+!endif - - !include $(WorkSpace)/make/windows/makefiles/shared.make - !include $(WorkSpace)/make/windows/makefiles/sa.make -diff -Nru openjdk.orig/hotspot/make/windows/makefiles/defs.make openjdk/hotspot/make/windows/makefiles/defs.make ---- openjdk.orig/hotspot/make/windows/makefiles/defs.make 2019-01-16 07:13:59.000000000 +0000 -+++ openjdk/hotspot/make/windows/makefiles/defs.make 2019-01-25 14:24:32.003871126 +0000 -@@ -253,6 +253,7 @@ - EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt - EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.$(LIBRARY_SUFFIX) - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) -+ ifneq ($(STRIP_POLICY),no_strip) - ifeq ($(ZIP_DEBUGINFO_FILES),1) - EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.diz - else -@@ -260,11 +261,13 @@ - EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.map - endif - endif -+ endif - endif - ifeq ($(JVM_VARIANT_CLIENT),true) - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.$(LIBRARY_SUFFIX) - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) -+ ifneq ($(STRIP_POLICY),no_strip) - ifeq ($(ZIP_DEBUGINFO_FILES),1) - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.diz - else -@@ -272,6 +275,7 @@ - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.map - endif - endif -+ endif - endif - - EXPORT_LIST += $(EXPORT_LIB_DIR)/jvm.lib -@@ -279,6 +283,7 @@ - ifeq ($(BUILD_WIN_SA), 1) - EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.$(LIBRARY_SUFFIX) - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) -+ ifneq ($(STRIP_POLICY),no_strip) - ifeq ($(ZIP_DEBUGINFO_FILES),1) - EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.diz - else -@@ -286,6 +291,7 @@ - EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.map - endif - endif -+ endif - EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar - # Must pass this down to nmake. - MAKE_ARGS += BUILD_WIN_SA=1 -diff -Nru openjdk.orig/hotspot/make/windows/makefiles/fastdebug.make openjdk/hotspot/make/windows/makefiles/fastdebug.make ---- openjdk.orig/hotspot/make/windows/makefiles/fastdebug.make 2019-01-16 07:13:59.000000000 +0000 -+++ openjdk/hotspot/make/windows/makefiles/fastdebug.make 2019-01-25 14:24:32.003871126 +0000 -@@ -59,11 +59,13 @@ - $(MT) /manifest $@.manifest /outputresource:$@;#2 - !endif - !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" -+!if "$(STRIP_POLICY)" != "no_strip" - !if "$(ZIP_DEBUGINFO_FILES)" == "1" - $(ZIPEXE) -q $*.diz $*.map $*.pdb - $(RM) $*.map $*.pdb - !endif - !endif -+!endif - - !include $(WorkSpace)/make/windows/makefiles/shared.make - !include $(WorkSpace)/make/windows/makefiles/sa.make -diff -Nru openjdk.orig/hotspot/make/windows/makefiles/product.make openjdk/hotspot/make/windows/makefiles/product.make ---- openjdk.orig/hotspot/make/windows/makefiles/product.make 2019-01-16 07:13:59.000000000 +0000 -+++ openjdk/hotspot/make/windows/makefiles/product.make 2019-01-25 14:24:32.003871126 +0000 -@@ -62,11 +62,13 @@ - $(MT) /manifest $@.manifest /outputresource:$@;#2 - !endif - !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" -+!if "$(STRIP_POLICY)" != "no_strip" - !if "$(ZIP_DEBUGINFO_FILES)" == "1" - $(ZIPEXE) -q $*.diz $*.map $*.pdb - $(RM) $*.map $*.pdb - !endif - !endif -+!endif - - !include $(WorkSpace)/make/windows/makefiles/shared.make - !include $(WorkSpace)/make/windows/makefiles/sa.make -diff -Nru openjdk.orig/hotspot/make/windows/makefiles/sa.make openjdk/hotspot/make/windows/makefiles/sa.make ---- openjdk.orig/hotspot/make/windows/makefiles/sa.make 2019-01-16 07:13:59.000000000 +0000 -+++ openjdk/hotspot/make/windows/makefiles/sa.make 2019-01-25 14:24:32.003871126 +0000 -@@ -154,11 +154,13 @@ - $(MT) -manifest $(@F).manifest -outputresource:$(@F);#2 - !endif - !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" -+!if "$(STRIP_POLICY)" != "no_strip" - !if "$(ZIP_DEBUGINFO_FILES)" == "1" - $(ZIPEXE) -q $*.diz $*.map $*.pdb - $(RM) $*.map $*.pdb - !endif - !endif -+!endif - -@rm -f $*.obj - - cleanall : +../shenandoah/pr1368.patch \ No newline at end of file