[libcxx-commits] [libcxx] r364363 - Revert "Change the ABI version and ABI namespace to be `_LIBCPP_VERSION`"

[Eric Fiselier via libcxx-commits]

Author: ericwf
Date: Tue Jun 25 17:05:14 2019
New Revision: 364363

URL: http://llvm.org/viewvc/llvm-project?rev=364363&view=rev
Log:
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.

Modified:
    libcxx/trunk/include/__config

Modified: libcxx/trunk/include/__config
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__config?rev=364363&r1=364362&r2=364363&view=diff
==============================================================================
--- libcxx/trunk/include/__config (original)
+++ libcxx/trunk/include/__config Tue Jun 25 17:05:14 2019
@@ -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