rpm/java-1_8_0-openjdk
SHA256
1
0
Fork 0
forked from pool/java-1_8_0-openjdk
Code Pull Requests Activity

Accepting request 310554 from Java:Factory

Browse Source 
Fix build with gcc5

OBS-URL: https://build.opensuse.org/request/show/310554
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/java-1_8_0-openjdk?expand=0&rev=30
This commit is contained in:
Dominique Leuenberger 2015-06-06 07:54:29 +00:00 committed by Git OBS Bridge
commit 99827ac49f
3 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
java-1_8_0-openjdk.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jun 5 12:58:27 UTC 2015 - fstrba@suse.com
- Added patch:
* signed-overflow.patch
- fix OOM due to signed overflow shown by gcc5 build
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 26 08:36:52 UTC 2015 - fstrba@suse.com Tue May 26 08:36:52 UTC 2015 - fstrba@suse.com

4
java-1_8_0-openjdk.spec
View File

@ -233,6 +233,8 @@ Patch99: applet-hole.patch
# JVM heap size changes for s390 (thanks to aph) # JVM heap size changes for s390 (thanks to aph)
Patch100: s390-java-opts.patch Patch100: s390-java-opts.patch
Patch101: s390-size_t.patch Patch101: s390-size_t.patch
# Fix OOM due to signed overflow
Patch102: signed-overflow.patch
# Patch for PPC/PPC64 # Patch for PPC/PPC64
Patch103: ppc-zero-hotspot.patch Patch103: ppc-zero-hotspot.patch
# Patches for system libraries # Patches for system libraries
@ -532,6 +534,8 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*
%patch101 -p1 %patch101 -p1
%endif %endif
%patch102 -p1
%ifarch ppc ppc64 ppc64le %ifarch ppc ppc64 ppc64le
# PPC fixes # PPC fixes
%patch103 -p1 %patch103 -p1

35
signed-overflow.patch Normal file
View File

@ -0,0 +1,35 @@
--- jdk8/hotspot/src/share/vm/opto/type.cpp Thu Apr 23 16:38:08 2015 +0200
+++ jdk8/hotspot/src/share/vm/opto/type.cpp Wed Apr 29 12:23:48 2015 -0700
@@ -1158,11 +1158,11 @@
// Certain normalizations keep us sane when comparing types.
// The 'SMALLINT' covers constants and also CC and its relatives.
if (lo <= hi) {
- if ((juint)(hi - lo) <= SMALLINT) w = Type::WidenMin;
- if ((juint)(hi - lo) >= max_juint) w = Type::WidenMax; // TypeInt::INT
+ if (((juint)hi - lo) <= SMALLINT) w = Type::WidenMin;
+ if (((juint)hi - lo) >= max_juint) w = Type::WidenMax; // TypeInt::INT
} else {
- if ((juint)(lo - hi) <= SMALLINT) w = Type::WidenMin;
- if ((juint)(lo - hi) >= max_juint) w = Type::WidenMin; // dual TypeInt::INT
+ if (((juint)lo - hi) <= SMALLINT) w = Type::WidenMin;
+ if (((juint)lo - hi) >= max_juint) w = Type::WidenMin; // dual TypeInt::INT
}
return w;
}
@@ -1416,11 +1416,11 @@
// Certain normalizations keep us sane when comparing types.
// The 'SMALLINT' covers constants.
if (lo <= hi) {
- if ((julong)(hi - lo) <= SMALLINT) w = Type::WidenMin;
- if ((julong)(hi - lo) >= max_julong) w = Type::WidenMax; // TypeLong::LONG
+ if (((julong)hi - lo) <= SMALLINT) w = Type::WidenMin;
+ if (((julong)hi - lo) >= max_julong) w = Type::WidenMax; // TypeLong::LONG
} else {
- if ((julong)(lo - hi) <= SMALLINT) w = Type::WidenMin;
- if ((julong)(lo - hi) >= max_julong) w = Type::WidenMin; // dual TypeLong::LONG
+ if (((julong)lo - hi) <= SMALLINT) w = Type::WidenMin;
+ if (((julong)lo - hi) >= max_julong) w = Type::WidenMin; // dual TypeLong::LONG
}
return w;
}