!282 fix makes failure when gcc version is lower than 8

From: @eapen 
Reviewed-by: @kuenking111 
Signed-off-by: @kuenking111
This commit is contained in:
openeuler-ci-bot 2022-02-16 06:43:55 +00:00 committed by Gitee
commit bb550665a6
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 8 additions and 3 deletions

View File

@ -2,12 +2,14 @@ diff --git a/hotspot/make/linux/makefiles/adlc.make b/hotspot/make/linux/makefil
index 92b8b9b3..a24f9184 100644 index 92b8b9b3..a24f9184 100644
--- a/hotspot/make/linux/makefiles/adlc.make --- a/hotspot/make/linux/makefiles/adlc.make
+++ b/hotspot/make/linux/makefiles/adlc.make +++ b/hotspot/make/linux/makefiles/adlc.make
@@ -64,6 +64,9 @@ CXXFLAGS = $(SYSDEFS) $(INCLUDES) @@ -64,6 +64,11 @@ CXXFLAGS = $(SYSDEFS) $(INCLUDES)
# Force assertions on. # Force assertions on.
CXXFLAGS += -DASSERT CXXFLAGS += -DASSERT
+# Introduced in GCC 8.X +# Introduced in GCC 8.X
+CXXFLAGS += -Wno-error=stringop-overflow= +ifneq "$(shell expr \( $(CC_VER_MAJOR) \>= 8 \))" "0"
+ CXXFLAGS += -Wno-error=stringop-overflow=
+endif
+ +
# CFLAGS_WARN holds compiler options to suppress/enable warnings. # CFLAGS_WARN holds compiler options to suppress/enable warnings.
# Compiler warnings are treated as errors # Compiler warnings are treated as errors

View File

@ -916,7 +916,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r
Name: java-%{javaver}-%{origin} Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}.%{buildver} Version: %{javaver}.%{updatever}.%{buildver}
Release: 0 Release: 1
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
# and this change was brought into RHEL-4. java-1.5.0-ibm packages # and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a # also included the epoch in their virtual provides. This created a
@ -2209,6 +2209,9 @@ require "copy_jdk_configs.lua"
%endif %endif
%changelog %changelog
* Tue Feb 15 2022 eapen <zhangyipeng7@huawei.com> - 1:1.8.0.322-b06.1
- fix makes failure when gcc version is lower than 8
* Thu Feb 10 2022 eapen <zhangyipeng7@huawei.com> - 1:1.8.0.322-b06.0 * Thu Feb 10 2022 eapen <zhangyipeng7@huawei.com> - 1:1.8.0.322-b06.0
- upgrade to 8u322-b06(ga) - upgrade to 8u322-b06(ga)
- modified fast-serializer-jdk8.patch to adopt openjdk - modified fast-serializer-jdk8.patch to adopt openjdk