Merge "Implement funopen64."
diff --git a/libc/bionic/lockf.cpp b/libc/bionic/lockf.cpp
index 1510b3d..804ad68 100644
--- a/libc/bionic/lockf.cpp
+++ b/libc/bionic/lockf.cpp
@@ -34,7 +34,7 @@
int lockf64(int fd, int cmd, off64_t length) {
// Translate POSIX lockf into fcntl.
- struct flock fl;
+ struct flock64 fl;
memset(&fl, 0, sizeof(fl));
fl.l_whence = SEEK_CUR;
fl.l_start = 0;
diff --git a/libc/libc.arm.brillo.map b/libc/libc.arm.brillo.map
index 8280d91..f81adca 100644
--- a/libc/libc.arm.brillo.map
+++ b/libc/libc.arm.brillo.map
@@ -234,10 +234,6 @@
alarm;
alphasort;
alphasort64;
- android_getaddrinfofornet;
- android_getaddrinfofornetcontext;
- android_gethostbyaddrfornet;
- android_gethostbynamefornet;
android_set_abort_message;
arc4random;
arc4random_buf;
@@ -1427,6 +1423,10 @@
_Unwind_VRS_Get; # arm
_Unwind_VRS_Pop; # arm
_Unwind_VRS_Set; # arm
+ android_getaddrinfofornet;
+ android_getaddrinfofornetcontext;
+ android_gethostbyaddrfornet;
+ android_gethostbynamefornet;
atexit; # arm
free_malloc_leak_info;
get_malloc_leak_info;
diff --git a/libc/libc.arm.map b/libc/libc.arm.map
index 536273d..45d7539 100644
--- a/libc/libc.arm.map
+++ b/libc/libc.arm.map
@@ -234,10 +234,6 @@
alarm;
alphasort;
alphasort64;
- android_getaddrinfofornet;
- android_getaddrinfofornetcontext;
- android_gethostbyaddrfornet;
- android_gethostbynamefornet;
android_set_abort_message;
arc4random;
arc4random_buf;
@@ -1439,6 +1435,10 @@
_Unwind_VRS_Get; # arm
_Unwind_VRS_Pop; # arm
_Unwind_VRS_Set; # arm
+ android_getaddrinfofornet;
+ android_getaddrinfofornetcontext;
+ android_gethostbyaddrfornet;
+ android_gethostbynamefornet;
arc4random_addrandom; # arm x86 mips nobrillo
arc4random_stir; # arm x86 mips nobrillo
atexit; # arm
diff --git a/libc/libc.arm64.map b/libc/libc.arm64.map
index 057e167..37c475f 100644
--- a/libc/libc.arm64.map
+++ b/libc/libc.arm64.map
@@ -171,10 +171,6 @@
alarm;
alphasort;
alphasort64;
- android_getaddrinfofornet;
- android_getaddrinfofornetcontext;
- android_gethostbyaddrfornet;
- android_gethostbynamefornet;
android_set_abort_message;
arc4random;
arc4random_buf;
@@ -1188,6 +1184,10 @@
LIBC_PRIVATE {
global:
+ android_getaddrinfofornet;
+ android_getaddrinfofornetcontext;
+ android_gethostbyaddrfornet;
+ android_gethostbynamefornet;
free_malloc_leak_info;
get_malloc_leak_info;
gMallocLeakZygoteChild;
diff --git a/libc/libc.map.txt b/libc/libc.map.txt
index 32ef22a..3179049 100644
--- a/libc/libc.map.txt
+++ b/libc/libc.map.txt
@@ -238,10 +238,6 @@
alarm;
alphasort;
alphasort64;
- android_getaddrinfofornet;
- android_getaddrinfofornetcontext;
- android_gethostbyaddrfornet;
- android_gethostbynamefornet;
android_set_abort_message;
arc4random;
arc4random_buf;
@@ -1467,6 +1463,10 @@
_Unwind_VRS_Get; # arm
_Unwind_VRS_Pop; # arm
_Unwind_VRS_Set; # arm
+ android_getaddrinfofornet;
+ android_getaddrinfofornetcontext;
+ android_gethostbyaddrfornet;
+ android_gethostbynamefornet;
arc4random_addrandom; # arm x86 mips nobrillo
arc4random_stir; # arm x86 mips nobrillo
atexit; # arm
diff --git a/libc/libc.mips.brillo.map b/libc/libc.mips.brillo.map
index ef3244a..734f686 100644
--- a/libc/libc.mips.brillo.map
+++ b/libc/libc.mips.brillo.map
@@ -233,10 +233,6 @@
alarm;
alphasort;
alphasort64;
- android_getaddrinfofornet;
- android_getaddrinfofornetcontext;
- android_gethostbyaddrfornet;
- android_gethostbynamefornet;
android_set_abort_message;
arc4random;
arc4random_buf;
@@ -1271,6 +1267,10 @@
__udivdi3; # arm mips
__umoddi3; # x86 mips
_fwalk; # arm x86 mips
+ android_getaddrinfofornet;
+ android_getaddrinfofornetcontext;
+ android_gethostbyaddrfornet;
+ android_gethostbynamefornet;
free_malloc_leak_info;
get_malloc_leak_info;
gMallocLeakZygoteChild;
diff --git a/libc/libc.mips.map b/libc/libc.mips.map
index 9ab0c65..86a2a59 100644
--- a/libc/libc.mips.map
+++ b/libc/libc.mips.map
@@ -233,10 +233,6 @@
alarm;
alphasort;
alphasort64;
- android_getaddrinfofornet;
- android_getaddrinfofornetcontext;
- android_gethostbyaddrfornet;
- android_gethostbynamefornet;
android_set_abort_message;
arc4random;
arc4random_buf;
@@ -1283,6 +1279,10 @@
__umoddi3; # x86 mips
__wait4; # arm x86 mips nobrillo
_fwalk; # arm x86 mips
+ android_getaddrinfofornet;
+ android_getaddrinfofornetcontext;
+ android_gethostbyaddrfornet;
+ android_gethostbynamefornet;
arc4random_addrandom; # arm x86 mips nobrillo
arc4random_stir; # arm x86 mips nobrillo
bcopy; # arm x86 mips nobrillo
diff --git a/libc/libc.mips64.map b/libc/libc.mips64.map
index 057e167..37c475f 100644
--- a/libc/libc.mips64.map
+++ b/libc/libc.mips64.map
@@ -171,10 +171,6 @@
alarm;
alphasort;
alphasort64;
- android_getaddrinfofornet;
- android_getaddrinfofornetcontext;
- android_gethostbyaddrfornet;
- android_gethostbynamefornet;
android_set_abort_message;
arc4random;
arc4random_buf;
@@ -1188,6 +1184,10 @@
LIBC_PRIVATE {
global:
+ android_getaddrinfofornet;
+ android_getaddrinfofornetcontext;
+ android_gethostbyaddrfornet;
+ android_gethostbynamefornet;
free_malloc_leak_info;
get_malloc_leak_info;
gMallocLeakZygoteChild;
diff --git a/libc/libc.x86.brillo.map b/libc/libc.x86.brillo.map
index c6277dc..ceaa07d 100644
--- a/libc/libc.x86.brillo.map
+++ b/libc/libc.x86.brillo.map
@@ -233,10 +233,6 @@
alarm;
alphasort;
alphasort64;
- android_getaddrinfofornet;
- android_getaddrinfofornetcontext;
- android_gethostbyaddrfornet;
- android_gethostbynamefornet;
android_set_abort_message;
arc4random;
arc4random_buf;
@@ -1270,6 +1266,10 @@
__swsetup; # arm x86 mips
__umoddi3; # x86 mips
_fwalk; # arm x86 mips
+ android_getaddrinfofornet;
+ android_getaddrinfofornetcontext;
+ android_gethostbyaddrfornet;
+ android_gethostbynamefornet;
free_malloc_leak_info;
get_malloc_leak_info;
gMallocLeakZygoteChild;
diff --git a/libc/libc.x86.map b/libc/libc.x86.map
index 6497bf8..cc35757 100644
--- a/libc/libc.x86.map
+++ b/libc/libc.x86.map
@@ -233,10 +233,6 @@
alarm;
alphasort;
alphasort64;
- android_getaddrinfofornet;
- android_getaddrinfofornetcontext;
- android_gethostbyaddrfornet;
- android_gethostbynamefornet;
android_set_abort_message;
arc4random;
arc4random_buf;
@@ -1282,6 +1278,10 @@
__umoddi3; # x86 mips
__wait4; # arm x86 mips nobrillo
_fwalk; # arm x86 mips
+ android_getaddrinfofornet;
+ android_getaddrinfofornetcontext;
+ android_gethostbyaddrfornet;
+ android_gethostbynamefornet;
arc4random_addrandom; # arm x86 mips nobrillo
arc4random_stir; # arm x86 mips nobrillo
bcopy; # arm x86 mips nobrillo
diff --git a/libc/libc.x86_64.map b/libc/libc.x86_64.map
index 057e167..37c475f 100644
--- a/libc/libc.x86_64.map
+++ b/libc/libc.x86_64.map
@@ -171,10 +171,6 @@
alarm;
alphasort;
alphasort64;
- android_getaddrinfofornet;
- android_getaddrinfofornetcontext;
- android_gethostbyaddrfornet;
- android_gethostbynamefornet;
android_set_abort_message;
arc4random;
arc4random_buf;
@@ -1188,6 +1184,10 @@
LIBC_PRIVATE {
global:
+ android_getaddrinfofornet;
+ android_getaddrinfofornetcontext;
+ android_gethostbyaddrfornet;
+ android_gethostbynamefornet;
free_malloc_leak_info;
get_malloc_leak_info;
gMallocLeakZygoteChild;