diff --git a/java-1_8_0-openj9.spec b/java-1_8_0-openj9.spec index 283d53f..e807e8d 100644 --- a/java-1_8_0-openj9.spec +++ b/java-1_8_0-openj9.spec @@ -26,8 +26,8 @@ %global abs2rel perl -e %{script} %global syslibdir %{_libdir} # Standard JPackage naming and versioning defines. -%global updatever 302 -%global buildver b08 +%global updatever 312 +%global buildver b07 %global root_repository https://github.com/ibmruntimes/openj9-openjdk-jdk8/archive %global root_revision 8860d39588d2d66201a71dd205443b7fd8182acd %global root_branch v0.29.0-release diff --git a/jdk-gcc-warnings.patch b/jdk-gcc-warnings.patch deleted file mode 100644 index 914815d..0000000 --- a/jdk-gcc-warnings.patch +++ /dev/null @@ -1,90 +0,0 @@ ---- a/jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp 2020-01-22 11:12:33.000000000 +0100 -+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp 2020-01-27 17:06:13.010809355 +0100 -@@ -288,7 +288,7 @@ - { e_##name, #name, /*debug only*/ \ - cspec, ix } - --const band_init all_band_inits[] = { -+const band_init all_band_inits[BAND_LIMIT+1] = { - //BAND_INIT(archive_magic, BYTE1_spec, 0), - //BAND_INIT(archive_header, UNSIGNED5_spec, 0), - //BAND_INIT(band_headers, BYTE1_spec, 0), -@@ -448,14 +448,8 @@ - BAND_INIT(file_modtime, DELTA5_spec, 0), - BAND_INIT(file_options, UNSIGNED5_spec, 0), - //BAND_INIT(file_bits, BYTE1_spec, 0), --#ifndef PRODUCT -- { 0, 0, 0, 0 } --#else -- { 0, 0 } --#endif -+ { 0, NULL, 0, 0 } - }; --#define NUM_BAND_INITS \ -- (sizeof(all_band_inits)/sizeof(all_band_inits[0])) - - band* band::makeBands(unpacker* u) { - band* tmp_all_bands = U_NEW(band, BAND_LIMIT); ---- a/jdk/src/share/native/sun/java2d/opengl/OGLContext.c 2020-01-22 11:12:33.000000000 +0100 -+++ b/jdk/src/share/native/sun/java2d/opengl/OGLContext.c 2020-01-27 17:06:13.010809355 +0100 -@@ -38,6 +38,8 @@ - #include "GraphicsPrimitiveMgr.h" - #include "Region.h" - -+#include "jvm.h" -+ - /** - * The following methods are implemented in the windowing system (i.e. GLX - * and WGL) source files. ---- a/jdk/src/solaris/native/sun/awt/awt_Font.c 2020-01-22 11:12:33.000000000 +0100 -+++ b/jdk/src/solaris/native/sun/awt/awt_Font.c 2020-01-27 17:06:13.010809355 +0100 -@@ -454,6 +454,7 @@ - int32_t i, size; - char *fontsetname = NULL; - char *nativename = NULL; -+ Boolean doFree = FALSE; - jobjectArray componentFonts = NULL; - jobject peer = NULL; - jobject fontDescriptor = NULL; -@@ -493,8 +494,10 @@ - - if (!JNU_IsNull(env, fontDescriptorName)) { - nativename = (char *) JNU_GetStringPlatformChars(env, fontDescriptorName, NULL); -+ doFree = TRUE; - } else { - nativename = ""; -+ doFree = FALSE; - } - - fdata->flist[i].xlfd = malloc(strlen(nativename) -@@ -502,7 +505,7 @@ - jio_snprintf(fdata->flist[i].xlfd, strlen(nativename) + 10, - nativename, size * 10); - -- if (nativename != NULL && nativename != "") -+ if (nativename != NULL && doFree) - JNU_ReleaseStringPlatformChars(env, fontDescriptorName, (const char *) nativename); - - /* ---- a/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2020-01-22 11:12:33.000000000 +0100 -+++ b/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2020-01-27 17:06:13.010809355 +0100 -@@ -545,7 +545,7 @@ - xsdo->cData = xsdo->configData->color_data; - - XShared_initSurface(env, xsdo, depth, width, height, drawable); -- xsdo->xrPic = NULL; -+ xsdo->xrPic = None; - #endif /* !HEADLESS */ - } - ---- a/jdk/src/solaris/native/sun/xawt/XToolkit.c 2020-01-22 11:12:33.000000000 +0100 -+++ b/jdk/src/solaris/native/sun/xawt/XToolkit.c 2020-01-27 17:06:13.010809355 +0100 -@@ -723,7 +723,7 @@ - if (pollFds[0].revents) { - // Events in X pipe - update_poll_timeout(TIMEOUT_EVENTS); -- PRINT2("performPoll(): TIMEOUT_EVENTS curPollTimeout = %ld \n", curPollTimeout); -+ PRINT2("performPoll(): TIMEOUT_EVENTS curPollTimeout = %d \n", curPollTimeout); - } - return TRUE; - diff --git a/maybe-uninitialized.patch b/maybe-uninitialized.patch deleted file mode 100644 index 4c87345..0000000 --- a/maybe-uninitialized.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- a/openj9/openj9/runtime/gc_structs/MixedObjectIterator.hpp -+++ b/openj9/runtime/gc_structs/MixedObjectIterator.hpp -@@ -234,7 +234,7 @@ public: - /** - * @param vm[in] pointer to the JVM - */ -- GC_MixedObjectIterator (OMR_VM *omrVM) -+ GC_MixedObjectIterator(OMR_VM *omrVM) - : _slotObject(GC_SlotObject(omrVM, NULL)) - #if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) - , _compressObjectReferences(OMRVM_COMPRESS_OBJECT_REFERENCES(omrVM)) -@@ -251,20 +251,11 @@ public: - * @param vm[in] pointer to the JVM - * @param objectPtr[in] the object to be processed - */ -- GC_MixedObjectIterator (OMR_VM *omrVM, J9Object *objectPtr) -- : _slotObject(GC_SlotObject(omrVM, NULL)) --#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) -- , _compressObjectReferences(OMRVM_COMPRESS_OBJECT_REFERENCES(omrVM)) --#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) */ -- , _objectPtr(NULL) -- , _scanPtr(NULL) -- , _endPtr(NULL) -- , _descriptionPtr(NULL) -- , _description(0) -- , _descriptionIndex(0) -- { -+ GC_MixedObjectIterator(OMR_VM *omrVM, J9Object *objectPtr) -+ : GC_MixedObjectIterator(omrVM) -+ { - initialize(omrVM, objectPtr); -- } -+ } - }; - - #endif /* MIXEDOBJECTITERATOR_HPP_ */ ---- a/openj9/openj9/runtime/gc_structs/PointerArrayIterator.hpp -+++ b/openj9/runtime/gc_structs/PointerArrayIterator.hpp -@@ -58,14 +58,12 @@ public: - * @param objectPtr the array object to be processed - */ - GC_PointerArrayIterator(J9JavaVM *javaVM, J9Object *objectPtr) -- : _contiguousArrayIterator(javaVM->omrVM) -- , _pointerArrayletIterator(javaVM) -+ : GC_PointerArrayIterator(javaVM) - { - initialize(javaVM, objectPtr); - } - - GC_PointerArrayIterator(J9JavaVM *javaVM) -- /* It is unnecessary to initialize one of those iterators */ - : _contiguousArrayIterator(javaVM->omrVM) - , _pointerArrayletIterator(javaVM) - { ---- a/openj9/openj9/runtime/gc_structs/PointerContiguousArrayIterator.hpp -+++ b/openj9/runtime/gc_structs/PointerContiguousArrayIterator.hpp -@@ -96,7 +96,10 @@ public: - } - - GC_PointerContiguousArrayIterator(OMR_VM *omrVM) -- : _slotObject(GC_SlotObject(omrVM, NULL)) -+ : _arrayPtr(NULL) -+ , _slotObject(GC_SlotObject(omrVM, NULL)) -+ , _scanPtr(NULL) -+ , _endPtr(NULL) - #if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) - , _compressObjectReferences(OMRVM_COMPRESS_OBJECT_REFERENCES(omrVM)) - #endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) */ -@@ -108,11 +111,7 @@ public: - * @param objectPtr the array object to be processed - */ - GC_PointerContiguousArrayIterator(OMR_VM *omrVM, J9Object *objectPtr) -- : _slotObject(GC_SlotObject(omrVM, NULL)) --#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) -- , _compressObjectReferences(OMRVM_COMPRESS_OBJECT_REFERENCES(omrVM)) --#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) */ -- , _omrVM(omrVM) -+ : GC_PointerContiguousArrayIterator(omrVM) - { - initialize(objectPtr); - } diff --git a/omr-no-return-in-nonvoid-function.patch b/omr-no-return-in-nonvoid-function.patch deleted file mode 100644 index cd4fc6e..0000000 --- a/omr-no-return-in-nonvoid-function.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- omr/compiler/z/env/OMRCPU.cpp -+++ omr/compiler/z/env/OMRCPU.cpp -@@ -586,6 +586,8 @@ OMR::Z::CPU::setSupportsMiscellaneousInstructionExtensions2Facility(bool value) - { - _flags.reset(S390SupportsMIE2); - } -+ -+ return value; - } - - bool