Hello community,
here is the log from the commit of package java-1_7_0-openjdk for
openSUSE:Factory checked in at 2016-06-29 15:02:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2016-06-14 23:05:16.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk-bootstrap.changes
2016-06-29 15:02:55.000000000 +0200
@@ -1,0 +2,12 @@
+Sun Jun 19 08:02:26 UTC 2016 - [email protected]
+
+- aarch64-remove-unused-code.patch: remove unsused definition of min
+ conflicting with macro
+
+-------------------------------------------------------------------
+Tue Jun 14 11:46:16 UTC 2016 - [email protected]
+
+- Fix aarch64 running with 48 bits va space (bsc#984684)
+ * hotspot-aarch64-fix-48bit-va.patch
+
+-------------------------------------------------------------------
java-1_7_0-openjdk.changes: same change
New:
----
aarch64-remove-unused-code.patch
hotspot-aarch64-fix-48bit-va.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_7_0-openjdk-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.xsnMv9/_old 2016-06-29 15:02:57.000000000 +0200
+++ /var/tmp/diff_new_pack.xsnMv9/_new 2016-06-29 15:02:57.000000000 +0200
@@ -17,8 +17,8 @@
%{!?aarch64:%global aarch64 aarch64 arm64 armv8}
-%global jit_arches %ix86 x86_64 ppc64 ppc64le %arm %aarch64
-%global test_arches %ix86 x86_64 ppc64 ppc64le
+%global jit_arches %{ix86} x86_64 ppc64 ppc64le %{arm} %{aarch64}
+%global test_arches %{ix86} x86_64 ppc64 ppc64le
%global icedtea_version 2.6.6
%global icedtea_sound_version 1.0.1
%global mauvedate 2008-10-22
@@ -76,7 +76,7 @@
%global archbuild %{_arch}
%global archinstall %{_arch}
%endif
-%ifarch %ix86
+%ifarch %{ix86}
%global archbuild i586
%global archinstall i386
%endif
@@ -84,11 +84,11 @@
%global archbuild amd64
%global archinstall amd64
%endif
-%ifarch %arm
+%ifarch %{arm}
%global archbuild arm
%global archinstall arm
%endif
-%ifarch %aarch64
+%ifarch %{aarch64}
%global archbuild aarch64
%global archinstall aarch64
%endif
@@ -102,7 +102,7 @@
%endif
# bnc#542545
# 32-bit versus 64-bit specific provides:
-%ifarch %ix86 ppc s390
+%ifarch %{ix86} ppc s390
%global bits 32
%endif
%ifarch x86_64 ia64 s390x
@@ -194,6 +194,8 @@
Patch108: java-1.7.0-openjdk-thread-stack-size.patch
# allow to create hs_pid.log in tmp (in 700 permissions) if working directory
is unwritable
Patch200: abrt_friendly_hs_log_jdk7.patch
+# remove unsused definition of min conflicting with macro
+Patch201: aarch64-remove-unused-code.patch
#
# Optional component packages
#
@@ -212,6 +214,7 @@
Patch1006: java-1_7_0-openjdk-override.patch
Patch2000: java-1_7_0-openjdk-gcc6.patch
Patch10011: openjdk-7-src-b147-no-return-in-nonvoid-hotspot.patch
+Patch10012: hotspot-aarch64-fix-48bit-va.patch
BuildRequires: alsa-lib-devel
#BuildRequires: xalan-j2
# make sure to use bootstrap requires of ant
@@ -359,7 +362,7 @@
%if %{with zero}
BuildRequires: libffi-devel
%endif
-%ifarch %arm
+%ifarch %{arm}
BuildRequires: libffi-devel
%endif
@@ -567,7 +570,7 @@
--disable-infinality \
--disable-downloading \
--with-abs-install-dir=%{_jvmdir}/%{sdkdir} \
-%ifnarch %arm %aarch64
+%ifnarch %{arm} %{aarch64}
--with-parallel-jobs="${NUM_PROC}" \
%endif
--with-pkgversion="suse-%{release}-%{_arch}" \
@@ -616,6 +619,7 @@
patch -p0 -i %{PATCH106}
patch -p0 -i %{PATCH108}
patch -p0 -i %{PATCH200}
+patch -p0 -i %{PATCH201}
%if ! %{with zero}
patch -p0 -i %{PATCH403}
@@ -638,6 +642,7 @@
patch -p1 -i %{PATCH1001}
patch -p1 -i %{PATCH10011}
+patch -p1 -i %{PATCH10012}
%if %{with bootstrap}
patch -p0 -i %{PATCH1006}
@@ -1138,7 +1143,7 @@
%dir %{_jvmdir}/%{sdkdir}/jre/bin
%dir %{_jvmdir}/%{sdkdir}/jre/lib
%dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}
-%ifarch %ix86
+%ifarch %{ix86}
%{_jvmdir}/%{sdkdir}/jre/lib/i386/client/Xusage.txt
%endif
%dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/headless
@@ -1162,7 +1167,7 @@
%exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/xawt/libmawt.so
%exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libjavagtk.so
-%ifarch %ix86
+%ifarch %{ix86}
%dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/client
%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/client/libjsig.so
%attr(755,root,root)
%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/client/libjvm.so
@@ -1176,7 +1181,7 @@
%config(noreplace) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/jvm.cfg
%if ! %{with zero}
-%ifnarch ppc64 ppc64le %arm
+%ifnarch ppc64 ppc64le %{arm}
%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/classes.jsa
%endif
%endif
++++++ java-1_7_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.xsnMv9/_old 2016-06-29 15:02:57.000000000 +0200
+++ /var/tmp/diff_new_pack.xsnMv9/_new 2016-06-29 15:02:57.000000000 +0200
@@ -17,8 +17,8 @@
%{!?aarch64:%global aarch64 aarch64 arm64 armv8}
-%global jit_arches %ix86 x86_64 ppc64 ppc64le %arm %aarch64
-%global test_arches %ix86 x86_64 ppc64 ppc64le
+%global jit_arches %{ix86} x86_64 ppc64 ppc64le %{arm} %{aarch64}
+%global test_arches %{ix86} x86_64 ppc64 ppc64le
%global icedtea_version 2.6.6
%global icedtea_sound_version 1.0.1
%global mauvedate 2008-10-22
@@ -76,7 +76,7 @@
%global archbuild %{_arch}
%global archinstall %{_arch}
%endif
-%ifarch %ix86
+%ifarch %{ix86}
%global archbuild i586
%global archinstall i386
%endif
@@ -84,11 +84,11 @@
%global archbuild amd64
%global archinstall amd64
%endif
-%ifarch %arm
+%ifarch %{arm}
%global archbuild arm
%global archinstall arm
%endif
-%ifarch %aarch64
+%ifarch %{aarch64}
%global archbuild aarch64
%global archinstall aarch64
%endif
@@ -102,7 +102,7 @@
%endif
# bnc#542545
# 32-bit versus 64-bit specific provides:
-%ifarch %ix86 ppc s390
+%ifarch %{ix86} ppc s390
%global bits 32
%endif
%ifarch x86_64 ia64 s390x
@@ -194,6 +194,8 @@
Patch108: java-1.7.0-openjdk-thread-stack-size.patch
# allow to create hs_pid.log in tmp (in 700 permissions) if working directory
is unwritable
Patch200: abrt_friendly_hs_log_jdk7.patch
+# remove unsused definition of min conflicting with macro
+Patch201: aarch64-remove-unused-code.patch
#
# Optional component packages
#
@@ -212,6 +214,7 @@
Patch1006: java-1_7_0-openjdk-override.patch
Patch2000: java-1_7_0-openjdk-gcc6.patch
Patch10011: openjdk-7-src-b147-no-return-in-nonvoid-hotspot.patch
+Patch10012: hotspot-aarch64-fix-48bit-va.patch
BuildRequires: alsa-lib-devel
#BuildRequires: xalan-j2
# make sure to use bootstrap requires of ant
@@ -359,7 +362,7 @@
%if %{with zero}
BuildRequires: libffi-devel
%endif
-%ifarch %arm
+%ifarch %{arm}
BuildRequires: libffi-devel
%endif
@@ -567,7 +570,7 @@
--disable-infinality \
--disable-downloading \
--with-abs-install-dir=%{_jvmdir}/%{sdkdir} \
-%ifnarch %arm %aarch64
+%ifnarch %{arm} %{aarch64}
--with-parallel-jobs="${NUM_PROC}" \
%endif
--with-pkgversion="suse-%{release}-%{_arch}" \
@@ -616,6 +619,7 @@
patch -p0 -i %{PATCH106}
patch -p0 -i %{PATCH108}
patch -p0 -i %{PATCH200}
+patch -p0 -i %{PATCH201}
%if ! %{with zero}
patch -p0 -i %{PATCH403}
@@ -638,6 +642,7 @@
patch -p1 -i %{PATCH1001}
patch -p1 -i %{PATCH10011}
+patch -p1 -i %{PATCH10012}
%if %{with bootstrap}
patch -p0 -i %{PATCH1006}
@@ -1138,7 +1143,7 @@
%dir %{_jvmdir}/%{sdkdir}/jre/bin
%dir %{_jvmdir}/%{sdkdir}/jre/lib
%dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}
-%ifarch %ix86
+%ifarch %{ix86}
%{_jvmdir}/%{sdkdir}/jre/lib/i386/client/Xusage.txt
%endif
%dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/headless
@@ -1162,7 +1167,7 @@
%exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/xawt/libmawt.so
%exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libjavagtk.so
-%ifarch %ix86
+%ifarch %{ix86}
%dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/client
%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/client/libjsig.so
%attr(755,root,root)
%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/client/libjvm.so
@@ -1176,7 +1181,7 @@
%config(noreplace) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/jvm.cfg
%if ! %{with zero}
-%ifnarch ppc64 ppc64le %arm
+%ifnarch ppc64 ppc64le %{arm}
%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/classes.jsa
%endif
%endif
++++++ aarch64-remove-unused-code.patch ++++++
# HG changeset patch
# User aph
# Date 1456412384 0
# Thu Feb 25 14:59:44 2016 +0000
# Node ID 5e587a29a6aac06d6b5a7ebeea99a291d82520c8
# Parent 15b7a15b93103e76338d1bc3d6c6fc37f1805b88
8150652, PR2922: Remove unused code in AArch64 back end
Reviewed-by: kvn
diff --git a/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp
b/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp
--- openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp
+++ openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp
@@ -207,10 +207,6 @@
return (r->reg2stack() + SharedRuntime::out_preserve_stack_slots()) *
VMRegImpl::stack_slot_size;
}
-template <class T> static const T& min (const T& a, const T& b) {
- return (a > b) ? b : a;
-}
-
// ---------------------------------------------------------------------------
// Read the array of BasicTypes from a signature, and compute where the
// arguments should go. Values in the VMRegPair regs array refer to 4-byte
++++++ hotspot-aarch64-fix-48bit-va.patch ++++++
# HG changeset patch
# User enevill
# Date 1454603068 0
# Thu Feb 04 16:24:28 2016 +0000
# Node ID ded2073b67bdd9c9f2ae924397341b762329aaef
# Parent f918c20107d9acb189498095308c2f49c8dbc84e
8148783: aarch64: SEGV running SpecJBB2013
Summary: Fix calculation of offset for adrp
Reviewed-by: aph
diff --git a/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
b/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
--- a/openjdk/hotspot/src/cpu/aarch64/vm/assembler_aarch64.cpp
+++ b/openjdk/hotspot/src/cpu/aarch64/vm/assembler_aarch64.cpp
@@ -1632,7 +1632,10 @@ int MacroAssembler::pd_patch_instruction_size(address
branch, address target) {
Instruction_aarch64::extract(insn2, 4, 0)) {
// movk #imm16<<32
Instruction_aarch64::patch(branch + 4, 20, 5, (uint64_t)target >> 32);
- offset &= (1<<20)-1;
+ long dest = ((long)target & 0xffffffffL) | ((long)branch &
0xffff00000000L);
+ long pc_page = (long)branch >> 12;
+ long adr_page = (long)dest >> 12;
+ offset = adr_page - pc_page;
instructions = 2;
}
}
@@ -4920,11 +4923,12 @@ void MacroAssembler::adrp(Register reg1, const Address
&dest, unsigned long &byt
if (offset_high >= -(1<<20) && offset_low < (1<<20)) {
_adrp(reg1, dest.target());
} else {
- unsigned long pc_page = (unsigned long)pc() >> 12;
- long offset = dest_page - pc_page;
- offset = (offset & ((1<<20)-1)) << 12;
- _adrp(reg1, pc()+offset);
- movk(reg1, ((unsigned long)dest.target() >> 32), 32);
+ unsigned long source = (unsigned long)pc();
+ unsigned long target = (unsigned long)dest.target();
+ unsigned long adrp_target = (target & 0xffffffffUL) | (source &
0xffff00000000UL);
+
+ _adrp(reg1, (address)adrp_target);
+ movk(reg1, target >> 32, 32);
}
byte_offset = (unsigned long)dest.target() & 0xfff;
}
