Merge changes I0262eed9,Iba9ee03a

* changes:
  Add a temporary hack to work around __NDK_FPABI__.
  Remove _GNU_SOURCE guard on tmpnam.

diff --cc libc/include/stdio.h
index c2f6d84,2358f9a..03effcd
--- 1/libc/include/stdio.h
--- 2/libc/include/stdio.h
+++ b/libc/include/stdio.h
@@@ -149,14 -144,12 +149,13 @@@ int      vprintf(const char * __restrict _N
  int dprintf(int, const char* __restrict _Nonnull, ...) __printflike(2, 3) __INTRODUCED_IN(21);
  int vdprintf(int, const char* __restrict _Nonnull, __va_list) __printflike(2, 0) __INTRODUCED_IN(21);
  
 -#if __STDC_VERSION__ < 201112L
 +#if (defined(__STDC_VERSION__) && __STDC_VERSION__ < 201112L) || \
 +    (defined(__cplusplus) && __cplusplus <= 201103L)
  char* gets(char*) __attribute__((deprecated("gets is unsafe, use fgets instead")));
  #endif
 -int sprintf(char* __restrict, const char* __restrict _Nonnull, ...) __printflike(2, 3) __warnattr("sprintf is often misused; please use snprintf");
 -int vsprintf(char* __restrict, const char* __restrict _Nonnull, __va_list) __printflike(2, 0) __warnattr("vsprintf is often misused; please use vsnprintf");
 +int sprintf(char* __restrict, const char* __restrict _Nonnull, ...) __printflike(2, 3);
 +int vsprintf(char* __restrict, const char* __restrict _Nonnull, __va_list) __printflike(2, 0);
  char* tmpnam(char*) __attribute__((deprecated("tmpnam is unsafe, use mkstemp or tmpfile instead")));
- #if defined(__USE_BSD) || defined(__USE_GNU)
  #define P_tmpdir "/tmp/" /* deprecated */
  char* tempnam(const char*, const char*)
      __attribute__((deprecated("tempnam is unsafe, use mkstemp or tmpfile instead")));

diff --cc libc/include/sys/cdefs.h
Simple merge