From c3f25abd635423dcaad2efc4db13ab5264e8393c Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Wed, 1 Nov 2017 23:43:07 +0000
Subject: [PATCH] Revert "[libc++] Don't alias quick_exit if __ANDROID_API__ <
 21"

Broke the Darwin build bots.

This reverts commit f56f1bba1ade4a408d403ff050d50e837bae47df.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@317142 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/__config | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/include/__config b/include/__config
index 33cb9c435..d6217234a 100644
--- a/include/__config
+++ b/include/__config
@@ -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)