Merge "Clean up libandroid_support header files."

8 files changed, 91 insertions, 238 deletions

diff --git a/sources/android/support/Android.mk b/sources/android/support/Android.mk
index 025cc4243..b04198d21 100644
--- a/sources/android/support/Android.mk
+++ b/sources/android/support/Android.mk
@@ -107,7 +107,6 @@ android_support_sources := \
     $(BIONIC_PATH)/libm/upstream-freebsd/lib/msun/src/s_expm1.c \
     $(BIONIC_PATH)/libm/upstream-freebsd/lib/msun/src/s_log1p.c \
     $(BIONIC_PATH)/libm/upstream-freebsd/lib/msun/src/s_logb.c \
-    $(BIONIC_PATH)/libm/upstream-freebsd/lib/msun/src/s_nan.c \
     $(BIONIC_PATH)/libm/upstream-freebsd/lib/msun/src/s_nextafter.c \
     $(BIONIC_PATH)/libm/upstream-freebsd/lib/msun/src/s_remquo.c \
     $(BIONIC_PATH)/libm/upstream-freebsd/lib/msun/src/s_rint.c \
diff --git a/sources/android/support/include/inttypes.h b/sources/android/support/include/inttypes.h
index 33b0ae407..00887bca5 100644
--- a/sources/android/support/include/inttypes.h
+++ b/sources/android/support/include/inttypes.h
@@ -25,26 +25,24 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+
 #ifndef NDK_ANDROID_SUPPORT_INTTYPES_H
 #define NDK_ANDROID_SUPPORT_INTTYPES_H
 
 #include_next <inttypes.h>
 
-#if !defined(__LP64__)
-
-#include <wchar.h>
+__BEGIN_DECLS
 
-#ifdef __cplusplus
-extern "C" {
+#if __ANDROID_API__ < __ANDROID_API_K__
+intmax_t imaxabs(intmax_t) __attribute_const__;
+imaxdiv_t imaxdiv(intmax_t, intmax_t) __attribute_const__;
 #endif
 
-intmax_t imaxabs(intmax_t) __attribute__((__const__));
-imaxdiv_t imaxdiv(intmax_t, intmax_t) __attribute__((__const__));
-
-#ifdef __cplusplus
-}  // extern "C"
+#if __ANDROID_API__ < __ANDROID_API_L__
+intmax_t wcstoimax(const wchar_t* __restrict, wchar_t** __restrict, int);
+uintmax_t wcstoumax(const wchar_t* __restrict, wchar_t** __restrict, int);
 #endif
 
-#endif // !__LP64__
+__END_DECLS
 
-#endif  // NDK_ANDROID_SUPPORT_INTTYPES_H
+#endif
diff --git a/sources/android/support/include/locale.h b/sources/android/support/include/locale.h
index 8934c3955..72f847b38 100644
--- a/sources/android/support/include/locale.h
+++ b/sources/android/support/include/locale.h
@@ -25,114 +25,22 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+
 #ifndef NDK_ANDROID_SUPPORT_LOCALE_H
 #define NDK_ANDROID_SUPPORT_LOCALE_H
 
-#if defined(__LP64__)
-
-#include_next <locale.h>
-
-#else
-
-#define lconv  __libc_lconv
-#define localeconv  __libc_localeconv
 #include_next <locale.h>
-#undef lconv
-#undef localeconv
-#include <xlocale.h>
-
-#if !defined(LC_CTYPE)
-/* Define all LC_XXX to itself.  Sounds silly but libc++ expects it's defined, not in enum */
-#define LC_CTYPE           LC_CTYPE
-#define LC_NUMERIC         LC_NUMERIC
-#define LC_TIME            LC_TIME
-#define LC_COLLATE         LC_COLLATE
-#define LC_MONETARY        LC_MONETARY
-#define LC_MESSAGES        LC_MESSAGES
-#define LC_ALL             LC_ALL
-#define LC_PAPER           LC_PAPER
-#define LC_NAME            LC_NAME
-#define LC_ADDRESS         LC_ADDRESS
-#define LC_TELEPHONE       LC_TELEPHONE
-#define LC_MEASUREMENT     LC_MEASUREMENT
-#define LC_IDENTIFICATION  LC_IDENTIFICATION
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define LC_CTYPE_MASK  (1 << LC_CTYPE)
-#define LC_NUMERIC_MASK (1 << LC_NUMERIC)
-#define LC_TIME_MASK (1 << LC_TIME)
-#define LC_COLLATE_MASK (1 << LC_COLLATE)
-#define LC_MONETARY_MASK (1 << LC_MONETARY)
-#define LC_MESSAGES_MASK (1 << LC_MESSAGES)
-#define LC_PAPER_MASK (1 << LC_PAPER)
-#define LC_NAME_MASK (1 << LC_NAME)
-#define LC_ADDRESS_MASK (1 << LC_ADDRESS)
-#define LC_TELEPHONE_MASK (1 << LC_TELEPHONE)
-#define LC_MEASUREMENT_MASK (1 << LC_MEASUREMENT)
-#define LC_IDENTIFICATION_MASK (1 << LC_IDENTIFICATION)
-
-#undef LC_ALL_MASK
-#define LC_ALL_MASK (LC_CTYPE_MASK \
-                     | LC_NUMERIC_MASK \
-                     | LC_TIME_MASK \
-                     | LC_COLLATE_MASK \
-                     | LC_MONETARY_MASK \
-                     | LC_MESSAGES_MASK \
-                     | LC_PAPER_MASK \
-                     | LC_NAME_MASK \
-                     | LC_ADDRESS_MASK \
-                     | LC_TELEPHONE_MASK \
-                     | LC_MEASUREMENT_MASK \
-                     | LC_IDENTIFICATION_MASK \
-                     )
-
-extern locale_t newlocale(int, const char*, locale_t);
-extern locale_t duplocale(locale_t);
-extern locale_t uselocale(locale_t);
-extern void     freelocale(locale_t);
 
