Merge from trunk revision 233110.

From-SVN: r233125

8 files changed, 86 insertions, 67 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 0d75195..dc57993 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,59 +1,4 @@
-2015-07-24  Michael Darling  <darlingm@gmail.com>
-
-	PR other/66259
-	* configure: Reflects renaming of configure.in to configure.ac
-
-2015-05-28  Andreas Tobler  <andreast@gcc.gnu.org>
-
-	* configure.host: Add bits for FreeBSD amd64 and i386.
-	* configure.ac: Add signal handler for FreeBSD (amd64/i386)
-	* configure: Regenerate.
-	* include/freebsd-signal.h: New file.
-
-2015-05-26  Andreas Tobler  <andreast@gcc.gnu.org>
-
-	* testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation): Add
-	libiconv for FreeBSD to cxxflags.
-
-2015-05-24  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* configure: Regenerate.
-
-2015-05-13  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* configure.ac: Include config/sjlj.m4.
-	Remove manual SJLJ check, add GCC_CHECK_SJLJ_EXCEPTIONS and adjust.
-	* include/config.h.in: Regenerate.
-	* exception.cc: Replace SJLJ_EXCEPTIONS by __USING_SJLJ_EXCEPTIONS__.
-	* stacktrace.cc: Likewise.
-	* include/default-signal.h: Likewise.
-	* sysdep/i386/backtrace.h: Likewise.
-
-2015-05-13  Michael Haubenwallner  <michael.haubenwallner@ssi-schaefer.com>
-
-	* Makefile.in: Regenerated with automake-1.11.6.
-	* aclocal.m4: Likewise.
-	* configure: Likewise.
-	* gcj/Makefile.in: Likewise.
-	* include/Makefile.in: Likewise.
-	* testsuite/Makefile.in: Likewise.
-
-2015-01-29  Bernd Edlinger  <bernd.edlinger@hotmail.de>
-
-	* libtool-version: Add a comment about cygwin.
-
-2015-01-21  Matthias Klose  <doko@ubuntu.com>
-
-	* libtool-version: Bump soversion.
-
-2015-01-13  Jakub Jelinek  <jakub@redhat.com>
-
-	PR libgcj/64219
-	* Makefile.am (install-data-local): Use just the major version
-	from GCJVERSION instead of major.minor.
-	* Makefile.in: Regenerated.
-
-2015-01-05  Jakub Jelinek  <jakub@redhat.com>
+2016-01-04  Jakub Jelinek  <jakub@redhat.com>
 
 	* classpath/gnu/java/rmi/registry/RegistryImpl.java (version): Update
 	copyright notice dates.
@@ -61,8 +6,13 @@
 	* gnu/gcj/convert/Convert.java (version): Update copyright notice
 	dates.
 	* gnu/gcj/tools/gcj_dbtool/Main.java (main): Ditto.
+
+2016-01-03  Matthias Klose  <doko@ubuntu.com>
+
+	* libtool-version: Bump soversion.
+	* include/jvm.h (GCJ_CXX_ABI_VERSION): Don't encode __GNUC_MINOR__.
 
