[libcxx] r317142 - Revert "[libc++] Don't alias quick_exit if __ANDROID_API__ < 21"

Dan Albert via cfe-commits cfe-commits at lists.llvm.org
Wed Nov 1 16:43:07 PDT 2017


Author: danalbert
Date: Wed Nov  1 16:43:07 2017
New Revision: 317142

URL: http://llvm.org/viewvc/llvm-project?rev=317142&view=rev
Log:
Revert "[libc++] Don't alias quick_exit if __ANDROID_API__ < 21"

Broke the Darwin build bots.

This reverts commit f56f1bba1ade4a408d403ff050d50e837bae47df.

Modified:
    libcxx/trunk/include/__config

Modified: libcxx/trunk/include/__config
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__config?rev=317142&r1=317141&r2=317142&view=diff
==============================================================================
--- libcxx/trunk/include/__config (original)
+++ libcxx/trunk/include/__config Wed Nov  1 16:43:07 2017
@@ -296,10 +296,6 @@
 #define _LIBCPP_NO_CFI
 #endif
 
-#if __libcpp_has_include(<sys/cdefs.h>)
-#include <sys/cdefs.h>
-#endif
-
 #if defined(_LIBCPP_COMPILER_CLANG)
 
 // _LIBCPP_ALTERNATE_STRING_LAYOUT is an old name for
@@ -411,7 +407,7 @@ typedef __char32_t char32_t;
 #define _LIBCPP_HAS_C11_FEATURES
 #elif defined(__linux__)
 #if !defined(_LIBCPP_HAS_MUSL_LIBC)
-#if __GLIBC_PREREQ(2, 15) || (defined(__BIONIC__) && (__ANDROID_API__ >= 21))
+#if __GLIBC_PREREQ(2, 15) || defined(__BIONIC__)
 #define _LIBCPP_HAS_QUICK_EXIT
 #endif
 #if __GLIBC_PREREQ(2, 17)




More information about the cfe-commits mailing list