aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2016-07-15 14:38:05 -0400
committerJason Merrill <jason@gcc.gnu.org>2016-07-15 14:38:05 -0400
commitd022c55a4b8bdac385efadf42ba2a374c5960418 (patch)
tree12e59d4ded889a9ac716c2454af1a0b2cdc1c306 /gcc
parent9ee2cecc2fd6a0e4e9633f0a4096b87414635c16 (diff)
downloadgcc-d022c55a4b8bdac385efadf42ba2a374c5960418.zip
gcc-d022c55a4b8bdac385efadf42ba2a374c5960418.tar.gz
gcc-d022c55a4b8bdac385efadf42ba2a374c5960418.tar.bz2
Update -fabi-version default to 11.
* c-opts.c (c_common_post_options): Update -fabi-version default to 11. From-SVN: r238388
Diffstat (limited to 'gcc')
-rw-r--r--gcc/c-family/ChangeLog4
-rw-r--r--gcc/c-family/c-opts.c6
-rw-r--r--gcc/testsuite/g++.dg/abi/macro0.C2
3 files changed, 8 insertions, 4 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 46e4509..1376a39 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,7 @@
+2016-07-15 Jason Merrill <jason@redhat.com>
+
+ * c-opts.c (c_common_post_options): Update -fabi-version default to 11.
+
2016-07-15 Jakub Jelinek <jakub@redhat.com>
PR c/71858
diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c
index d945825..c11e7e7 100644
--- a/gcc/c-family/c-opts.c
+++ b/gcc/c-family/c-opts.c
@@ -887,15 +887,15 @@ c_common_post_options (const char **pfilename)
}
else if (flag_abi_compat_version == -1)
{
- /* Generate compatibility aliases for ABI v8 (5.1) by default. */
+ /* Generate compatibility aliases for ABI v10 (6.1) by default. */
flag_abi_compat_version
- = (flag_abi_version == 0 ? 8 : 0);
+ = (flag_abi_version == 0 ? 10 : 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 = 10;
+ flag_abi_version = 11;
if (cxx_dialect >= cxx11)
{
diff --git a/gcc/testsuite/g++.dg/abi/macro0.C b/gcc/testsuite/g++.dg/abi/macro0.C
index 6a695b9..5bc2277 100644
--- 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 != 1010
+#if __GXX_ABI_VERSION != 1011
#error "Incorrect value of __GXX_ABI_VERSION"
#endif