forked from pool/java-1_8_0-openj9
Compare commits
25 Commits
Author | SHA256 | Date | |
---|---|---|---|
cbd93dd401 | |||
c38e2c0ae8 | |||
76ec24b93a | |||
e863723955 | |||
c1f27044c4 | |||
ad1a00d565 | |||
4cf588e065 | |||
b73082a428 | |||
95713e6407 | |||
6725864bf1 | |||
ff92d2a29f | |||
a1c5b25ea5 | |||
11559e228d | |||
eb13c99b7c | |||
625443e2e3 | |||
91dfe44859 | |||
c944bc523c | |||
16c99b868c | |||
f229d6e706 | |||
2c7e9ac94a | |||
56b4665fc7 | |||
cbdfbe8c7e | |||
0247501965 | |||
5af1604591 | |||
3161228815 |
3
017819f167cbcedd175a3f20e1112992bf4ecc1e.zip
Normal file
3
017819f167cbcedd175a3f20e1112992bf4ecc1e.zip
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ce487319d8a3598a19af2b8f46e9630c23d932e3d779151df84c69917982112c
|
||||
size 29652806
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:38371f6ef59ba89f89135dd5579d0952cc4d28adb452c25c194a248da70dc5fc
|
||||
size 29265781
|
3
266a8c6f5b6d202e4aaa09e19ce0d956605f27fd.zip
Normal file
3
266a8c6f5b6d202e4aaa09e19ce0d956605f27fd.zip
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9aa1212a44d24857597b91e4c5d46aa3ce8e4d1da08d2ef67a659b6ae01611f6
|
||||
size 11239872
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:31b067d16c7c9538d99db1fb9aee79d0e208a0173f1c5deb93aaaf96e66c5cca
|
||||
size 11172351
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:859d1898f55b446a25d6f113cdb5f196a2fe51560fde0b596f553650e1855aeb
|
||||
size 132810297
|
3
cb4b9ae56eabc82d4f828956d064834f883b6a4d.zip
Normal file
3
cb4b9ae56eabc82d4f828956d064834f883b6a4d.zip
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6e12af6001dcb2974e498e414636433a727ceb03f01e80a6027a30a81055f5dc
|
||||
size 132334298
|
@@ -1,87 +0,0 @@
|
||||
--- openjdk/jdk/src/share/bin/splashscreen_stubs.c
|
||||
+++ openjdk/jdk/src/share/bin/splashscreen_stubs.c
|
||||
@@ -61,11 +61,11 @@ typedef char* (*SplashGetScaledImageName_t)(const char* fileName,
|
||||
#define INVOKEV(name) _INVOKE(name, ,;)
|
||||
|
||||
int DoSplashLoadMemory(void* pdata, int size) {
|
||||
- INVOKE(SplashLoadMemory, NULL)(pdata, size);
|
||||
+ INVOKE(SplashLoadMemory, 0)(pdata, size);
|
||||
}
|
||||
|
||||
int DoSplashLoadFile(const char* filename) {
|
||||
- INVOKE(SplashLoadFile, NULL)(filename);
|
||||
+ INVOKE(SplashLoadFile, 0)(filename);
|
||||
}
|
||||
|
||||
void DoSplashInit(void) {
|
||||
@@ -87,4 +87,4 @@ void DoSplashSetScaleFactor(float scaleFactor) {
|
||||
char* DoSplashGetScaledImageName(const char* fileName, const char* jarName,
|
||||
float* scaleFactor) {
|
||||
INVOKE(SplashGetScaledImageName, NULL)(fileName, jarName, scaleFactor);
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
--- openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
|
||||
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
|
||||
@@ -2850,14 +2850,14 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeImage
|
||||
pb = &data->pixelBuf;
|
||||
|
||||
if (setPixelBuffer(env, pb, buffer) == NOT_OK) {
|
||||
- freeArray(scale, numBands);
|
||||
+ freeArray((void**)scale, numBands);
|
||||
return data->abortFlag; // We already threw an out of memory exception
|
||||
}
|
||||
|
||||
// Allocate a 1-scanline buffer
|
||||
scanLinePtr = (JSAMPROW)malloc(scanLineSize);
|
||||
if (scanLinePtr == NULL) {
|
||||
- freeArray(scale, numBands);
|
||||
+ freeArray((void**)scale, numBands);
|
||||
JNU_ThrowByName( env,
|
||||
"java/lang/OutOfMemoryError",
|
||||
"Writing JPEG Stream");
|
||||
@@ -2879,7 +2879,7 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeImage
|
||||
JNU_ThrowByName(env, "javax/imageio/IIOException", buffer);
|
||||
}
|
||||
|
||||
- freeArray(scale, numBands);
|
||||
+ freeArray((void**)scale, numBands);
|
||||
free(scanLinePtr);
|
||||
return data->abortFlag;
|
||||
}
|
||||
@@ -2928,7 +2928,7 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeImage
|
||||
(*env)->ReleaseIntArrayElements(env, QtableSelectors, qsels, JNI_ABORT);
|
||||
}
|
||||
if (!success) {
|
||||
- freeArray(scale, numBands);
|
||||
+ freeArray((void**)scale, numBands);
|
||||
free(scanLinePtr);
|
||||
return data->abortFlag;
|
||||
}
|
||||
@@ -2949,7 +2949,7 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeImage
|
||||
if (GET_ARRAYS(env, data,
|
||||
(const JOCTET **)(&dest->next_output_byte)) == NOT_OK) {
|
||||
(*env)->ExceptionClear(env);
|
||||
- freeArray(scale, numBands);
|
||||
+ freeArray((void**)scale, numBands);
|
||||
free(scanLinePtr);
|
||||
JNU_ThrowByName(env,
|
||||
"javax/imageio/IIOException",
|
||||
@@ -2987,7 +2987,7 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeImage
|
||||
scanData = (*env)->GetIntArrayElements(env, scanInfo, NULL);
|
||||
if (scanData == NULL) {
|
||||
RELEASE_ARRAYS(env, data, (const JOCTET *)(dest->next_output_byte));
|
||||
- freeArray(scale, numBands);
|
||||
+ freeArray((void**)scale, numBands);
|
||||
free(scanLinePtr);
|
||||
return data->abortFlag;
|
||||
}
|
||||
@@ -3086,7 +3086,7 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeImage
|
||||
jpeg_abort((j_common_ptr)cinfo);
|
||||
}
|
||||
|
||||
- freeArray(scale, numBands);
|
||||
+ freeArray((void**)scale, numBands);
|
||||
free(scanLinePtr);
|
||||
RELEASE_ARRAYS(env, data, NULL);
|
||||
return data->abortFlag;
|
@@ -1,3 +1,80 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Jul 26 21:23:44 UTC 2025 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Update to OpenJDK 8u462 build 08 with OpenJ9 0.53.0 virtual
|
||||
machine
|
||||
- Including Oracle July 2025 CPU changes
|
||||
* CVE-2025-30749 (bsc#1246595), CVE-2025-30754 (bsc#1246598),
|
||||
CVE-2025-30761 (bsc#1246580), CVE-2025-50059 (bsc#1246575)
|
||||
- Removed patches:
|
||||
* fix-build-with-gcc14.patch
|
||||
* fix-build-with-gcc15.patch
|
||||
* libdwarf-fix.patch
|
||||
* openj9-noexecstack.patch
|
||||
* stringop-overflow.patch
|
||||
+ fixed in this version
|
||||
- Modified patches:
|
||||
* openj9-nogit.patch.in
|
||||
* openssl-OSSL_LIB_CTX.patch
|
||||
+ rediff to changed context
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 17 15:58:52 UTC 2025 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Add -std=gnu99 to CFLAGS to fix gcc15 compile time error. Since
|
||||
the C++ part is on -std=gnu++98, this is the closest.
|
||||
- Added patch:
|
||||
* fix-build-with-gcc15.patch
|
||||
+ fix a typo in omr that is fatal with gcc15
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun May 11 03:50:29 UTC 2025 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Update to OpenJDK 8u452 build 09 with OpenJ9 0.51.0 virtual
|
||||
machine
|
||||
- Fixes OpenJ9 security vulnerability CVE-2025-4447 (bsc#1243429)
|
||||
- Including Oracle April 2025 CPU changes
|
||||
* CVE-2025-21587 (bsc#1241274), CVE-2025-30691 (bsc#1241275),
|
||||
CVE-2025-30698 (bsc#1241276)
|
||||
* OpenJ9 changes, see
|
||||
https://www.eclipse.org/openj9/docs/version0.51/
|
||||
- Removed patch:
|
||||
* openj9-nasm-noexecstack.patch
|
||||
+ chosing a better upstream solution
|
||||
- Added patch:
|
||||
* openj9-noexecstack.patch
|
||||
+ better upstream solution to the previous fix
|
||||
- Modified patch:
|
||||
* openssl-OSSL_LIB_CTX.patch
|
||||
+ rediff
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed May 7 06:57:22 UTC 2025 - Simon Lees <sflees@suse.de>
|
||||
|
||||
- export CMAKE_POLICY_VERSION_MINIMUM="3.5" to ignore cmakes
|
||||
minimum version warnings
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 18 15:53:08 UTC 2025 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Added patch:
|
||||
* openj9-nasm-noexecstack.patch
|
||||
+ fix wrong execstack flag in libj9jit (bsc#1235844)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 7 08:22:53 UTC 2025 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Update to OpenJDK 8u442 build 06 with OpenJ9 0.49.0 virtual
|
||||
machine
|
||||
- Including Oracle October 2024 and January 2025 CPU changes
|
||||
* CVE-2024-21208 (bsc#1231702), CVE-2024-21210 (bsc#1231711),
|
||||
CVE-2024-21217 (bsc#1231716), CVE-2024-21235 (bsc#1231719)
|
||||
* OpenJ9 changes, see
|
||||
https://eclipse.dev/openj9/docs/version0.49
|
||||
- Added patch:
|
||||
* openssl-OSSL_LIB_CTX.patch
|
||||
+ allow building with openssl < 3
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 6 07:39:14 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
@@ -21,6 +98,8 @@ Thu May 23 17:21:33 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
- Including Oracle April 2024 CPU changes
|
||||
* CVE-2024-21094 (bsc#1222986), CVE-2024-21011 (bsc#1222979),
|
||||
CVE-2024-21085 (bsc#1222984), CVE-2024-21068 (bsc#1222983)
|
||||
- Including OpenJ9/OMR specific fix:
|
||||
* CVE-2024-3933 (bsc#1225470)
|
||||
* OpenJ9 changes, see
|
||||
https://eclipse.dev/openj9/docs/version0.44
|
||||
- Added patch:
|
||||
|
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package java-1_8_0-openj9
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -28,18 +28,18 @@
|
||||
%global abs2rel perl -e %{script}
|
||||
%global syslibdir %{_libdir}
|
||||
# Standard JPackage naming and versioning defines.
|
||||
%global updatever 422
|
||||
%global buildver b05
|
||||
%global updatever 462
|
||||
%global buildver b08
|
||||
%global root_repository https://github.com/ibmruntimes/openj9-openjdk-jdk8/archive
|
||||
%global root_revision a75ff73ce586d4105f89e83f0b3a80ca922e0d6f
|
||||
%global root_branch v0.46.0-release
|
||||
%global root_revision cb4b9ae56eabc82d4f828956d064834f883b6a4d
|
||||
%global root_branch v0.53.0-release
|
||||
%global omr_repository https://github.com/eclipse/openj9-omr/archive
|
||||
%global omr_revision 840a9adba4548aa546e36c97a1150b7306a7e07b
|
||||
%global omr_branch v0.46.0-release
|
||||
%global omr_revision 266a8c6f5b6d202e4aaa09e19ce0d956605f27fd
|
||||
%global omr_branch v0.53.0-release
|
||||
%global openj9_repository https://github.com/eclipse/openj9/archive
|
||||
%global openj9_revision 1a6f6128aa2f639de1e33cae77a31f474ba6b1a9
|
||||
%global openj9_branch v0.46.0-release
|
||||
%global openj9_tag openj9-0.46.0
|
||||
%global openj9_revision 017819f167cbcedd175a3f20e1112992bf4ecc1e
|
||||
%global openj9_branch v0.53.0-release
|
||||
%global openj9_tag openj9-0.53.0
|
||||
# priority must be 6 digits in total
|
||||
%global priority 1801
|
||||
%global javaver 1.8.0
|
||||
@@ -110,18 +110,13 @@ Patch1: java-atk-wrapper-security.patch
|
||||
Patch2: multiple-pkcs11-library-init.patch
|
||||
# Disable doclint for compatibility
|
||||
Patch3: disable-doclint-by-default.patch
|
||||
# Allow building with newer libdwarf
|
||||
Patch4: libdwarf-fix.patch
|
||||
# Fix build with gcc 13
|
||||
Patch31: stringop-overflow.patch
|
||||
# Fix build with gcc 14
|
||||
Patch32: fix-build-with-gcc14.patch
|
||||
# Patches for system libraries
|
||||
Patch201: system-libjpeg.patch
|
||||
Patch202: system-libpng.patch
|
||||
Patch203: system-lcms.patch
|
||||
Patch210: openj9-no-werror.patch
|
||||
Patch211: openj9-openssl.patch
|
||||
Patch212: openssl-OSSL_LIB_CTX.patch
|
||||
BuildRequires: alsa-lib-devel
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
@@ -204,9 +199,9 @@ BuildRequires: gcc-c++ >= 7
|
||||
%endif
|
||||
%if %{bootcycle}
|
||||
BuildRequires: java-devel >= 1.7
|
||||
BuildConflicts: java >= 9
|
||||
BuildConflicts: java-devel >= 9
|
||||
BuildConflicts: java-headless >= 9
|
||||
BuildConflicts: java >= 1.9
|
||||
BuildConflicts: java-devel >= 1.9
|
||||
BuildConflicts: java-headless >= 1.9
|
||||
%else
|
||||
BuildRequires: %{name}-devel
|
||||
%endif
|
||||
@@ -353,14 +348,11 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*
|
||||
|
||||
%patch -P 210
|
||||
%patch -P 211 -p1
|
||||
%patch -P 212 -p1
|
||||
|
||||
%patch -P 1 -p1
|
||||
%patch -P 2 -p1
|
||||
%patch -P 3 -p1
|
||||
%patch -P 4 -p1
|
||||
|
||||
%patch -P 31 -p1
|
||||
%patch -P 32 -p1
|
||||
|
||||
cat %{SOURCE100} \
|
||||
| sed "s/@OPENJ9_SHA@/`expr substr '%{openj9_revision}' 1 7`/g" \
|
||||
@@ -381,13 +373,16 @@ for file in %{SOURCE11} %{SOURCE12} ; do
|
||||
done
|
||||
|
||||
%build
|
||||
# Remove cmake4 error due to not setting
|
||||
# min cmake version - sflees.de
|
||||
export CMAKE_POLICY_VERSION_MINIMUM=3.5
|
||||
export ARCH_DATA_MODEL=64
|
||||
|
||||
(cd common/autoconf
|
||||
bash ./autogen.sh
|
||||
)
|
||||
#(cd common/autoconf
|
||||
# bash ./autogen.sh
|
||||
#)
|
||||
|
||||
EXTRA_CFLAGS="-Wno-error -Wno-maybe-uninitialized -fno-delete-null-pointer-checks -fno-lifetime-dse"
|
||||
EXTRA_CFLAGS="-Wno-error -Wno-maybe-uninitialized -std=gnu99 -fno-delete-null-pointer-checks -fno-lifetime-dse"
|
||||
EXTRA_CPP_FLAGS="-Wno-error -Wno-maybe-uninitialized -std=gnu++98 -fno-delete-null-pointer-checks -fno-lifetime-dse"
|
||||
|
||||
%ifarch ppc64le
|
||||
@@ -401,6 +396,8 @@ bash configure \
|
||||
CC=gcc-7 \
|
||||
NM=gcc-nm-7 \
|
||||
%endif
|
||||
--with-extra-cflags="$EXTRA_CFLAGS" \
|
||||
--with-extra-cxxflags="$EXTRA_CPP_FLAGS" \
|
||||
--disable-warnings-as-errors-omr \
|
||||
--disable-warnings-as-errors-openj9 \
|
||||
--enable-demos \
|
||||
|
@@ -1,85 +0,0 @@
|
||||
--- a/omr/ddr/lib/ddr-scanner/dwarf/DwarfScanner.cpp
|
||||
+++ b/omr/ddr/lib/ddr-scanner/dwarf/DwarfScanner.cpp
|
||||
@@ -1497,6 +1497,13 @@ DwarfScanner::traverse_cu_in_debug_section(Symbol_IR *ir)
|
||||
Dwarf_Half addressSize = 0;
|
||||
Dwarf_Unsigned nextCUheader = 0;
|
||||
Dwarf_Error error = NULL;
|
||||
+#ifdef DW_LIBDWARF_VERSION_MAJOR
|
||||
+ Dwarf_Half lengthSize = 0;
|
||||
+ Dwarf_Half extensionSize = 0;
|
||||
+ Dwarf_Sig8 typeSignature;
|
||||
+ Dwarf_Unsigned typeOffset = 0;
|
||||
+ Dwarf_Half nextCUheaderType = 0;
|
||||
+#endif
|
||||
|
||||
/* Go over each cu header. */
|
||||
while (DDR_RC_OK == rc) {
|
||||
@@ -1504,7 +1511,11 @@ DwarfScanner::traverse_cu_in_debug_section(Symbol_IR *ir)
|
||||
_typeOffsetMap.clear();
|
||||
_ir = &newIR;
|
||||
|
||||
+#ifdef DW_LIBDWARF_VERSION_MAJOR
|
||||
+ int ret = dwarf_next_cu_header_d(_debug, true, &cuHeaderLength, &versionStamp, &abbrevOffset, &addressSize, &lengthSize, &extensionSize, &typeSignature, &typeOffset, &nextCUheader, &nextCUheaderType, &error);
|
||||
+#else
|
||||
int ret = dwarf_next_cu_header(_debug, &cuHeaderLength, &versionStamp, &abbrevOffset, &addressSize, &nextCUheader, &error);
|
||||
+#endif
|
||||
if (DW_DLV_ERROR == ret) {
|
||||
ERRMSG("Failed to get next dwarf CU header.");
|
||||
rc = DDR_RC_ERROR;
|
||||
@@ -1518,7 +1529,11 @@ DwarfScanner::traverse_cu_in_debug_section(Symbol_IR *ir)
|
||||
Dwarf_Die childDie = NULL;
|
||||
|
||||
/* Expect the CU to have a single sibling - a DIE */
|
||||
+#ifdef DW_LIBDWARF_VERSION_MAJOR
|
||||
+ if (DW_DLV_ERROR == dwarf_siblingof_b(_debug, NULL, true, &cuDie, &error)) {
|
||||
+#else
|
||||
if (DW_DLV_ERROR == dwarf_siblingof(_debug, NULL, &cuDie, &error)) {
|
||||
+#endif
|
||||
ERRMSG("Getting sibling of CU: %s\n", dwarf_errmsg(error));
|
||||
rc = DDR_RC_ERROR;
|
||||
break;
|
||||
@@ -1617,12 +1632,20 @@ DwarfScanner::scanFile(OMRPortLibrary *portLibrary, Symbol_IR *ir, const char *f
|
||||
}
|
||||
|
||||
if (DDR_RC_OK == rc) {
|
||||
+#ifdef DW_LIBDWARF_VERSION_MAJOR
|
||||
+ unsigned int groupNumber = DW_GROUPNUMBER_ANY;
|
||||
+#else
|
||||
Dwarf_Unsigned access = DW_DLC_READ;
|
||||
+#endif
|
||||
Dwarf_Handler errhand = 0;
|
||||
Dwarf_Ptr errarg = NULL;
|
||||
intptr_t native_fd = omrfile_convert_omrfile_fd_to_native_fd(fd);
|
||||
DwarfScanner::scanFileName = filepath;
|
||||
+#ifdef DW_LIBDWARF_VERSION_MAJOR
|
||||
+ res = dwarf_init_b((int)native_fd, groupNumber, errhand, errarg, &_debug, &error);
|
||||
+#else
|
||||
res = dwarf_init((int)native_fd, access, errhand, errarg, &_debug, &error);
|
||||
+#endif
|
||||
if (DW_DLV_OK != res) {
|
||||
ERRMSG("Failed to initialize libDwarf scanning %s: %s\nExiting...\n", filepath, dwarf_errmsg(error));
|
||||
if (NULL != error) {
|
||||
@@ -1640,7 +1663,11 @@ DwarfScanner::scanFile(OMRPortLibrary *portLibrary, Symbol_IR *ir, const char *f
|
||||
|
||||
DEBUGPRINTF("Unloading libDwarf");
|
||||
|
||||
+#ifdef DW_LIBDWARF_VERSION_MAJOR
|
||||
+ res = dwarf_finish(_debug);
|
||||
+#else
|
||||
res = dwarf_finish(_debug, &error);
|
||||
+#endif
|
||||
if (DW_DLV_OK != res) {
|
||||
ERRMSG("Failed to Unload libDwarf: %s\nExiting...\n", dwarf_errmsg(error));
|
||||
if (NULL != error) {
|
||||
@@ -1681,7 +1708,11 @@ DwarfScanner::getNextSibling(Dwarf_Die *die)
|
||||
Dwarf_Error err = NULL;
|
||||
|
||||
/* Get the next sibling and free the previous one if successful. */
|
||||
+#ifdef DW_LIBDWARF_VERSION_MAJOR
|
||||
+ int ret = dwarf_siblingof_b(_debug, *die, true, &nextSibling, &err);
|
||||
+#else
|
||||
int ret = dwarf_siblingof(_debug, *die, &nextSibling, &err);
|
||||
+#endif
|
||||
if (DW_DLV_ERROR == ret) {
|
||||
ERRMSG("Getting sibling of die:%s\n", dwarf_errmsg(err));
|
||||
} else if (DW_DLV_OK == ret) {
|
@@ -14,7 +14,7 @@
|
||||
ifneq (,$$($2))
|
||||
VersionLabelWidth := $(shell $(ECHO) "$1" | $(AWK) "{ width = length; print (width > $(VersionLabelWidth) ? width : $(VersionLabelWidth)) }")
|
||||
VersionPairs += "$1" "$$($2)"
|
||||
@@ -58,17 +58,17 @@ define ShowVersions
|
||||
@@ -58,18 +58,18 @@ define ShowVersions
|
||||
@$(PRINTF) " %-$(VersionLabelWidth)s - %s\n" $(VersionPairs)
|
||||
endef # ShowVersions
|
||||
|
||||
@@ -26,6 +26,7 @@
|
||||
+$(call GetVersion, openj9, OPENJ9_SHA, @OPENJ9_SHA@, required)
|
||||
+$(call GetVersion, omr, OPENJ9OMR_SHA, @OPENJ9OMR_SHA@, required)
|
||||
+$(call GetVersion, openssl, OPENSSL_SHA, @OPENSSL_SHA@ )
|
||||
$(call GetVersion, vendor, VENDOR_SHA, $(VENDOR_TOPDIR))
|
||||
|
||||
# Find OpenJ9 tag associated with current commit (suppressing stderr in case there is no such tag).
|
||||
-OPENJ9_TAG := $(shell $(GIT) -C $(OPENJ9_TOPDIR) describe --exact-match HEAD 2>/dev/null)
|
||||
@@ -38,20 +39,3 @@
|
||||
ifeq (,$(OPENJ9_BRANCH))
|
||||
$(error Could not determine OpenJ9 branch)
|
||||
endif
|
||||
diff --git a/closed/make/Main.gmk b/closed/make/Main.gmk
|
||||
index d73fff3230..d17eea56b8 100644
|
||||
--- a/closed/make/Main.gmk
|
||||
+++ b/closed/make/Main.gmk
|
||||
@@ -35,9 +35,9 @@ clean-j9vm :
|
||||
# Override definition from MakeBase.gmk for OpenJ9.
|
||||
define GetSourceTips
|
||||
$(PRINTF) "%s:%s\n" \
|
||||
- OpenJDK "$(shell $(GIT) -C $(TOPDIR) rev-parse --short HEAD)" \
|
||||
- OpenJ9 "$(shell $(GIT) -C $(OPENJ9_TOPDIR) rev-parse --short HEAD)" \
|
||||
- OMR "$(shell $(GIT) -C $(OPENJ9OMR_TOPDIR) rev-parse --short HEAD)" \
|
||||
+ OpenJDK "@OPENJDK_SHA@" \
|
||||
+ OpenJ9 "@OPENJ9_SHA@" \
|
||||
+ OMR "@OPENJ9OMR_SHA@" \
|
||||
> $@
|
||||
endef
|
||||
|
||||
|
13
openssl-OSSL_LIB_CTX.patch
Normal file
13
openssl-OSSL_LIB_CTX.patch
Normal file
@@ -0,0 +1,13 @@
|
||||
--- a/closed/adds/jdk/src/share/native/jdk/crypto/jniprovider/NativeCrypto.c
|
||||
+++ b/closed/adds/jdk/src/share/native/jdk/crypto/jniprovider/NativeCrypto.c
|
||||
@@ -77,6 +77,10 @@
|
||||
# include <pthread.h>
|
||||
#endif /* defined(WINDOWS) */
|
||||
|
||||
+#if OPENSSL_VERSION_MAJOR < 3
|
||||
+typedef struct ossl_lib_ctx_st OSSL_LIB_CTX;
|
||||
+#endif
|
||||
+
|
||||
/* Header for NativeCrypto loading methods. */
|
||||
static void * find_crypto_symbol(void *handle, const char *symname);
|
||||
static void * find_crypto_library(jboolean traceEnabled, jboolean skipBundled, const char *chomepath);
|
@@ -1,20 +0,0 @@
|
||||
diff -urEbwB openj9-openjdk-jdk17.orig/omr/compiler/optimizer/OMRSimplifierHandlers.cpp openj9-openjdk-jdk17/omr/compiler/optimizer/OMRSimplifierHandlers.cpp
|
||||
--- openj9-openjdk-jdk17.orig/omr/compiler/optimizer/OMRSimplifierHandlers.cpp 2023-03-28 09:18:57.979474249 +0200
|
||||
+++ openj9-openjdk-jdk17/omr/compiler/optimizer/OMRSimplifierHandlers.cpp 2023-03-28 09:49:47.316000333 +0200
|
||||
@@ -22,6 +22,9 @@
|
||||
#ifndef OMR_SIMPLIFIERHANDLERS_INCL
|
||||
#define OMR_SIMPLIFIERHANDLERS_INCL
|
||||
|
||||
+#pragma GCC diagnostic push
|
||||
+#pragma GCC diagnostic ignored "-Wstringop-overflow"
|
||||
+
|
||||
#include "optimizer/OMRSimplifierHelpers.hpp"
|
||||
#include "optimizer/SimplifierHandlers.hpp"
|
||||
|
||||
@@ -17353,5 +17356,6 @@
|
||||
return node;
|
||||
}
|
||||
|
||||
+#pragma GCC diagnostic pop
|
||||
|
||||
#endif
|
Reference in New Issue
Block a user