-#ifndef LC_GLOBAL_LOCALE
-#define LC_GLOBAL_LOCALE    ((locale_t) -1L)
-#endif
-
-struct lconv {
-    char* decimal_point;       /* Decimal point character */
-    char* thousands_sep;       /* Thousands separator */
-    char* grouping;            /* Grouping */
-    char* int_curr_symbol;
-    char* currency_symbol;
-    char* mon_decimal_point;
-    char* mon_thousands_sep;
-    char* mon_grouping;
-    char* positive_sign;
-    char* negative_sign;
-    char  int_frac_digits;
-    char  frac_digits;
-    char  p_cs_precedes;
-    char  p_sep_by_space;
-    char  n_cs_precedes;
-    char  n_sep_by_space;
-    char  p_sign_posn;
-    char  n_sign_posn;
-    /* ISO-C99 */
-    char  int_p_cs_precedes;
-    char  int_p_sep_by_space;
-    char  int_n_cs_precedes;
-    char  int_n_sep_by_space;
-    char  int_p_sign_posn;
-    char  int_n_sign_posn;
-};
+__BEGIN_DECLS
 
+#if __ANDROID_API__ < __ANDROID_API_L__
 struct lconv* localeconv(void);
-
-#ifdef __cplusplus
-}  // extern "C"
+locale_t duplocale(locale_t);
+void freelocale(locale_t);
+locale_t newlocale(int, const char*, locale_t);
+locale_t uselocale(locale_t);
 #endif
 
-#endif // !__LP64__
+__END_DECLS
 
-#endif  // NDK_ANDROID_SUPPORT_LOCALE_H
+#endif
diff --git a/sources/android/support/include/math.h b/sources/android/support/include/math.h
index 46398a6a4..11d50cc95 100644
--- a/sources/android/support/include/math.h
+++ b/sources/android/support/include/math.h
@@ -25,75 +25,60 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+
 #ifndef NDK_ANDROID_SUPPORT_MATH_H
 #define NDK_ANDROID_SUPPORT_MATH_H
 
 #include_next <math.h>
 
-#if !defined(__LP64__)
+__BEGIN_DECLS
 
