tag 815855 + patch
thanks
Here is patch fixing the mips* issues that have recently been
introduced:
diff -u openjdk-8-8u72-b15/debian/changelog openjdk-8-8u72-b15/debian/changelog
--- openjdk-8-8u72-b15/debian/changelog
+++ openjdk-8-8u72-b15/debian/changelog
@@ -1,3 +1,11 @@
+openjdk-8 (8u72-b15-2.1) UNRELEASED; urgency=medium
+
+ * Reapply patch to fix jamvm on mips*, lost in version 8u72-b15-1.
+ * Build jamvm again on mips and mipsel.
+ * Build with GCC 5 on mips*.
+
+ -- Aurelien Jarno <aure...@debian.org> Thu, 25 Feb 2016 16:17:10 +0100
+
openjdk-8 (8u72-b15-2) unstable; urgency=medium
* Bump the priority for OpenJDK 8 as the default.
diff -u openjdk-8-8u72-b15/debian/control openjdk-8-8u72-b15/debian/control
--- openjdk-8-8u72-b15/debian/control
+++ openjdk-8-8u72-b15/debian/control
@@ -146,7 +146,7 @@
from the IcedTea project.
Package: openjdk-8-jre-jamvm
-Architecture: amd64 armel armhf i386 powerpc kfreebsd-i386 kfreebsd-amd64
+Architecture: amd64 armel armhf i386 powerpc kfreebsd-i386 kfreebsd-amd64 mips
mipsel
Multi-Arch: same
Priority: extra
Pre-Depends: ${dpkg:Depends}
diff -u openjdk-8-8u72-b15/debian/patches/jamvm-fix.diff
openjdk-8-8u72-b15/debian/patches/jamvm-fix.diff
--- openjdk-8-8u72-b15/debian/patches/jamvm-fix.diff
+++ openjdk-8-8u72-b15/debian/patches/jamvm-fix.diff
@@ -95,0 +96,13 @@
+diff -u -ur a/src/os/linux/mips/callNative.S b/src/os/linux/mips/callNative.S
+--- jamvm/jamvm/src/os/linux/mips/callNative.S
++++ jamvm/jamvm/src/os/linux/mips/callNative.S
+@@ -157,8 +157,7 @@
+
+ ret_double:
+ #ifdef __mips_hard_float
+- swc1 $f0,0($8)
+- swc1 $f1,4($8)
++ sdc1 $f0,0($8)
+ addu $8,8
+ j return
+ #endif
diff -u openjdk-8-8u72-b15/debian/rules openjdk-8-8u72-b15/debian/rules
--- openjdk-8-8u72-b15/debian/rules
+++ openjdk-8-8u72-b15/debian/rules
@@ -151,7 +151,7 @@
cacao_archs =
ifeq (,$(filter $(distrel),squeeze lucid))
- jamvm_archs = amd64 armel armhf i386 powerpc kfreebsd-i386 kfreebsd-amd64
+ jamvm_archs = amd64 armel armhf i386 powerpc kfreebsd-i386 kfreebsd-amd64
mips mipsel
endif
ifeq (,$(filter $(distrel),wheezy squeeze lucid))
jamvm_defaults =
@@ -278,13 +278,8 @@
export CC = gcc-4.9
export CXX = g++-4.9
else ifneq (,$(filter $(distrel),sid stretch wily))
- ifneq (,$(filter $(DEB_HOST_ARCH), mips mips64 mips64 mips64el))
- export CC = $(DEB_HOST_GNU_TYPE)-gcc-4.9
- export CXX = $(DEB_HOST_GNU_TYPE)-g++-4.9
- else
- export CC = $(DEB_HOST_GNU_TYPE)-gcc-5
- export CXX = $(DEB_HOST_GNU_TYPE)-g++-5
- endif
+ export CC = $(DEB_HOST_GNU_TYPE)-gcc-5
+ export CXX = $(DEB_HOST_GNU_TYPE)-g++-5
else
export CC = $(DEB_HOST_GNU_TYPE)-gcc-5
export CXX = $(DEB_HOST_GNU_TYPE)-g++-5
--
Aurelien Jarno GPG: 4096R/1DDD8C9B
aurel...@aurel32.net http://www.aurel32.net
