diff options
author | Andrew Hsieh <andrewhsieh@google.com> | 2014-07-25 11:23:05 +0800 |
---|---|---|
committer | Andrew Hsieh <andrewhsieh@google.com> | 2014-07-30 07:53:54 +0000 |
commit | 295d6c2c44c7af4f811ffa551fedc4993d165e81 (patch) | |
tree | 84745bc0996f6855e0d67a0bb9780e259c9189c3 /9/platforms/android-19/arch-x86_64 | |
parent | 7a8bc5c36d519c41de61765ff94245f56c4bed7a (diff) | |
download | prebuilts_ndk-295d6c2c44c7af4f811ffa551fedc4993d165e81.zip prebuilts_ndk-295d6c2c44c7af4f811ffa551fedc4993d165e81.tar.gz prebuilts_ndk-295d6c2c44c7af4f811ffa551fedc4993d165e81.tar.bz2 |
Refresh 64-bit headers/libs (WW31)
Sync to bionic 861c0ef37bcfcae56d88572cb01c18bcfe1faded
Change-Id: I676e58be9516e7990fedcd303715672143936d3b
Diffstat (limited to '9/platforms/android-19/arch-x86_64')
-rw-r--r-- | 9/platforms/android-19/arch-x86_64/usr/include/grp.h | 11 | ||||
-rw-r--r-- | 9/platforms/android-19/arch-x86_64/usr/include/machine/endian.h | 2 | ||||
-rw-r--r-- | 9/platforms/android-19/arch-x86_64/usr/include/search.h | 3 | ||||
-rw-r--r-- | 9/platforms/android-19/arch-x86_64/usr/include/stdint.h | 2 | ||||
-rw-r--r-- | 9/platforms/android-19/arch-x86_64/usr/include/stdio.h | 9 | ||||
-rw-r--r-- | 9/platforms/android-19/arch-x86_64/usr/include/stdlib.h | 22 | ||||
-rw-r--r-- | 9/platforms/android-19/arch-x86_64/usr/include/sys/cdefs_elf.h | 2 | ||||
-rw-r--r-- | 9/platforms/android-19/arch-x86_64/usr/include/sys/syscall.h | 2 | ||||
-rw-r--r-- | 9/platforms/android-19/arch-x86_64/usr/include/syslog.h | 91 | ||||
-rw-r--r-- | 9/platforms/android-19/arch-x86_64/usr/include/unistd.h | 12 | ||||
-rw-r--r-- | 9/platforms/android-19/arch-x86_64/usr/lib64/libc.a | bin | 16071880 -> 16042628 bytes | |||
-rwxr-xr-x | 9/platforms/android-19/arch-x86_64/usr/lib64/libc.so | bin | 131272 -> 131616 bytes |
12 files changed, 62 insertions, 94 deletions
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/grp.h b/9/platforms/android-19/arch-x86_64/usr/include/grp.h index 86d99f3..fc4d520 100644 --- a/9/platforms/android-19/arch-x86_64/usr/include/grp.h +++ b/9/platforms/android-19/arch-x86_64/usr/include/grp.h @@ -43,10 +43,6 @@ #include <sys/cdefs.h> #include <sys/types.h> -#if __BSD_VISIBLE -#define _PATH_GROUP "/etc/group" -#endif - struct group { char *gr_name; /* group name */ char *gr_passwd; /* group password */ @@ -57,7 +53,7 @@ struct group { __BEGIN_DECLS struct group *getgrgid(gid_t); struct group *getgrnam(const char *); -#if __BSD_VISIBLE || __POSIX_VISIBLE >= 200112 || __XPG_VISIBLE +#if __POSIX_VISIBLE >= 200112 || __XPG_VISIBLE struct group *getgrent(void); void setgrent(void); void endgrent(void); @@ -66,11 +62,6 @@ int getgrgid_r(gid_t, struct group *, char *, int getgrnam_r(const char *, struct group *, char *, size_t, struct group **); #endif -#if __BSD_VISIBLE -void setgrfile(const char *); -int setgroupent(int); -char *group_from_gid(gid_t, int); -#endif int getgrouplist (const char *user, gid_t group, gid_t *groups, int *ngroups); diff --git a/9/platforms/android-19/arch-x86_64/usr/include/machine/endian.h b/9/platforms/android-19/arch-x86_64/usr/include/machine/endian.h index 7889a37..4d9060b 100644 --- a/9/platforms/android-19/arch-x86_64/usr/include/machine/endian.h +++ b/9/platforms/android-19/arch-x86_64/usr/include/machine/endian.h @@ -27,6 +27,8 @@ #ifndef _MACHINE_ENDIAN_H_ #define _MACHINE_ENDIAN_H_ +#include <sys/types.h> + #ifdef __GNUC__ #define __swap32md(x) __statement({ \ diff --git a/9/platforms/android-19/arch-x86_64/usr/include/search.h b/9/platforms/android-19/arch-x86_64/usr/include/search.h index b2c0e6b..9b01e12 100644 --- a/9/platforms/android-19/arch-x86_64/usr/include/search.h +++ b/9/platforms/android-19/arch-x86_64/usr/include/search.h @@ -29,6 +29,9 @@ typedef struct node { __BEGIN_DECLS +void insque(void*, void*); +void remque(void*); + void* lfind(const void*, const void*, size_t*, size_t, int (*)(const void*, const void*)); void* lsearch(const void*, void*, size_t*, size_t, int (*)(const void*, const void*)); diff --git a/9/platforms/android-19/arch-x86_64/usr/include/stdint.h b/9/platforms/android-19/arch-x86_64/usr/include/stdint.h index 9f588f7..02e3563 100644 --- a/9/platforms/android-19/arch-x86_64/usr/include/stdint.h +++ b/9/platforms/android-19/arch-x86_64/usr/include/stdint.h @@ -204,7 +204,7 @@ typedef int64_t intmax_t; #if defined(__WINT_UNSIGNED__) # define WINT_MAX UINT32_MAX -# define WINT_MIN UINT32_MIN +# define WINT_MIN 0 #else # define WINT_MAX INT32_MAX # define WINT_MIN INT32_MIN diff --git a/9/platforms/android-19/arch-x86_64/usr/include/stdio.h b/9/platforms/android-19/arch-x86_64/usr/include/stdio.h index b9de121..4d160a3 100644 --- a/9/platforms/android-19/arch-x86_64/usr/include/stdio.h +++ b/9/platforms/android-19/arch-x86_64/usr/include/stdio.h @@ -223,12 +223,6 @@ ssize_t getdelim(char ** __restrict, size_t * __restrict, int, FILE * __restrict); ssize_t getline(char ** __restrict, size_t * __restrict, FILE * __restrict); -#if __BSD_VISIBLE && !defined(__SYS_ERRLIST) -#define __SYS_ERRLIST -extern int sys_nerr; /* perror(3) external variables */ -extern char *sys_errlist[]; -#endif - void perror(const char *); int printf(const char * __restrict, ...) __printflike(1, 2); @@ -300,9 +294,6 @@ __END_DECLS #define L_ctermid 1024 /* size for ctermid(); PATH_MAX */ __BEGIN_DECLS -#if 0 /* MISSING FROM BIONIC */ -char *ctermid(char *); -#endif /* MISSING */ FILE *fdopen(int, const char *); int fileno(FILE *); diff --git a/9/platforms/android-19/arch-x86_64/usr/include/stdlib.h b/9/platforms/android-19/arch-x86_64/usr/include/stdlib.h index caffd7a..39fad0f 100644 --- a/9/platforms/android-19/arch-x86_64/usr/include/stdlib.h +++ b/9/platforms/android-19/arch-x86_64/usr/include/stdlib.h @@ -126,18 +126,12 @@ long random(void); char* setstate(char*); void srandom(unsigned int); -/* Basic PTY functions. These only work if devpts is mounted! */ - -extern int unlockpt(int); -extern char* ptsname(int); -extern int ptsname_r(int, char*, size_t); -extern int getpt(void); - -static __inline__ int grantpt(int __fd __attribute((unused))) -{ - (void)__fd; - return 0; /* devpts does this all for us! */ -} +int getpt(void); +int grantpt(int); +int posix_openpt(int); +char* ptsname(int) __warnattr("ptsname is not thread-safe; use ptsname_r instead"); +int ptsname_r(int, char*, size_t); +int unlockpt(int); typedef struct { int quot; @@ -175,10 +169,6 @@ extern size_t wcstombs(char *, const wchar_t *, size_t); #define MB_CUR_MAX 4U -#if 0 /* MISSING FROM BIONIC */ -extern int on_exit(void (*)(int, void *), void *); -#endif /* MISSING */ - __END_DECLS #endif /* _STDLIB_H_ */ diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/cdefs_elf.h b/9/platforms/android-19/arch-x86_64/usr/include/sys/cdefs_elf.h index d98197c..a5fa7fb 100644 --- a/9/platforms/android-19/arch-x86_64/usr/include/sys/cdefs_elf.h +++ b/9/platforms/android-19/arch-x86_64/usr/include/sys/cdefs_elf.h @@ -68,7 +68,7 @@ #ifdef __LP64__ #define __LIBC64_HIDDEN__ __LIBC_HIDDEN__ #else -#define __LIBC64_HIDDEN__ +#define __LIBC64_HIDDEN__ __LIBC_ABI_PUBLIC__ #endif /* Used to tag non-static symbols that are public and exposed by the shared library. */ diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/syscall.h b/9/platforms/android-19/arch-x86_64/usr/include/sys/syscall.h index a44b2e5..34a29df 100644 --- a/9/platforms/android-19/arch-x86_64/usr/include/sys/syscall.h +++ b/9/platforms/android-19/arch-x86_64/usr/include/sys/syscall.h @@ -37,7 +37,7 @@ __BEGIN_DECLS -int syscall(int number, ...); +long syscall(long number, ...); __END_DECLS diff --git a/9/platforms/android-19/arch-x86_64/usr/include/syslog.h b/9/platforms/android-19/arch-x86_64/usr/include/syslog.h index a52e811..cbceab2 100644 --- a/9/platforms/android-19/arch-x86_64/usr/include/syslog.h +++ b/9/platforms/android-19/arch-x86_64/usr/include/syslog.h @@ -35,59 +35,60 @@ __BEGIN_DECLS -#define LOG_EMERG 0 -#define LOG_ALERT 1 -#define LOG_CRIT 2 -#define LOG_ERR 3 -#define LOG_WARNING 4 -#define LOG_NOTICE 5 -#define LOG_INFO 6 -#define LOG_DEBUG 7 +/* Priorities are translated to Android log priorities as shown. */ +#define LOG_EMERG 0 /* ERROR */ +#define LOG_ALERT 1 /* ERROR */ +#define LOG_CRIT 2 /* ERROR */ +#define LOG_ERR 3 /* ERROR */ +#define LOG_WARNING 4 /* WARN */ +#define LOG_NOTICE 5 /* INFO */ +#define LOG_INFO 6 /* INFO */ +#define LOG_DEBUG 7 /* DEBUG */ -#define LOG_PRIMASK 7 -#define LOG_PRI(x) ((x) & LOG_PRIMASK) +#define LOG_PRIMASK 7 +#define LOG_PRI(x) ((x) & LOG_PRIMASK) -#define LOG_KERN 0000 -#define LOG_USER 0010 -#define LOG_MAIL 0020 -#define LOG_DAEMON 0030 -#define LOG_AUTH 0040 -#define LOG_SYSLOG 0050 -#define LOG_LPR 0060 -#define LOG_NEWS 0070 -#define LOG_UUCP 0100 -#define LOG_CRON 0110 -#define LOG_AUTHPRIV 0120 -#define LOG_FTP 0130 -#define LOG_LOCAL0 0200 -#define LOG_LOCAL1 0210 -#define LOG_LOCAL2 0220 -#define LOG_LOCAL3 0230 -#define LOG_LOCAL4 0240 -#define LOG_LOCAL5 0250 -#define LOG_LOCAL6 0260 -#define LOG_LOCAL7 0270 +/* Facilities are currently ignored on Android. */ +#define LOG_KERN 0000 +#define LOG_USER 0010 +#define LOG_MAIL 0020 +#define LOG_DAEMON 0030 +#define LOG_AUTH 0040 +#define LOG_SYSLOG 0050 +#define LOG_LPR 0060 +#define LOG_NEWS 0070 +#define LOG_UUCP 0100 +#define LOG_CRON 0110 +#define LOG_AUTHPRIV 0120 +#define LOG_FTP 0130 +#define LOG_LOCAL0 0200 +#define LOG_LOCAL1 0210 +#define LOG_LOCAL2 0220 +#define LOG_LOCAL3 0230 +#define LOG_LOCAL4 0240 +#define LOG_LOCAL5 0250 +#define LOG_LOCAL6 0260 +#define LOG_LOCAL7 0270 -#define LOG_FACMASK 01770 -#define LOG_FAC(x) (((x) >> 3) & (LOG_FACMASK >> 3)) +#define LOG_FACMASK 01770 +#define LOG_FAC(x) (((x) >> 3) & (LOG_FACMASK >> 3)) #define LOG_MASK(pri) (1 << (pri)) #define LOG_UPTO(pri) ((1 << ((pri)+1)) - 1) -#define LOG_PID 0x01 /* include pid with message */ -#define LOG_CONS 0x02 /* write to console on logger error */ -#define LOG_ODELAY 0x04 /* delay connection until syslog() */ -#define LOG_NDELAY 0x08 /* open connection immediately */ -#define LOG_NOWAIT 0x10 /* wait for child processes (unused on linux) */ -#define LOG_PERROR 0x20 /* additional logging to stderr */ +/* openlog(3) flags are currently ignored on Android. */ +#define LOG_PID 0x01 +#define LOG_CONS 0x02 +#define LOG_ODELAY 0x04 +#define LOG_NDELAY 0x08 +#define LOG_NOWAIT 0x10 +#define LOG_PERROR 0x20 -#define _PATH_LOG "/dev/syslog" - -extern void closelog(void); -extern void openlog(const char *, int, int); -extern int setlogmask(int); -extern void syslog(int, const char *, ...) __printflike(2, 3); -extern void vsyslog(int, const char *, va_list) __printflike(2, 0); +void closelog(void); +void openlog(const char*, int, int); +int setlogmask(int); +void syslog(int, const char*, ...) __printflike(2, 3); +void vsyslog(int, const char*, va_list) __printflike(2, 0); __END_DECLS diff --git a/9/platforms/android-19/arch-x86_64/usr/include/unistd.h b/9/platforms/android-19/arch-x86_64/usr/include/unistd.h index 12e6257..7fbafdf 100644 --- a/9/platforms/android-19/arch-x86_64/usr/include/unistd.h +++ b/9/platforms/android-19/arch-x86_64/usr/include/unistd.h @@ -170,7 +170,7 @@ extern char *optarg; extern int optind, opterr, optopt; extern int isatty(int); -extern char* ttyname(int); +extern char* ttyname(int) __warnattr("ttyname is not thread-safe; use ttyname_r instead"); extern int ttyname_r(int, char*, size_t); extern int acct(const char* filepath); @@ -189,16 +189,6 @@ extern int cacheflush(long, long, long); extern pid_t tcgetpgrp(int fd); extern int tcsetpgrp(int fd, pid_t _pid); -#if 0 /* MISSING FROM BIONIC */ -extern int execlpe(const char *, const char *, ...); -extern int getfsuid(uid_t); -extern int setfsuid(uid_t); -extern int getlogin_r(char* name, size_t namesize); -extern int sethostname(const char *, size_t); -extern int getdomainname(char *, size_t); -extern int setdomainname(const char *, size_t); -#endif /* MISSING */ - /* Used to retry syscalls that can return EINTR. */ #define TEMP_FAILURE_RETRY(exp) ({ \ __typeof__(exp) _rc; \ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libc.a b/9/platforms/android-19/arch-x86_64/usr/lib64/libc.a Binary files differindex dae1be2..7cbbb67 100644 --- a/9/platforms/android-19/arch-x86_64/usr/lib64/libc.a +++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libc.a diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libc.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libc.so Binary files differindex a4e8750..b3d00b7 100755 --- a/9/platforms/android-19/arch-x86_64/usr/lib64/libc.so +++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libc.so |