------------------------------------------------------------
revno: 669
committer: Matthias Klose <d...@ubuntu.com>
branch nick: openjdk8
timestamp: Thu 2016-02-25 16:45:34 +0100
message:
    [ Aurelian Jarno ]
    * 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*.
modified:
  debian/changelog
  debian/control
  debian/patches/jamvm-fix.diff
  debian/rules


--
lp:~openjdk/openjdk/openjdk8
https://code.launchpad.net/~openjdk/openjdk/openjdk8

Your team Debian Java Maintainers is subscribed to branch 
lp:~openjdk/openjdk/openjdk8.
To unsubscribe from this branch go to 
https://code.launchpad.net/~openjdk/openjdk/openjdk8/+edit-subscription
=== modified file 'debian/changelog'
--- debian/changelog	2016-02-25 13:01:31 +0000
+++ debian/changelog	2016-02-25 15:45:34 +0000
@@ -1,3 +1,14 @@
+openjdk-8 (8u72-b15-4) UNRELEASED; urgency=medium
+
+  * Regenrate the control file.
+
+  [ Aurelian Jarno ]
+  * 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*.
+
+ -- Matthias Klose <d...@ubuntu.com>  Thu, 25 Feb 2016 14:20:49 +0100
+
 openjdk-8 (8u72-b15-3) unstable; urgency=medium
 
   * Split out an openjdk-8-jdk-headless package.

=== modified file 'debian/control'
--- debian/control	2016-02-25 13:01:31 +0000
+++ debian/control	2016-02-25 15:45:34 +0000
@@ -165,7 +165,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}

=== modified file 'debian/patches/jamvm-fix.diff'
--- debian/patches/jamvm-fix.diff	2015-05-10 17:47:02 +0000
+++ debian/patches/jamvm-fix.diff	2016-02-25 15:45:34 +0000
@@ -93,3 +93,16 @@
  #elif OPENJDK_VERSION == 7
  #define CLASSLIB_CLASS_PAD_SIZE 18*sizeof(Object*)+2*sizeof(int)
  #else
+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

=== modified file 'debian/rules'
--- debian/rules	2016-02-25 13:01:31 +0000
+++ debian/rules	2016-02-25 15:45:34 +0000
@@ -152,7 +152,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 =
@@ -279,13 +279,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

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Reply via email to