From d022c55a4b8bdac385efadf42ba2a374c5960418 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Fri, 15 Jul 2016 14:38:05 -0400 Subject: [PATCH] Update -fabi-version default to 11. * c-opts.c (c_common_post_options): Update -fabi-version default to 11. From-SVN: r238388 --- gcc/c-family/ChangeLog | 4 ++++ gcc/c-family/c-opts.c | 6 +++--- gcc/testsuite/g++.dg/abi/macro0.C | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 46e45091dcb..1376a39427f 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,7 @@ +2016-07-15 Jason Merrill + + * c-opts.c (c_common_post_options): Update -fabi-version default to 11. + 2016-07-15 Jakub Jelinek PR c/71858 diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c index d945825cc64..c11e7e7f53c 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 6a695b9f580..5bc2277626d 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 -- 2.30.2