-#ifdef __cplusplus
-extern "C" {
+#if __ANDROID_API__ < __ANDROID_API_J_MR2__
+double        log2(double);
+float         log2f(float);
+long double   log2l(long double);
+long double   logbl(long double);
+float         tgammaf(float);
 #endif
 
-// TODO(digit): Check that this is not needed for Clang.
-typedef double      double_t;
-typedef float       float_t;
-
-// Missing long double functions. Note that 'long double' is the same
-// as 'double' on 32-bit Android, so this will define stubs.
-#define LLVM_LIBCXX_LONG_DOUBLE_FUNCTIONS
-
-long double     acosl(long double);
-long double     asinl(long double);
-long double     atanl(long double);
-long double     atan2l(long double x, long double y);
-long double     cosl(long double);
-long double     coshl(long double);
-long double     expl(long double);
-long double     fmodl(long double, long double);
-long double     powl(long double, long double);
-long double     sinl(long double);
-long double     sinhl(long double);
-long double     sqrtl(long double);
-long double     tanl(long double);
-long double     tanhl(long double);
-long double     acoshl(long double);
-long double     asinhl(long double);
-long double     atanhl(long double);
-long double     cbrtl(long double);
-long double     erfl(long double);
-long double     erfcl(long double);
-long double     expm1l(long double);
-long double     hypotl(long double, long double);
-long double     lgammal(long double);
-long long int   llrintl(long double);
-long double     logl(long double);
-long double     log1pl(long double);
-long double     log2l(long double);
-long double     logbl(long double);
-long double     log10l(long double);
-long double     nanl(const char*);
-long double     nearbyintl(long double);
-long double     remainderl(long double, long double);
-long double     remquol(long double, long double, int*);
-long double     rintl(long double);
-long int        lrintl(long double);
-long double     tgammal(long double);
-long double     modfl(long double, long double*);
-long double     exp2l(long double);
-
-float           tgammaf(float);
-double          nan(const char*);
-float           nanf(const char*);
-
-float           log2f(float);
-double          log2(double);
-
-#ifdef __cplusplus
-}  // extern "C"
+#if __ANDROID_API__ < __ANDROID_API_L__
+long double   acoshl(long double);
+long double   acosl(long double);
+long double   asinhl(long double);
+long double   asinl(long double);
+long double   atan2l(long double, long double);
+long double   atanhl(long double);
+long double   atanl(long double);
+long double   cbrtl(long double);
+long double   coshl(long double);
+long double   cosl(long double);
+long double   erfcl(long double);
+long double   erfl(long double);
+long double   exp2l(long double);
+long double   expl(long double);
+long double   expm1l(long double);
+long double   fmodl(long double, long double);
+long double   hypotl(long double, long double);
+long double   lgammal(long double);
+long double   log10l(long double);
+long double   log1pl(long double);
+long double   logl(long double);
+long double   modfl(long double, long double*);
+long double   nearbyintl(long double);
+long double   powl(long double, long double);
+long double   remainderl(long double, long double);
+long double   remquol(long double, long double, int*);
+long double   rintl(long double);
+long double   sinhl(long double);
+long double   sinl(long double);
+long double   sqrtl(long double);
+long double   tanhl(long double);
+long double   tanl(long double);
+long double   tgammal(long double);
+long int      lrintl(long double);
+long long int llrintl(long double);
 #endif
 
-#endif // !__LP64__
+__END_DECLS
 
-#endif  /* NDK_ANDROID_SUPPORT_MATH_H */
+#endif
diff --git a/sources/android/support/include/stdlib.h b/sources/android/support/include/stdlib.h
index 5302d571f..5fd0460af 100644
--- a/sources/android/support/include/stdlib.h
+++ b/sources/android/support/include/stdlib.h
@@ -25,53 +25,39 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+
 #ifndef NDK_ANDROID_SUPPORT_STDLIB_H
 #define NDK_ANDROID_SUPPORT_STDLIB_H
 
 #include_next <stdlib.h>
-#include <xlocale.h>
 
 __BEGIN_DECLS
 
-#if __ANDROID_API__ < 16
+#if __ANDROID_API__ < __ANDROID_API_J__
 int posix_memalign(void** memptr, size_t alignment, size_t size);
 #endif
 
-// These APIs made it in to L.
-#if __ANDROID_API__ < 21
-
-void _Exit(int);
-
+#if __ANDROID_API__ < __ANDROID_API_L__
+#undef MB_CUR_MAX
+size_t __ctype_get_mb_cur_max(void);
+#define MB_CUR_MAX __ctype_get_mb_cur_max()
+void _Exit(int); // TODO: not needed after bionic commit 79dd9889d1701dda881bb383b212932fcf2ff25f.
 long double strtold(const char*, char**);
-long double strtold_l(const char* nptr, char** endptr, locale_t loc);
-long long strtoll_l(const char* nptr, char** endptr, int base, locale_t loc);
-unsigned long long strtoull_l(const char* nptr, char** endptr, int base,
-                              locale_t loc);
-
-int mbtowc(wchar_t* pwc, const char* pmb, size_t n);
-
-#if __ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L
+long double strtold_l(const char*, char**, locale_t);
+long long strtoll_l(const char*, char**, int, locale_t);
+unsigned long long strtoull_l(const char*, char**, int, locale_t);
+int mbtowc(wchar_t*, const char*, size_t);
 int at_quick_exit(void (*)(void));
 void quick_exit(int) __noreturn;
 #endif
 
-#endif // __ANDROID_API__ < 21
-
-// These APIs made it in to O.
-#if __ANDROID_API__ < 26
-double strtod_l(const char* nptr, char** endptr, locale_t locale);
-float strtof_l(const char* nptr, char** endptr, locale_t locale);
-long strtol_l(const char* nptr, char** endptr, int base, locale_t locale);
-unsigned long strtoul_l(const char* nptr, char** endptr, int base,
-                        locale_t locale);
-#endif // __ANDROID_API__ < 26
-
-#if defined(MB_CUR_MAX)
-size_t __ctype_get_mb_cur_max();
-#undef MB_CUR_MAX
-#define MB_CUR_MAX __ctype_get_mb_cur_max()
-#endif  // defined(MB_CUR_MAX)
+#if __ANDROID_API__ < __ANDROID_API_O__
+double strtod_l(const char*, char**, locale_t);
+float strtof_l(const char*, char**, locale_t);
+long strtol_l(const char*, char**, int, locale_t);
+unsigned long strtoul_l(const char*, char**, int, locale_t);
+#endif
 
 __END_DECLS
 
