Merge "Refresh 64-bit headers/libs (WW22)"

ndk/platforms/android-20/arch-arm/symbols/libc.so.functions.txt

@@ -748,7 +748,6 @@ isnormalf
 isnormall
 isprint
 ispunct
-issetugid
 isspace
 isupper
 iswalnum

ndk/platforms/android-20/arch-arm64/symbols/libc.so.functions.txt

@@ -581,7 +581,6 @@ isnormalf
 isnormall
 isprint
 ispunct
-issetugid
 isspace
 isupper
 iswalnum

ndk/platforms/android-20/arch-mips/symbols/libc.so.functions.txt

@@ -638,7 +638,6 @@ isnormalf
 isnormall
 isprint
 ispunct
-issetugid
 isspace
 isupper
 iswalnum

ndk/platforms/android-20/arch-mips64/symbols/libc.so.functions.txt

@@ -585,7 +585,6 @@ isnormalf
 isnormall
 isprint
 ispunct
-issetugid
 isspace
 isupper
 iswalnum

ndk/platforms/android-20/arch-x86/symbols/libc.so.functions.txt

@@ -634,7 +634,6 @@ isnormalf
 isnormall
 isprint
 ispunct
-issetugid
 isspace
 isupper
 iswalnum

ndk/platforms/android-20/arch-x86_64/symbols/libc.so.functions.txt

@@ -581,7 +581,6 @@ isnormalf
 isnormall
 isprint
 ispunct
-issetugid
 isspace
 isupper
 iswalnum

ndk/platforms/android-20/include/stdint.h

@@ -180,6 +180,7 @@ typedef int64_t       intmax_t;
 #define INT_FAST32_MAX   INT32_MAX
 
 #define UINT32_MAX       (4294967295U)
+#define UINT32_MIN       (0)
 #define UINT_LEAST32_MAX UINT32_MAX
 #define UINT_FAST32_MAX  UINT32_MAX
 

ndk/platforms/android-20/include/sys/ucontext.h

@@ -68,8 +68,13 @@ typedef struct ucontext {
   struct ucontext* uc_link;
   stack_t uc_stack;
   mcontext_t uc_mcontext;
-  sigset_t uc_sigmask;
+  // Android has a wrong (smaller) sigset_t on ARM.
-  char __padding[128 - sizeof(sigset_t)];
+  union {
+    sigset_t bionic;
+    uint32_t kernel[2];
+  } uc_sigmask;
+  // The kernel adds extra padding after uc_sigmask to match glibc sigset_t on ARM.
+  char __padding[120];
   unsigned long uc_regspace[128] __attribute__((__aligned__(8)));
 } ucontext_t;
 
@@ -83,6 +88,7 @@ typedef struct ucontext {
   struct ucontext *uc_link;
   stack_t uc_stack;
   sigset_t uc_sigmask;
+  // The kernel adds extra padding after uc_sigmask to match glibc sigset_t on ARM64.
   char __padding[128 - sizeof(sigset_t)];
   mcontext_t uc_mcontext;
 } ucontext_t;
@@ -146,8 +152,11 @@ typedef struct ucontext {
   struct ucontext* uc_link;
   stack_t uc_stack;
   mcontext_t uc_mcontext;
-  sigset_t uc_sigmask;
+  // Android has a wrong (smaller) sigset_t on x86.
-  char __padding[128 - sizeof(sigset_t)];
+  union {
+    sigset_t bionic;
+    uint32_t kernel[2];
+  } uc_sigmask;
   struct _libc_fpstate __fpregs_mem;
 } ucontext_t;
 
@@ -198,7 +207,6 @@ typedef struct ucontext {
   stack_t uc_stack;
   mcontext_t uc_mcontext;
   sigset_t uc_sigmask;
-  char __padding[128 - sizeof(sigset_t)];
 } ucontext_t;
 
 #elif defined(__mips64__)
@@ -275,7 +283,6 @@ typedef struct ucontext {
   stack_t uc_stack;
   mcontext_t uc_mcontext;
   sigset_t uc_sigmask;
-  char __padding[128 - sizeof(sigset_t)];
   struct _libc_fpstate __fpregs_mem;
 } ucontext_t;
 

ndk/platforms/android-20/include/unistd.h

@@ -92,7 +92,6 @@ extern int setresuid(uid_t, uid_t, uid_t);
 extern int setresgid(gid_t, gid_t, gid_t);
 extern int getresuid(uid_t *ruid, uid_t *euid, uid_t *suid);
 extern int getresgid(gid_t *rgid, gid_t *egid, gid_t *sgid);
-extern int issetugid(void);
 extern char* getlogin(void);
 extern char* getusershell(void);
 extern void setusershell(void);