From 900086de8817c49724fa7b71edcbd7155ca955fa Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Wed, 11 Mar 2015 00:51:06 +0000
Subject: [PATCH] Move Android to the builtin rune table.

llvm-svn: 231897
---
 libcxx/include/__config | 4 ++++
 libcxx/include/__locale | 8 +-------
 libcxx/src/locale.cpp   | 2 --
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/libcxx/include/__config b/libcxx/include/__config
index c105518..5dc6c82 100644
--- a/libcxx/include/__config
+++ b/libcxx/include/__config
@@ -719,4 +719,8 @@ extern "C" void __sanitizer_annotate_contiguous_container(
          _LIBCPP_HAS_NO_THREADS is defined.
 #endif
 
+#if defined(__ANDROID__)
+#define _LIBCPP_PROVIDES_DEFAULT_RUNE_TABLE
+#endif
+
 #endif  // _LIBCPP_CONFIG
diff --git a/libcxx/include/__locale b/libcxx/include/__locale
index 4efdc2d..625d0f8 100644
--- a/libcxx/include/__locale
+++ b/libcxx/include/__locale
@@ -353,15 +353,13 @@ public:
     static const mask punct  = _PUNCT;
     static const mask xdigit = _HEX;
     static const mask blank  = _BLANK;
-#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__EMSCRIPTEN__) || defined(__NetBSD__) || defined(__ANDROID__)
+#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__EMSCRIPTEN__) || defined(__NetBSD__)
 # ifdef __APPLE__
     typedef __uint32_t mask;
 # elif defined(__FreeBSD__)
     typedef unsigned long mask;
 # elif defined(__EMSCRIPTEN__) ||  defined(__NetBSD__)
     typedef unsigned short mask;
-# elif defined(__ANDROID__)
-    typedef unsigned char mask;
 # endif
     static const mask space  = _CTYPE_S;
     static const mask print  = _CTYPE_R;
@@ -371,11 +369,7 @@ public:
     static const mask alpha  = _CTYPE_A;
     static const mask digit  = _CTYPE_D;
     static const mask punct  = _CTYPE_P;
-# if defined(__ANDROID__)
-    static const mask xdigit = _CTYPE_X | _CTYPE_D;
-# else
     static const mask xdigit = _CTYPE_X;
-# endif
 
 # if defined(__NetBSD__)
     static const mask blank  = _CTYPE_BL;
diff --git a/libcxx/src/locale.cpp b/libcxx/src/locale.cpp
index 2115340..7290226 100644
--- a/libcxx/src/locale.cpp
+++ b/libcxx/src/locale.cpp
@@ -1119,8 +1119,6 @@ ctype<char>::classic_table()  _NOEXCEPT
     return _ctype_ + 1;
 #elif defined(_AIX)
     return (const unsigned int *)__lc_ctype_ptr->obj->mask;
-#elif defined(__ANDROID__)
-    return reinterpret_cast<const unsigned char*>(_ctype_) + 1;
 #else
     // Platform not supported: abort so the person doing the port knows what to
     // fix
-- 
2.7.4