[gcc-6] 165/401: Apply proposed patch from Matthew Fortune to fix libjava on mips64el.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.

commit 272f6deea00ca910748b57ed10d381db23905b41
Author: aurel32 <aurel32 at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Thu Jun 23 11:25:47 2016 +0000

    Apply proposed patch from Matthew Fortune to fix libjava on mips64el.
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8896 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                              |  7 +++++++
 debian/patches/libjava-mips64el-proposed.diff | 19 +++++++++++++++++++
 debian/rules.patch                            |  5 +++++
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index df53ff5..9b5cf4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gcc-6 (6.1.1-8) UNRELEASED; urgency=medium
+
+  [ Aurelien Jarno ]
+  * Apply proposed patch from Matthew Fortune to fix libjava on mips64el.
+
+ -- Matthias Klose <doko at debian.org>  Thu, 23 Jun 2016 13:20:40 +0200
+
 gcc-6 (6.1.1-7) unstable; urgency=medium
 
   * Update to SVN 20160620 (r237590, 6.1.1) from the gcc-6-branch.
diff --git a/debian/patches/libjava-mips64el-proposed.diff b/debian/patches/libjava-mips64el-proposed.diff
new file mode 100644
index 0000000..feb39cd
--- /dev/null
+++ b/debian/patches/libjava-mips64el-proposed.diff
@@ -0,0 +1,19 @@
+https://gcc.gnu.org/ml/java-patches/2016-q2/msg00020.html
+
+2016-06-22  Matthew Fortune <Matthew.Fortune at imgtec.com>
+
+libjava/
+
+	* interpret-run.cc: Return integers as ffi_arg instead of jint.
+
+--- a/src/libjava/interpret-run.cc
++++ b/src/libjava/interpret-run.cc
+@@ -1838,7 +1838,7 @@ details.  */
+       return;
+ 
+     insn_ireturn:
+-      *(jint *) retp = POPI ();
++      *(ffi_arg *) retp = POPI ();
+       return;
+ 
+     insn_return:
diff --git a/debian/rules.patch b/debian/rules.patch
index 49b9d95..9737c10 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -229,6 +229,11 @@ ifeq ($(DEB_TARGET_ARCH),powerpcspe)
   debian_patches += powerpc_nofprs
 endif
 
+# Proposed patch to fix libjava on mips64el
+ifeq ($(DEB_TARGET_ARCH),mips64el)
+  debian_patches += libjava-mips64el-proposed
+endif
+
 #debian_patches += link-libs
 
 # all patches below this line are applied for gcc-snapshot builds as well

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-6.git