diff options
| author | Jason Merrill <jason@redhat.com> | 2015-02-13 00:26:37 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2015-02-13 00:26:37 -0500 |
| commit | 785f21af82139f512eb12f3318899c9f967409e6 (patch) | |
| tree | 744efbe1acbab7ac37dd08aff6192b4ea5985c38 /gcc/c-family/c-cppbuiltin.c | |
| parent | 6a1e352e1efbdf33a3df892dadd725f0b09c70c9 (diff) | |
| download | gcc-785f21af82139f512eb12f3318899c9f967409e6.zip gcc-785f21af82139f512eb12f3318899c9f967409e6.tar.gz gcc-785f21af82139f512eb12f3318899c9f967409e6.tar.bz2 | |
re PR c++/64956 (__GXX_ABI_VERSION needs a proper definition for the 5.x releases)
PR c++/64956
* c-opts.c (c_common_post_options): Change flag_abi_version from 0
to the current highest version.
* c-cppbuiltin.c (c_cpp_builtins): Assert that it isn't 0.
From-SVN: r220675
Diffstat (limited to 'gcc/c-family/c-cppbuiltin.c')
| -rw-r--r-- | gcc/c-family/c-cppbuiltin.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c index 1936592..60c2d7f 100644 --- a/gcc/c-family/c-cppbuiltin.c +++ b/gcc/c-family/c-cppbuiltin.c @@ -891,14 +891,8 @@ c_cpp_builtins (cpp_reader *pfile) /* Represents the C++ ABI version, always defined so it can be used while preprocessing C and assembler. */ if (flag_abi_version == 0) - /* Use a very large value so that: - - #if __GXX_ABI_VERSION >= <value for version X> - - will work whether the user explicitly says "-fabi-version=x" or - "-fabi-version=0". Do not use INT_MAX because that will be - different from system to system. */ - builtin_define_with_int_value ("__GXX_ABI_VERSION", 999999); + /* We should have set this to something real in c_common_post_options. */ + gcc_unreachable (); else if (flag_abi_version == 1) /* Due to a historical accident, this version had the value "102". */ |