[gcc-6] 119/401: - Don't encode the minor version in the gcj abi version.

[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 78e36a92751a257a9a450e49a37b733b6dde9616
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Thu Apr 28 08:32:05 2016 +0000

        - Don't encode the minor version in the gcj abi version.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8795 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                |  5 +++--
 debian/patches/svn-updates.diff | 43 ++++++++++++++++++++++++++++++++++++++---
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5d0e5fa..f7a3a0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,10 @@ gcc-6 (6.1.0-1) UNRELEASED; urgency=medium
 
   * GCC 6.1.0 release.
     - Fix PR bootstrap/70704, PR tree-optimization/70780, PR libgfortran/70684.
-  * Update to SVN 20160427 (r235529, 6.1.1) from the gcc-6-branch.
+  * Update to SVN 20160428 (r235548, 6.1.1) from the gcc-6-branch.
     - Fix PR middle-end/70680, PR target/70750 (x86), PR ipa/70785,
       PR sanitizer/70712, PR target/70728 (x86).
+    - Don't encode the minor version in the gcj abi version.
 
   [ Aurelien Jarno ]
   * Apply proposed patch for PR target/68273 (Wrong code on mips/mipsel due to
@@ -16,7 +17,7 @@ gcc-6 (6.1.0-1) UNRELEASED; urgency=medium
   * Rename libgccjit-5-dbg to libgccjit0-dbg.
   * Fix libjava testsuite with dejagnu 1.6, taken from the trunk.
 
- -- Matthias Klose <doko at debian.org>  Wed, 27 Apr 2016 21:59:38 +0200
+ -- Matthias Klose <doko at debian.org>  Thu, 28 Apr 2016 10:31:38 +0200
 
 gcc-6 (6.0.1-2) unstable; urgency=medium
 
diff --git a/debian/patches/svn-updates.diff b/debian/patches/svn-updates.diff
index d836dc0..de22cad 100644
--- a/debian/patches/svn-updates.diff
+++ b/debian/patches/svn-updates.diff
@@ -1,10 +1,10 @@
-# DP: updates from the 6 branch upto 20160427 (r235529).
+# DP: updates from the 6 branch upto 20160428 (r235548).
 
 last_update()
 {
 	cat > ${dir}LAST_UPDATED <EOF
-Wed Apr 27 21:35:09 CEST 2016
-Wed Apr 27 19:35:09 UTC 2016 (revision 235529)
+Thu Apr 28 10:26:53 CEST 2016
+Thu Apr 28 08:26:53 UTC 2016 (revision 235548)
 EOF
 }
 
@@ -193,6 +193,43 @@ Index: libgomp/testsuite/libgomp.c/pr70680-2.c
 +  f4 ();
 +  return 0;
 +}
+Index: gcc/java/decl.c
+===================================================================
+--- a/src/gcc/java/decl.c	(.../tags/gcc_6_1_0_release)
++++ b/src/gcc/java/decl.c	(.../branches/gcc-6-branch)
+@@ -540,9 +540,9 @@
+   else /* C++ ABI */
+     {
+       /* Implicit in this computation is the idea that we won't break the
+-	 old-style binary ABI in a sub-minor release (e.g., from 4.0.0 to
+-	 4.0.1).  */
+-      abi_version = 100000 * major + 1000 * minor;
++	 old-style binary ABI in a sub-minor release (e.g., from 6.0 to
++	 6.1).  */
++      abi_version = 100000 * major;
+     }
+   if (flag_bootstrap_classes)
+     abi_version |= FLAG_BOOTSTRAP_LOADER;
+Index: gcc/java/ChangeLog
+===================================================================
+--- a/src/gcc/java/ChangeLog	(.../tags/gcc_6_1_0_release)
++++ b/src/gcc/java/ChangeLog	(.../branches/gcc-6-branch)
+@@ -1,3 +1,8 @@
++2016-04-28  Matthias Klose  <doko at ubuntu.com>
++
++	* decl.c (parse_version): Don't encode the minor version in the abi
++	version.
++
+ 2016-04-27  Release Manager
+ 
+ 	* GCC 6.1.0 released.
+Index: gcc/DATESTAMP
+===================================================================
+--- a/src/gcc/DATESTAMP	(.../tags/gcc_6_1_0_release)
++++ b/src/gcc/DATESTAMP	(.../branches/gcc-6-branch)
+@@ -1 +1 @@
+-20160427
++20160428
 Index: gcc/ChangeLog
 ===================================================================
 --- a/src/gcc/ChangeLog	(.../tags/gcc_6_1_0_release)

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