Fridrich Strba 2023-03-28 10:02:30 +00:00 committed by Git OBS Bridge
parent 1c38b3b23e
commit 661b50fb2a
2 changed files with 25 additions and 2 deletions

View File

@ -121,6 +121,8 @@ Patch20: loadAssistiveTechnologies.patch
#
Patch31: aarch64.patch
#
Patch32: stringop-overflow.patch
#
# OpenJDK specific patches
#
Patch302: disable-doclint-by-default.patch
@ -373,6 +375,7 @@ rm -rvf src/java.desktop/share/native/liblcms/lcms2*
%patch20 -p1
%patch31 -p1
%patch32 -p1
%patch302 -p1
%patch303 -p1
@ -396,8 +399,8 @@ done
%build
export ARCH_DATA_MODEL=64
EXTRA_CFLAGS="-Wno-error -Wno-stringop-overflow -Wno-error=stringop-overflow -Wno-maybe-uninitialized -fno-delete-null-pointer-checks -fno-lifetime-dse"
EXTRA_CPP_FLAGS="-Wno-error -Wno-stringop-overflow -Wno-error=stringop-overflow -Wno-maybe-uninitialized -std=gnu++98 -fno-delete-null-pointer-checks -fno-lifetime-dse"
EXTRA_CFLAGS="-Wno-error -Wno-maybe-uninitialized -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
EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-strict-aliasing"

20
stringop-overflow.patch Normal file
View File

@ -0,0 +1,20 @@
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/OMRSimplifierHandlers.hpp"
@@ -17404,5 +17407,6 @@
return node;
}
+#pragma GCC diagnostic pop
#endif