Refresh 64-bit headers/libs (WW22)
Change-Id: Ic49750508a4c825e6ac222d8cd417e71dae53cbd
diff --git a/ndk/platforms/android-20/arch-arm/lib/libc.a b/ndk/platforms/android-20/arch-arm/lib/libc.a
index 0cf75d6..2700ead 100644
--- a/ndk/platforms/android-20/arch-arm/lib/libc.a
+++ b/ndk/platforms/android-20/arch-arm/lib/libc.a
Binary files differ
diff --git a/ndk/platforms/android-20/arch-arm/lib/libm.a b/ndk/platforms/android-20/arch-arm/lib/libm.a
index bdeef8d..13a88f5 100644
--- a/ndk/platforms/android-20/arch-arm/lib/libm.a
+++ b/ndk/platforms/android-20/arch-arm/lib/libm.a
Binary files differ
diff --git a/ndk/platforms/android-20/arch-arm/symbols/libc.so.functions.txt b/ndk/platforms/android-20/arch-arm/symbols/libc.so.functions.txt
index 6360fb2..e1b8483 100644
--- a/ndk/platforms/android-20/arch-arm/symbols/libc.so.functions.txt
+++ b/ndk/platforms/android-20/arch-arm/symbols/libc.so.functions.txt
@@ -748,7 +748,6 @@
isnormall
isprint
ispunct
-issetugid
isspace
isupper
iswalnum
diff --git a/ndk/platforms/android-20/arch-arm64/lib/libc.a b/ndk/platforms/android-20/arch-arm64/lib/libc.a
index e4e90ce..297a6bb 100644
--- a/ndk/platforms/android-20/arch-arm64/lib/libc.a
+++ b/ndk/platforms/android-20/arch-arm64/lib/libc.a
Binary files differ
diff --git a/ndk/platforms/android-20/arch-arm64/lib/libm.a b/ndk/platforms/android-20/arch-arm64/lib/libm.a
index 69f5a00..fc0bf44 100644
--- a/ndk/platforms/android-20/arch-arm64/lib/libm.a
+++ b/ndk/platforms/android-20/arch-arm64/lib/libm.a
Binary files differ
diff --git a/ndk/platforms/android-20/arch-arm64/lib/libz.a b/ndk/platforms/android-20/arch-arm64/lib/libz.a
index d8cc6a4..5ee5792 100644
--- a/ndk/platforms/android-20/arch-arm64/lib/libz.a
+++ b/ndk/platforms/android-20/arch-arm64/lib/libz.a
Binary files differ
diff --git a/ndk/platforms/android-20/arch-arm64/symbols/libc.so.functions.txt b/ndk/platforms/android-20/arch-arm64/symbols/libc.so.functions.txt
index 705590d..e6c452b 100644
--- a/ndk/platforms/android-20/arch-arm64/symbols/libc.so.functions.txt
+++ b/ndk/platforms/android-20/arch-arm64/symbols/libc.so.functions.txt
@@ -581,7 +581,6 @@
isnormall
isprint
ispunct
-issetugid
isspace
isupper
iswalnum
diff --git a/ndk/platforms/android-20/arch-mips/lib/libc.a b/ndk/platforms/android-20/arch-mips/lib/libc.a
index 1719ecd..a4ffc8e 100644
--- a/ndk/platforms/android-20/arch-mips/lib/libc.a
+++ b/ndk/platforms/android-20/arch-mips/lib/libc.a
Binary files differ
diff --git a/ndk/platforms/android-20/arch-mips/lib/libm.a b/ndk/platforms/android-20/arch-mips/lib/libm.a
index cb1e717..1a1782f 100644
--- a/ndk/platforms/android-20/arch-mips/lib/libm.a
+++ b/ndk/platforms/android-20/arch-mips/lib/libm.a
Binary files differ
diff --git a/ndk/platforms/android-20/arch-mips/lib/libz.a b/ndk/platforms/android-20/arch-mips/lib/libz.a
index 293d896..35ee3e2 100644
--- a/ndk/platforms/android-20/arch-mips/lib/libz.a
+++ b/ndk/platforms/android-20/arch-mips/lib/libz.a
Binary files differ
diff --git a/ndk/platforms/android-20/arch-mips/symbols/libc.so.functions.txt b/ndk/platforms/android-20/arch-mips/symbols/libc.so.functions.txt
index b89f15b..c7f4deb 100644
--- a/ndk/platforms/android-20/arch-mips/symbols/libc.so.functions.txt
+++ b/ndk/platforms/android-20/arch-mips/symbols/libc.so.functions.txt
@@ -638,7 +638,6 @@
isnormall
isprint
ispunct
-issetugid
isspace
isupper
iswalnum
diff --git a/ndk/platforms/android-20/arch-mips64/lib/libc.a b/ndk/platforms/android-20/arch-mips64/lib/libc.a
index e0d9891..12d5f11 100644
--- a/ndk/platforms/android-20/arch-mips64/lib/libc.a
+++ b/ndk/platforms/android-20/arch-mips64/lib/libc.a
Binary files differ
diff --git a/ndk/platforms/android-20/arch-mips64/lib/libm.a b/ndk/platforms/android-20/arch-mips64/lib/libm.a
index c8e877c..21c390b 100644
--- a/ndk/platforms/android-20/arch-mips64/lib/libm.a
+++ b/ndk/platforms/android-20/arch-mips64/lib/libm.a
Binary files differ
diff --git a/ndk/platforms/android-20/arch-mips64/lib/libstdc++.a b/ndk/platforms/android-20/arch-mips64/lib/libstdc++.a
index aff84b9..33d8bd9 100644
--- a/ndk/platforms/android-20/arch-mips64/lib/libstdc++.a
+++ b/ndk/platforms/android-20/arch-mips64/lib/libstdc++.a
Binary files differ
diff --git a/ndk/platforms/android-20/arch-mips64/lib/libz.a b/ndk/platforms/android-20/arch-mips64/lib/libz.a
index d4a16dd..f9ca486 100644
--- a/ndk/platforms/android-20/arch-mips64/lib/libz.a
+++ b/ndk/platforms/android-20/arch-mips64/lib/libz.a
Binary files differ
diff --git a/ndk/platforms/android-20/arch-mips64/symbols/libc.so.functions.txt b/ndk/platforms/android-20/arch-mips64/symbols/libc.so.functions.txt
index 66b80a9..a8cec1d 100644
--- a/ndk/platforms/android-20/arch-mips64/symbols/libc.so.functions.txt
+++ b/ndk/platforms/android-20/arch-mips64/symbols/libc.so.functions.txt
@@ -585,7 +585,6 @@
isnormall
isprint
ispunct
-issetugid
isspace
isupper
iswalnum
diff --git a/ndk/platforms/android-20/arch-x86/lib/libc.a b/ndk/platforms/android-20/arch-x86/lib/libc.a
index ba9c1e8..b6fe8e1 100644
--- a/ndk/platforms/android-20/arch-x86/lib/libc.a
+++ b/ndk/platforms/android-20/arch-x86/lib/libc.a
Binary files differ
diff --git a/ndk/platforms/android-20/arch-x86/lib/libm.a b/ndk/platforms/android-20/arch-x86/lib/libm.a
index 4fc0cfb..370a4ef 100644
--- a/ndk/platforms/android-20/arch-x86/lib/libm.a
+++ b/ndk/platforms/android-20/arch-x86/lib/libm.a
Binary files differ
diff --git a/ndk/platforms/android-20/arch-x86/lib/libz.a b/ndk/platforms/android-20/arch-x86/lib/libz.a
index 824da02..0916682 100644
--- a/ndk/platforms/android-20/arch-x86/lib/libz.a
+++ b/ndk/platforms/android-20/arch-x86/lib/libz.a
Binary files differ
diff --git a/ndk/platforms/android-20/arch-x86/symbols/libc.so.functions.txt b/ndk/platforms/android-20/arch-x86/symbols/libc.so.functions.txt
index 7faaa45..735729b 100644
--- a/ndk/platforms/android-20/arch-x86/symbols/libc.so.functions.txt
+++ b/ndk/platforms/android-20/arch-x86/symbols/libc.so.functions.txt
@@ -634,7 +634,6 @@
isnormall
isprint
ispunct
-issetugid
isspace
isupper
iswalnum
diff --git a/ndk/platforms/android-20/arch-x86_64/lib64/libc.a b/ndk/platforms/android-20/arch-x86_64/lib64/libc.a
index 82ee862..90e031d 100644
--- a/ndk/platforms/android-20/arch-x86_64/lib64/libc.a
+++ b/ndk/platforms/android-20/arch-x86_64/lib64/libc.a
Binary files differ
diff --git a/ndk/platforms/android-20/arch-x86_64/lib64/libm.a b/ndk/platforms/android-20/arch-x86_64/lib64/libm.a
index c039f45..571eb3e 100644
--- a/ndk/platforms/android-20/arch-x86_64/lib64/libm.a
+++ b/ndk/platforms/android-20/arch-x86_64/lib64/libm.a
Binary files differ
diff --git a/ndk/platforms/android-20/arch-x86_64/lib64/libz.a b/ndk/platforms/android-20/arch-x86_64/lib64/libz.a
index 5919512..536a06a 100644
--- a/ndk/platforms/android-20/arch-x86_64/lib64/libz.a
+++ b/ndk/platforms/android-20/arch-x86_64/lib64/libz.a
Binary files differ
diff --git a/ndk/platforms/android-20/arch-x86_64/symbols/libc.so.functions.txt b/ndk/platforms/android-20/arch-x86_64/symbols/libc.so.functions.txt
index 705590d..e6c452b 100644
--- a/ndk/platforms/android-20/arch-x86_64/symbols/libc.so.functions.txt
+++ b/ndk/platforms/android-20/arch-x86_64/symbols/libc.so.functions.txt
@@ -581,7 +581,6 @@
isnormall
isprint
ispunct
-issetugid
isspace
isupper
iswalnum
diff --git a/ndk/platforms/android-20/include/stdint.h b/ndk/platforms/android-20/include/stdint.h
index f34843c..9f588f7 100644
--- a/ndk/platforms/android-20/include/stdint.h
+++ b/ndk/platforms/android-20/include/stdint.h
@@ -180,6 +180,7 @@
#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
diff --git a/ndk/platforms/android-20/include/sys/ucontext.h b/ndk/platforms/android-20/include/sys/ucontext.h
index d6c6b43..f62380d 100644
--- a/ndk/platforms/android-20/include/sys/ucontext.h
+++ b/ndk/platforms/android-20/include/sys/ucontext.h
@@ -68,8 +68,13 @@
struct ucontext* uc_link;
stack_t uc_stack;
mcontext_t uc_mcontext;
- sigset_t uc_sigmask;
- char __padding[128 - sizeof(sigset_t)];
+ // Android has a wrong (smaller) sigset_t on ARM.
+ 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 @@
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 @@
struct ucontext* uc_link;
stack_t uc_stack;
mcontext_t uc_mcontext;
- sigset_t uc_sigmask;
- char __padding[128 - sizeof(sigset_t)];
+ // Android has a wrong (smaller) sigset_t on x86.
+ union {
+ sigset_t bionic;
+ uint32_t kernel[2];
+ } uc_sigmask;
struct _libc_fpstate __fpregs_mem;
} ucontext_t;
@@ -198,7 +207,6 @@
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 @@
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;
diff --git a/ndk/platforms/android-20/include/unistd.h b/ndk/platforms/android-20/include/unistd.h
index 08a82e6..b4982cb 100644
--- a/ndk/platforms/android-20/include/unistd.h
+++ b/ndk/platforms/android-20/include/unistd.h
@@ -92,7 +92,6 @@
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);