diff options
| author | Jason Merrill <jason@redhat.com> | 2017-05-08 14:45:42 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2017-05-08 14:45:42 -0400 |
| commit | 49f0c04c37b2f73dd88ccf5d8fc93c1dcb6ef2c2 (patch) | |
| tree | dec92a043743359cda1d01f2194f4c24594196e1 /gcc | |
| parent | 0f6ed1211d4e6759a0c35bc8d05fb07e5eab7bea (diff) | |
| download | gcc-49f0c04c37b2f73dd88ccf5d8fc93c1dcb6ef2c2.zip gcc-49f0c04c37b2f73dd88ccf5d8fc93c1dcb6ef2c2.tar.gz gcc-49f0c04c37b2f73dd88ccf5d8fc93c1dcb6ef2c2.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/c-family/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/c-family/c-opts.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/abi/macro0.C | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index a1bb25c..e228e84b 100644 --- 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 ea0e01b..ed1b0377 100644 --- 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 5bc2277..30eb029 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 != 1011 +#if __GXX_ABI_VERSION != 1012 #error "Incorrect value of __GXX_ABI_VERSION" #endif |