diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-07-15 18:38:05 +0000 |
|---|---|---|
| committer | Mikhail Kashkarov <m.kashkarov@partner.samsung.com> | 2017-06-27 21:18:20 +0300 |
| commit | 1629be61f24470c967873e9133dde6b1bb1bd6cd (patch) | |
| tree | 4bdc225d005643d3a13bf1123742fa1f89b10dc0 | |
| parent | 0b7063a7415d107715e262ed8b9a03ff14af223e (diff) | |
| download | linaro-gcc-sandbox/mkashkarov/gcc_abi_11.tar.gz linaro-gcc-sandbox/mkashkarov/gcc_abi_11.tar.bz2 linaro-gcc-sandbox/mkashkarov/gcc_abi_11.zip | |
Update -fabi-version default to 11.sandbox/mkashkarov/gcc_abi_11
* c-opts.c (c_common_post_options): Update -fabi-version default to 11.
(backported from trunk: 0238e35ef85e0aa66fb4c179ff6a0f16e127f542)
Change-Id: Ic3a80dff98edeba0ec7b65a665063bb6c987988f
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@238388 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/c-family/c-opts.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/abi/macro0.C | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c index 434f35a1cb6..5042b0b1ea3 100644 --- a/gcc/c-family/c-opts.c +++ b/gcc/c-family/c-opts.c @@ -891,15 +891,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 |