-Copyright (C) 2015 Free Software Foundation, Inc.
+Copyright (C) 2016 Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
diff --git a/libjava/ChangeLog-2015 b/libjava/ChangeLog-2015
new file mode 100644
index 0000000..0d75195
--- /dev/null
+++ b/libjava/ChangeLog-2015
@@ -0,0 +1,69 @@
+2015-07-24  Michael Darling  <darlingm@gmail.com>
+
+	PR other/66259
+	* configure: Reflects renaming of configure.in to configure.ac
+
+2015-05-28  Andreas Tobler  <andreast@gcc.gnu.org>
+
+	* configure.host: Add bits for FreeBSD amd64 and i386.
+	* configure.ac: Add signal handler for FreeBSD (amd64/i386)
+	* configure: Regenerate.
+	* include/freebsd-signal.h: New file.
+
+2015-05-26  Andreas Tobler  <andreast@gcc.gnu.org>
+
+	* testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation): Add
+	libiconv for FreeBSD to cxxflags.
+
+2015-05-24  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* configure: Regenerate.
+
+2015-05-13  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* configure.ac: Include config/sjlj.m4.
+	Remove manual SJLJ check, add GCC_CHECK_SJLJ_EXCEPTIONS and adjust.
+	* include/config.h.in: Regenerate.
+	* exception.cc: Replace SJLJ_EXCEPTIONS by __USING_SJLJ_EXCEPTIONS__.
+	* stacktrace.cc: Likewise.
+	* include/default-signal.h: Likewise.
+	* sysdep/i386/backtrace.h: Likewise.
+
+2015-05-13  Michael Haubenwallner  <michael.haubenwallner@ssi-schaefer.com>
+
+	* Makefile.in: Regenerated with automake-1.11.6.
+	* aclocal.m4: Likewise.
+	* configure: Likewise.
+	* gcj/Makefile.in: Likewise.
+	* include/Makefile.in: Likewise.
+	* testsuite/Makefile.in: Likewise.
+
+2015-01-29  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+	* libtool-version: Add a comment about cygwin.
+
+2015-01-21  Matthias Klose  <doko@ubuntu.com>
+
+	* libtool-version: Bump soversion.
+
+2015-01-13  Jakub Jelinek  <jakub@redhat.com>
+
+	PR libgcj/64219
+	* Makefile.am (install-data-local): Use just the major version
+	from GCJVERSION instead of major.minor.
+	* Makefile.in: Regenerated.
+
+2015-01-05  Jakub Jelinek  <jakub@redhat.com>
+
+	* classpath/gnu/java/rmi/registry/RegistryImpl.java (version): Update
+	copyright notice dates.
+	* classpath/tools/gnu/classpath/tools/orbd/Main.java (run): Ditto.
+	* gnu/gcj/convert/Convert.java (version): Update copyright notice
+	dates.
+	* gnu/gcj/tools/gcj_dbtool/Main.java (main): Ditto.
+
+Copyright (C) 2015 Free Software Foundation, Inc.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.
diff --git a/libjava/classpath/gnu/java/rmi/registry/RegistryImpl.java b/libjava/classpath/gnu/java/rmi/registry/RegistryImpl.java
index d6bc98b..23545f8 100644
--- a/libjava/classpath/gnu/java/rmi/registry/RegistryImpl.java
+++ b/libjava/classpath/gnu/java/rmi/registry/RegistryImpl.java
@@ -1,5 +1,5 @@
 /* RegistryImpl.java --
-   Copyright (c) 1996-2015 Free Software Foundation, Inc.
+   Copyright (c) 1996-2016 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -110,7 +110,7 @@ public static void version() {
                            + System.getProperty("java.vm.name")
                            + ") "
                            + System.getProperty("java.vm.version"));
-        System.out.println("Copyright 2015 Free Software Foundation, Inc.");
+        System.out.println("Copyright 2016 Free Software Foundation, Inc.");
         System.out.println("This is free software; see the source for copying conditions.  There is NO");
         System.out.println("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.");
         System.exit(0);
diff --git a/libjava/classpath/tools/gnu/classpath/tools/orbd/Main.java b/libjava/classpath/tools/gnu/classpath/tools/orbd/Main.java
index 14ebc08..3a6ea3b 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/orbd/Main.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/orbd/Main.java
@@ -1,5 +1,5 @@
 /* NamingServicePersistent.java -- The persistent naming service.
-   Copyright (C) 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -179,7 +179,7 @@ public class Main
         System.out.println("GNU Classpath persistent naming service "
                            + "started at " + iorr.Internet.host + ":"
                            + iorr.Internet.port + " key 'NameService'.\n\n"
-                           + "Copyright (C) 2015 Free Software Foundation\n"
+                           + "Copyright (C) 2016 Free Software Foundation\n"
                            + "This tool comes with ABSOLUTELY NO WARRANTY. "
                            + "This is free software, and you are\nwelcome to "
                            + "redistribute it under conditions, defined in "
diff --git a/libjava/gnu/gcj/convert/Convert.java b/libjava/gnu/gcj/convert/Convert.java
index 9243e08..1e2de9c 100644
--- a/libjava/gnu/gcj/convert/Convert.java
+++ b/libjava/gnu/gcj/convert/Convert.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999-2015 Free Software Foundation
+/* Copyright (C) 1999-2016 Free Software Foundation
 
    This file is part of libgcj.
 
@@ -45,7 +45,7 @@ public class Convert
 		       + ") "
 		       + System.getProperty("java.vm.version"));
     System.out.println();
-    System.out.println("Copyright (C) 2015 Free Software Foundation, Inc.");
+    System.out.println("Copyright (C) 2016 Free Software Foundation, Inc.");
     System.out.println("This is free software; see the source for copying conditions.  There is NO");
     System.out.println("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.");
     System.exit(0);
diff --git a/libjava/gnu/gcj/tools/gcj_dbtool/Main.java b/libjava/gnu/gcj/tools/gcj_dbtool/Main.java
index e9d4aca..91e4ead 100644
--- a/libjava/gnu/gcj/tools/gcj_dbtool/Main.java
+++ b/libjava/gnu/gcj/tools/gcj_dbtool/Main.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004-2015 Free Software Foundation
+/* Copyright (C) 2004-2016 Free Software Foundation
 
    This file is part of libgcj.
 
@@ -46,7 +46,7 @@ public class Main
 			   + ") "
 			   + System.getProperty("java.vm.version"));
 	System.out.println();
-	System.out.println("Copyright 2015 Free Software Foundation, Inc.");
+	System.out.println("Copyright 2016 Free Software Foundation, Inc.");
 	System.out.println("This is free software; see the source for copying conditions.  There is NO");
 	System.out.println("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.");
 	return;
diff --git a/libjava/include/jvm.h b/libjava/include/jvm.h
index ec74f29..5015d4e 100644
--- a/libjava/include/jvm.h
+++ b/libjava/include/jvm.h
@@ -686,7 +686,7 @@ extern void _Jv_RegisterBootstrapPackages ();
 					  loader.  */
 
 // These are used to find ABI versions we recognize.
-#define GCJ_CXX_ABI_VERSION (__GNUC__ * 100000 + __GNUC_MINOR__ * 1000)
+#define GCJ_CXX_ABI_VERSION (__GNUC__ * 100000)
 
 // This is the old-style BC version ID used by GCJ 4.0.0.
 #define OLD_GCJ_40_BC_ABI_VERSION (4 * 10000 + 0 * 10 + 5)
diff --git a/libjava/libtool-version b/libjava/libtool-version
index 52fc31c..d2648c4 100644
--- a/libjava/libtool-version
+++ b/libjava/libtool-version
@@ -5,4 +5,4 @@
 # Note: When changing the version here, please do also update LIBGCJ_SONAME
 # in gcc/config/i386/cygwin.h and gcc/config/i386/mingw32.h.
 # CURRENT:REVISION:AGE
-16:0:0
+17:0:0