Hello community,
here is the log from the commit of package java-1_7_0-openjdk for
openSUSE:Factory checked in at 2015-06-12 20:26:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-1_7_0-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_7_0-openjdk"
Changes:
--------
---
/work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk-bootstrap.changes
2015-05-20 23:48:15.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk-bootstrap.changes
2015-06-12 20:26:54.000000000 +0200
@@ -1,0 +2,25 @@
+Fri Jun 5 09:15:23 UTC 2015 - [email protected]
+
+- Added patch:
+ * signed-overflow.patch
+ - Upstream fix for signed overflow that makes
+ ChunkPool::allocate go OOM
+
+-------------------------------------------------------------------
+Tue Jun 2 16:54:06 UTC 2015 - [email protected]
+
+- Added patch:
+ * implicit-fortify-decl.patch
+ - Fix implicit-fortify-decl error due tu missing include
+
+-------------------------------------------------------------------
+Mon Jun 1 07:56:38 UTC 2015 - [email protected]
+
+- Removed patch:
+ * aarch64-linking.patch
+ - Problem exists in both aarch64 and default hotspot with gcc5.
+- Added patch:
+ * icedtea-2.5.5-gcc5.patch
+ - Fix build with gcc5.
+
+-------------------------------------------------------------------
java-1_7_0-openjdk.changes: same change
Old:
----
aarch64-linking.patch
New:
----
icedtea-2.5.5-gcc5.patch
implicit-fortify-decl.patch
signed-overflow.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_7_0-openjdk-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.3ZpIrL/_old 2015-06-12 20:26:56.000000000 +0200
+++ /var/tmp/diff_new_pack.3ZpIrL/_new 2015-06-12 20:26:56.000000000 +0200
@@ -98,6 +98,11 @@
%if 0%{?__isa_bits}
%global bits %{__isa_bits}
%endif
+# Reduce build time from 27 hours to 12 hours by only running test
+# suites on JIT architectures.
+%ifarch %{test_arches}
+%bcond_with tests
+%endif
%bcond_without bootstrap
%bcond_with zero
# Turn on/off some features depending on openSUSE version
@@ -163,8 +168,12 @@
#
# OpenJDK specific patches
#
-# Fix undefined symbols in the aarch64 tarball
-Patch105: aarch64-linking.patch
+# Fix signed integer overflows with gcc5
+Patch103: signed-overflow.patch
+# Fix implicit-fortify-decl
+Patch104: implicit-fortify-decl.patch
+# Fix undefined symbols with gcc5
+Patch105: icedtea-2.5.5-gcc5.patch
#
Patch106: java-1.7.0-openjdk-freetype-check-fix.patch
# Fix use of unintialized memory in adlc parser
@@ -277,11 +286,6 @@
%else
Provides: java-bootstrap = %{javaver}
%endif
-# Reduce build time from 27 hours to 12 hours by only running test
-# suites on JIT architectures.
-%ifarch %{test_arches}
-%bcond_with tests
-%endif
%if %{with_system_lcms}
# since 2.4.1 release, newest lcms2 is needed
BuildRequires: liblcms2-devel >= 2.5
@@ -579,10 +583,12 @@
%if ! %{with zero}
patch -p0 -i %{PATCH403}
%endif
-%else
-patch -p0 -i %{PATCH105}
%endif
+patch -p0 -i %{PATCH103}
+patch -p0 -i %{PATCH104}
+patch -p0 -i %{PATCH105}
+
patch -p0 -i %{PATCH107}
patch -p0 -R -i %{PATCH404}
++++++ java-1_7_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.3ZpIrL/_old 2015-06-12 20:26:56.000000000 +0200
+++ /var/tmp/diff_new_pack.3ZpIrL/_new 2015-06-12 20:26:56.000000000 +0200
@@ -98,6 +98,11 @@
%if 0%{?__isa_bits}
%global bits %{__isa_bits}
%endif
+# Reduce build time from 27 hours to 12 hours by only running test
+# suites on JIT architectures.
+%ifarch %{test_arches}
+%bcond_with tests
+%endif
%bcond_with bootstrap
%bcond_with zero
# Turn on/off some features depending on openSUSE version
@@ -163,8 +168,12 @@
#
# OpenJDK specific patches
#
-# Fix undefined symbols in the aarch64 tarball
-Patch105: aarch64-linking.patch
+# Fix signed integer overflows with gcc5
+Patch103: signed-overflow.patch
+# Fix implicit-fortify-decl
+Patch104: implicit-fortify-decl.patch
+# Fix undefined symbols with gcc5
+Patch105: icedtea-2.5.5-gcc5.patch
#
Patch106: java-1.7.0-openjdk-freetype-check-fix.patch
# Fix use of unintialized memory in adlc parser
@@ -277,11 +286,6 @@
%else
Provides: java-bootstrap = %{javaver}
%endif
-# Reduce build time from 27 hours to 12 hours by only running test
-# suites on JIT architectures.
-%ifarch %{test_arches}
-%bcond_with tests
-%endif
%if %{with_system_lcms}
# since 2.4.1 release, newest lcms2 is needed
BuildRequires: liblcms2-devel >= 2.5
@@ -579,10 +583,12 @@
%if ! %{with zero}
patch -p0 -i %{PATCH403}
%endif
-%else
-patch -p0 -i %{PATCH105}
%endif
+patch -p0 -i %{PATCH103}
+patch -p0 -i %{PATCH104}
+patch -p0 -i %{PATCH105}
+
patch -p0 -i %{PATCH107}
patch -p0 -R -i %{PATCH404}
++++++ icedtea-2.5.5-gcc5.patch ++++++
---
openjdk/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp
2015-04-22 09:29:31.417841397 +0200
+++
openjdk/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp
2015-04-22 09:29:57.801185277 +0200
@@ -79,6 +79,17 @@
}
}
+void G1SATBCardTableModRefBS::write_ref_array_pre(oop* dst, int count, bool
dest_uninitialized) {
+ if (!dest_uninitialized) {
+ write_ref_array_pre_work(dst, count);
+ }
+}
+void G1SATBCardTableModRefBS::write_ref_array_pre(narrowOop* dst, int count,
bool dest_uninitialized) {
+ if (!dest_uninitialized) {
+ write_ref_array_pre_work(dst, count);
+ }
+}
+
bool G1SATBCardTableModRefBS::mark_card_deferred(size_t card_index) {
jbyte val = _byte_map[card_index];
// It's already processed
---
openjdk/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp
2015-04-22 09:29:31.417841397 +0200
+++
openjdk/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp
2015-04-22 09:29:57.801185277 +0200
@@ -85,16 +85,8 @@
}
template <class T> void write_ref_array_pre_work(T* dst, int count);
- virtual void write_ref_array_pre(oop* dst, int count, bool
dest_uninitialized) {
- if (!dest_uninitialized) {
- write_ref_array_pre_work(dst, count);
- }
- }
- virtual void write_ref_array_pre(narrowOop* dst, int count, bool
dest_uninitialized) {
- if (!dest_uninitialized) {
- write_ref_array_pre_work(dst, count);
- }
- }
+ virtual void write_ref_array_pre(oop* dst, int count, bool
dest_uninitialized);
+ virtual void write_ref_array_pre(narrowOop* dst, int count, bool
dest_uninitialized);
/*
Claimed and deferred bits are used together in G1 during the evacuation
++++++ implicit-fortify-decl.patch ++++++
--- openjdk/hotspot/agent/src/os/linux/salibelf.c 2015-06-02
18:50:52.784881664 +0200
+++ openjdk/hotspot/agent/src/os/linux/salibelf.c 2015-06-02
18:51:16.467354981 +0200
@@ -25,6 +25,7 @@
#include "salibelf.h"
#include <stdlib.h>
#include <unistd.h>
+#include <string.h>
extern void print_debug(const char*,...);
++++++ signed-overflow.patch ++++++
--- openjdk/hotspot/src/share/vm/opto/type.cpp Thu Apr 23 16:38:08 2015 +0200
+++ openjdk/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;
}
