Bump C++ ABI version.

	* c-opts.c (c_common_post_options): Update defaults for
	flag_abi_version and flag_abi_compat_version.

From-SVN: r247756

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index a1bb25c7aa0dab99f545519cef48980fe546f33d..e228e84b73bc75f011bcbf93f1b9061edc6f4d21 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2017-05-08  Jason Merrill  <jason@redhat.com>
+
+       * c-opts.c (c_common_post_options): Update defaults for
+       flag_abi_version and flag_abi_compat_version.
+
 2017-05-05  David Malcolm  <dmalcolm@redhat.com>
 
        * c-common.c (c_cpp_error): Replace report_diagnostic

diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c
index ea0e01b101c9b7b57f5db1fb4387b5628baa570c..ed1b0377fa07e79dc0f1f2306c42a3c267a197f4 100644 (file)
--- a/gcc/c-family/c-opts.c
+++ b/gcc/c-family/c-opts.c
@@ -909,15 +909,15 @@ c_common_post_options (const char **pfilename)
     }
   else if (flag_abi_compat_version == -1)
     {
-      /* Generate compatibility aliases for ABI v10 (6.1) by default. */
+      /* Generate compatibility aliases for ABI v11 (7.1) by default. */
       flag_abi_compat_version
-       = (flag_abi_version == 0 ? 10 : 0);
+       = (flag_abi_version == 0 ? 11 : 0);
     }
 
   /* Change flag_abi_version to be the actual current ABI level for the
      benefit of c_cpp_builtins.  */
   if (flag_abi_version == 0)
-    flag_abi_version = 11;
+    flag_abi_version = 12;
 
   /* By default, enable the new inheriting constructor semantics along with ABI
      11.  New and old should coexist fine, but it is a change in what

diff --git a/gcc/testsuite/g++.dg/abi/macro0.C b/gcc/testsuite/g++.dg/abi/macro0.C
index 5bc2277626d75043bec7413ec699c06866e7c5de..30eb02937c30bfefa9762e56aba90311a915c37d 100644 (file)
--- a/gcc/testsuite/g++.dg/abi/macro0.C
+++ b/gcc/testsuite/g++.dg/abi/macro0.C
@@ -1,6 +1,6 @@
 // This testcase will need to be kept in sync with c_common_post_options.
 // { dg-options "-fabi-version=0" }
 
-#if __GXX_ABI_VERSION != 1011
+#if __GXX_ABI_VERSION != 1012
 #error "Incorrect value of __GXX_ABI_VERSION"
 #endif