Compare commits
147 Commits
Author | SHA256 | Date | |
---|---|---|---|
cbd93dd401 | |||
c1f27044c4 | |||
ad1a00d565 | |||
4cf588e065 | |||
b73082a428 | |||
95713e6407 | |||
6725864bf1 | |||
ff92d2a29f | |||
a1c5b25ea5 | |||
11559e228d | |||
eb13c99b7c | |||
625443e2e3 | |||
91dfe44859 | |||
c944bc523c | |||
16c99b868c | |||
f229d6e706 | |||
2c7e9ac94a | |||
56b4665fc7 | |||
cbdfbe8c7e | |||
0247501965 | |||
5af1604591 | |||
3161228815 | |||
06506946ec | |||
dee521531e | |||
51982fe882 | |||
13ace73acc | |||
fad36d3c52 | |||
481dc4f0ab | |||
1bd8df79a9 | |||
1c26a3f52e | |||
a23d2de3b5 | |||
732db0c552 | |||
9e96ad8461 | |||
24a09eae1c | |||
72930024cb | |||
7b450e6a53 | |||
52c25259c0 | |||
a14f42b6b9 | |||
c2d2888ab6 | |||
bab5d482fa | |||
b28722a992 | |||
869ac6f7d5 | |||
e165a3a120 | |||
c13b583e00 | |||
f49762e222 | |||
5b84f466a2 | |||
ae26a20fc6 | |||
ac471477c6 | |||
375bd2f0b4 | |||
7a09440071 | |||
df4db80b84 | |||
b4a47cb150 | |||
1cbd79a548 | |||
4e6df51288 | |||
488aee6e7e | |||
dbe233df29 | |||
edcf9b242a | |||
8ddc7d0afa | |||
2215abb112 | |||
da4b53b18f | |||
3422581118 | |||
61e79fcce7 | |||
9c3d791c9f | |||
e111d20a1e | |||
30d1ddfad6 | |||
383ed91988 | |||
672d72297a | |||
d62e454aec | |||
4f290df28c | |||
48aea49fd5 | |||
26d4aa53eb | |||
8f9a8e7879 | |||
ca5c176656 | |||
592d8978c3 | |||
9795242d51 | |||
7b5c86cb96 | |||
a1876f40f5 | |||
bcaa718a1b | |||
710eb20728 | |||
ab2317925b | |||
83c5b2f1bd | |||
2fe89c9781 | |||
f0b051f1dc | |||
ee9e716b53 | |||
19460146f1 | |||
a4cf3a160a | |||
e2139b8947 | |||
a75be3b992 | |||
f68370b29c | |||
d0bd9d187c | |||
85f48f135b | |||
4ed53a45cf | |||
8a4a163c50 | |||
9c010d2a0f | |||
5b71a46795 | |||
19f8503ee6 | |||
6e11b3ebea | |||
8ca5b61a31 | |||
5d41fb64c2 | |||
db327b5ba8 | |||
5c179a38de | |||
e387049fb7 | |||
d23eeecb36 | |||
b5b428f452 | |||
446e775143 | |||
e6fbd8e5d9 | |||
48a8739af3 | |||
291afbeccb | |||
9e313f6f2f | |||
aa1848cc63 | |||
cc865668a6 | |||
87158610ed | |||
532fbdb487 | |||
89839135fa | |||
668186d859 | |||
732b25d02c | |||
bce0f78fb9 | |||
4da0541b79 | |||
dce43b5ee5 | |||
591b957d0d | |||
6a148bdd6d | |||
680ff255cc | |||
e184026978 | |||
e0bbb58f38 | |||
e1d679d6f9 | |||
14858e8c18 | |||
cbb2222488 | |||
4c540a37de | |||
ab80dfd4b4 | |||
925e76f7a8 | |||
bfbb6193d4 | |||
6b0f9fac19 | |||
3c90febd1f | |||
ec97540436 | |||
9f7e3042ab | |||
c6c5168930 | |||
b74bdadca7 | |||
3ea5e723f8 | |||
c2eb01217f | |||
695cea8130 | |||
d157432163 | |||
b74ef4bdff | |||
6806986e0e | |||
b14b5117a1 | |||
191e1e1d5f | |||
a537168e2a | |||
302079db68 |
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:38371f6ef59ba89f89135dd5579d0952cc4d28adb452c25c194a248da70dc5fc
|
||||
size 29265781
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4c01a2db59226a198abd2c6eae857ab1028c91b616fbf80ade639aaec2e21021
|
||||
size 11151844
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:88d8daa5217f58e167897e962306c42382e7b142a33085ab17c6550146394fd9
|
||||
size 29643459
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:df644d51276ffeeb66096b374ca2693b1ffdc384b771bea376640e00f33cbf42
|
||||
size 29523888
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0111d7f31c26943620555f5495e00055569f04a24a7bc44ac96282bd7235269b
|
||||
size 132769320
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e76b809adccdc235d1824f01678bde9046c6577cd2a43ea532fd7d020d87991e
|
||||
size 132630348
|
@@ -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:020dd788fbf5783bd618dd670cf0cedbcc1bc2ba262934dc498a6543874c2cff
|
||||
size 11229730
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:18d487507724ddb461a9d822daaca04fcaa6c5382a3c441f8e9c299ce4aabec3
|
||||
size 132305585
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:859d1898f55b446a25d6f113cdb5f196a2fe51560fde0b596f553650e1855aeb
|
||||
size 132810297
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a44313209419f44cc293f1d08b545d81fd84672a0813d6e7d632a79b19cb0efa
|
||||
size 29189918
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9630132f3973f2e44cf589e93ba466dda5350856ee93fbcfa8e59d515938bc31
|
||||
size 11213109
|
@@ -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,11 +0,0 @@
|
||||
--- jdk/omr/compiler/control/OMROptions.hpp 2025-06-17 09:54:56.357954869 +0200
|
||||
+++ jdk/omr/compiler/control/OMROptions.hpp 2025-06-17 09:55:55.158986393 +0200
|
||||
@@ -2080,7 +2080,7 @@
|
||||
|
||||
public:
|
||||
OptionFlagArray(){ memset(_words, 0, sizeof(_words)); }
|
||||
- void operator=(const OptionFlagArray &other){ memcpy(_words, other.words, sizeof(_words)); }
|
||||
+ void operator=(const OptionFlagArray &other){ memcpy(_words, other._words, sizeof(_words)); }
|
||||
|
||||
bool isEmpty()
|
||||
{
|
@@ -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) {
|
@@ -1,11 +0,0 @@
|
||||
--- openj9/runtime/compiler/CMakeLists.txt
|
||||
+++ openj9/runtime/compiler/CMakeLists.txt
|
||||
@@ -391,7 +391,7 @@ set_source_files_properties(
|
||||
|
||||
if(OMR_OS_LINUX)
|
||||
set_property(TARGET j9jit APPEND_STRING PROPERTY
|
||||
- LINK_FLAGS " -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/build/scripts/j9jit.linux.exp")
|
||||
+ LINK_FLAGS " -Wl,-z,noexecstack -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/build/scripts/j9jit.linux.exp")
|
||||
target_link_libraries(j9jit PRIVATE m)
|
||||
elseif(OMR_OS_WINDOWS)
|
||||
target_sources(j9jit PRIVATE build/scripts/j9jit.def)
|
@@ -1,25 +0,0 @@
|
||||
--- a/omr/cmake/modules/platform/toolcfg/gnu.cmake
|
||||
+++ b/omr/cmake/modules/platform/toolcfg/gnu.cmake
|
||||
@@ -69,6 +69,11 @@ if(OMR_ARCH_X86)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
+if(OMR_OS_LINUX)
|
||||
+ list(APPEND OMR_PLATFORM_EXE_LINKER_OPTIONS "-Wl,-z,noexecstack")
|
||||
+ list(APPEND OMR_PLATFORM_SHARED_LINKER_OPTIONS "-Wl,-z,noexecstack")
|
||||
+endif()
|
||||
+
|
||||
if(OMR_HOST_ARCH STREQUAL "s390")
|
||||
list(APPEND OMR_PLATFORM_COMPILE_OPTIONS -march=z9-109)
|
||||
endif()
|
||||
--- a/openj9/runtime/compiler/CMakeLists.txt
|
||||
+++ b/openj9/runtime/compiler/CMakeLists.txt
|
||||
@@ -403,7 +403,7 @@ set_source_files_properties(
|
||||
|
||||
if(OMR_OS_LINUX)
|
||||
set_property(TARGET j9jit APPEND_STRING PROPERTY
|
||||
- LINK_FLAGS " -Wl,-z,noexecstack -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/build/scripts/j9jit.linux.exp")
|
||||
+ LINK_FLAGS " -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/build/scripts/j9jit.linux.exp")
|
||||
target_link_libraries(j9jit PRIVATE m)
|
||||
elseif(OMR_OS_WINDOWS)
|
||||
target_sources(j9jit PRIVATE build/scripts/j9jit.def)
|
@@ -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