diff options
| author | Eric Fiselier <eric@efcs.ca> | 2019-06-26 00:05:14 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2019-06-26 00:05:14 +0000 |
| commit | ae9e42f614f80334fa3f69a8a36a58a31a641675 (patch) | |
| tree | 28037e5f77123354a18eb6a3f98a2f1f5fd6fc66 /libcxx/include | |
| parent | de94ac9357750fdba45e09eefa8f67a650ae6a64 (diff) | |
| download | bcm5719-llvm-ae9e42f614f80334fa3f69a8a36a58a31a641675.tar.gz bcm5719-llvm-ae9e42f614f80334fa3f69a8a36a58a31a641675.zip | |
Revert "Change the ABI version and ABI namespace to be `_LIBCPP_VERSION`"
There are some suspicious bot failures that I want to ensure aren't
caused by this patch.
I'll recommit tomorrow.
llvm-svn: 364363
Diffstat (limited to 'libcxx/include')
| -rw-r--r-- | libcxx/include/__config | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/libcxx/include/__config b/libcxx/include/__config index 54d4672afd0..5eb69b4e93a 100644 --- a/libcxx/include/__config +++ b/libcxx/include/__config @@ -34,6 +34,10 @@ #define _LIBCPP_VERSION 9000 +#ifndef _LIBCPP_ABI_VERSION +# define _LIBCPP_ABI_VERSION 1 +#endif + #ifndef __STDC_HOSTED__ # define _LIBCPP_FREESTANDING #endif @@ -62,18 +66,7 @@ # error Unknown object file format #endif -#if defined(_LIBCPP_ABI_UNSTABLE) -# ifdef _LIBCPP_ABI_VERSION -# error _LIBCPP_ABI_VERSION cannot be defined with _LIBCPP_ABI_UNSTABLE -# endif -# define _LIBCPP_ABI_VERSION _LIBCPP_VERSION -#endif - -#ifndef _LIBCPP_ABI_VERSION -# define _LIBCPP_ABI_VERSION 1 -#endif - -#if _LIBCPP_ABI_VERSION >= 2 +#if defined(_LIBCPP_ABI_UNSTABLE) || _LIBCPP_ABI_VERSION >= 2 // Change short string representation so that string data starts at offset 0, // improving its alignment in some cases. # define _LIBCPP_ABI_ALTERNATE_STRING_LAYOUT |