-#endif  // NDK_ANDROID_SUPPORT_STDLIB_H
+#endif
diff --git a/sources/android/support/include/uchar.h b/sources/android/support/include/uchar.h
index 5028aa5dc..42942c415 100644
--- a/sources/android/support/include/uchar.h
+++ b/sources/android/support/include/uchar.h
@@ -25,6 +25,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+
 #ifndef NDK_ANDROID_SUPPORT_UCHAR_H
 #define NDK_ANDROID_SUPPORT_UCHAR_H
 
@@ -33,18 +34,12 @@
 __BEGIN_DECLS
 
 #if __ANDROID_API__ < __ANDROID_API_L__
-
-size_t c16rtomb(char* __restrict, char16_t, mbstate_t* __restrict)
-    __INTRODUCED_IN(21);
-size_t c32rtomb(char* __restrict, char32_t, mbstate_t* __restrict)
-    __INTRODUCED_IN(21);
-size_t mbrtoc16(char16_t* __restrict, const char* __restrict, size_t,
-                mbstate_t* __restrict) __INTRODUCED_IN(21);
-size_t mbrtoc32(char32_t* __restrict, const char* __restrict, size_t,
-                mbstate_t* __restrict) __INTRODUCED_IN(21);
-
-#endif /* __ANDROID_API__ < __ANDROID_API_L__ */
+size_t c16rtomb(char* __restrict, char16_t, mbstate_t* __restrict);
+size_t c32rtomb(char* __restrict, char32_t, mbstate_t* __restrict);
+size_t mbrtoc16(char16_t* __restrict, const char* __restrict, size_t, mbstate_t* __restrict);
+size_t mbrtoc32(char32_t* __restrict, const char* __restrict, size_t, mbstate_t* __restrict);
+#endif
 
 __END_DECLS
 
-#endif  // NDK_ANDROID_SUPPORT_UCHAR_H
+#endif
diff --git a/sources/android/support/include/wchar.h b/sources/android/support/include/wchar.h
index 906535e45..3056d4c06 100644
--- a/sources/android/support/include/wchar.h
+++ b/sources/android/support/include/wchar.h
@@ -34,32 +34,16 @@
 __BEGIN_DECLS
 
 #if __ANDROID_API__ < __ANDROID_API_L__
-
-#include <stdarg.h>
-
 int vfwscanf(FILE*, const wchar_t*, va_list);
 int vswscanf(const wchar_t*, const wchar_t*, va_list);
 int vwscanf(const wchar_t*, va_list);
-
 size_t mbsnrtowcs(wchar_t*, const char**, size_t, size_t, mbstate_t*);
-int vswprintf(wchar_t*, size_t, const wchar_t*, va_list);
 size_t wcsnrtombs(char*, const wchar_t**, size_t, size_t, mbstate_t*);
 float wcstof(const wchar_t*, wchar_t**);
 long long wcstoll(const wchar_t*, wchar_t**, int);
 long double wcstold(const wchar_t*, wchar_t**);
 unsigned long long wcstoull(const wchar_t*, wchar_t**, int);
-
-intmax_t wcstoimax(const wchar_t* nptr, wchar_t** endptr, int base);
-uintmax_t wcstoumax(const wchar_t* nptr, wchar_t** endptr, int base);
-
-#endif /* __ANDROID_API__ < __ANDROID_API_L__ */
-
-#if __ANDROID_API__ < __ANDROID_API_M__
-
-int wcscasecmp_l(const wchar_t*, const wchar_t*, locale_t);
-int wcsncasecmp_l(const wchar_t*, const wchar_t*, size_t, locale_t);
-
-#endif /* __ANDROID_API__ < __ANDROID_API_L__ */
+#endif
 
 __END_DECLS
 
diff --git a/sources/android/support/include/wctype.h b/sources/android/support/include/wctype.h
index 78c9faa45..9801811a5 100644
--- a/sources/android/support/include/wctype.h
+++ b/sources/android/support/include/wctype.h
@@ -34,9 +34,7 @@
 __BEGIN_DECLS
 
 #if __ANDROID_API__ < __ANDROID_API_L__
-
 int iswblank(wint_t);
-
 #endif
 
 __END_DECLS