[gcc-6] 177/401: Replace libjava-mips64el-proposed.diff by the corresponding patch taken from trunk.

[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 675d82dc6468f6167b431d10a449d4ed442eacde
Author: aurel32 <aurel32 at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Thu Jul 14 11:41:49 2016 +0000

    Replace libjava-mips64el-proposed.diff by the corresponding patch
    taken from trunk.
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8922 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                              |  5 +++
 debian/patches/libjava-mips64el-proposed.diff | 19 ---------
 debian/patches/libjava-mips64el.diff          | 58 +++++++++++++++++++++++++++
 debian/rules.patch                            |  6 +--
 4 files changed, 64 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 57b3ed6..2234141 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 gcc-6 (6.1.1-10) UNRELEASED; urgency=medium
 
+  [ Matthias Klose ]
   * Build-depend on gnat-6 instead of gnat-5 on development distros.
 
+  [ Aurelien Jarno ]
+  * Replace libjava-mips64el-proposed.diff by the corresponding patch
+    taken from trunk.
+
  -- Matthias Klose <doko at debian.org>  Fri, 08 Jul 2016 14:21:00 +0200
 
 gcc-6 (6.1.1-9) unstable; urgency=medium
diff --git a/debian/patches/libjava-mips64el-proposed.diff b/debian/patches/libjava-mips64el-proposed.diff
deleted file mode 100644
index feb39cd..0000000
--- a/debian/patches/libjava-mips64el-proposed.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-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/patches/libjava-mips64el.diff b/debian/patches/libjava-mips64el.diff
new file mode 100644
index 0000000..d01afe0
--- /dev/null
+++ b/debian/patches/libjava-mips64el.diff
@@ -0,0 +1,58 @@
+2016-07-13  Matthew Fortune  <matthew.fortune at imgtec.com>
+
+	* java/lang/reflect/natVMProxy.cc (unbox): Use ffi_arg for
+	integer return types smaller than a word.
+
+2016-07-13  Matthew Fortune  <matthew.fortune at imgtec.com>
+
+	* interpret-run.cc: Use ffi_arg for FFI integer return types.
+
+--- 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:
+--- a/src/libjava/java/lang/reflect/natVMProxy.cc
++++ b/src/libjava/java/lang/reflect/natVMProxy.cc
+@@ -272,17 +272,17 @@ unbox (jobject o, jclass klass, void *rvalue, FFI_TYPE type)
+   if (klass == JvPrimClass (byte))
+     {
+       _Jv_CheckCast (&Byte::class$, o);
+-      *(jbyte*)rvalue = ((Byte*)o)->byteValue();
++      *(ffi_arg*)rvalue = ((Byte*)o)->byteValue();
+     }
+   else if (klass == JvPrimClass (short))
+     {
+       _Jv_CheckCast (&Short::class$, o);
+-      *(jshort*)rvalue = ((Short*)o)->shortValue();
++      *(ffi_arg*)rvalue = ((Short*)o)->shortValue();
+     }
+   else if (klass == JvPrimClass (int))
+     {
+       _Jv_CheckCast (&Integer::class$, o);
+-      *(jint*)rvalue = ((Integer*)o)->intValue();
++      *(ffi_arg*)rvalue = ((Integer*)o)->intValue();
+     }
+   else if (klass == JvPrimClass (long))
+     {
+@@ -302,12 +302,12 @@ unbox (jobject o, jclass klass, void *rvalue, FFI_TYPE type)
+   else if (klass == JvPrimClass (boolean))
+     {
+       _Jv_CheckCast (&Boolean::class$, o);
+-      *(jboolean*)rvalue = ((Boolean*)o)->booleanValue();
++      *(ffi_arg*)rvalue = ((Boolean*)o)->booleanValue();
+     }
+   else if (klass == JvPrimClass (char))
+     {
+       _Jv_CheckCast (&Character::class$, o);
+-      *(jchar*)rvalue = ((Character*)o)->charValue();
++      *(ffi_arg*)rvalue = ((Character*)o)->charValue();
+     }
+   else
+     JvFail ("Bad ffi type in proxy");
diff --git a/debian/rules.patch b/debian/rules.patch
index 4cc38d5..bd3c29e 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -87,6 +87,7 @@ debian_patches += \
 	gcc-SOURCE_DATE_EPOCH-2 \
 	cmd-go-combine-gccgo-s-ld-and-ldShared-methods \
 	vulcan-cpu$(if $(with_linaro_branch),-linaro) \
+	libjava-mips64el \
 
 # this is still needed on powerpc, e.g. firefox and insighttoolkit4 will ftbfs.
 ifneq (,$(filter $(DEB_TARGET_ARCH),powerpc))
@@ -230,11 +231,6 @@ 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