summaryrefslogtreecommitdiffstats
path: root/9/platforms
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2014-05-16 16:21:25 +0800
committerAndrew Hsieh <andrewhsieh@google.com>2014-05-16 19:05:40 +0800
commit14c2fbd9d075cf4214e83beb231f376bbc7604e1 (patch)
treea0258b8492eff6cf1a5a097a837cb5ba42fbd471 /9/platforms
parent712601cec99eb0715627274bbcfec4e25b592136 (diff)
downloadprebuilts_ndk-14c2fbd9d075cf4214e83beb231f376bbc7604e1.zip
prebuilts_ndk-14c2fbd9d075cf4214e83beb231f376bbc7604e1.tar.gz
prebuilts_ndk-14c2fbd9d075cf4214e83beb231f376bbc7604e1.tar.bz2
Refresh 64-bit headers/libs (WW20)
To bionic: 5265ad6273cd7c61d096ebe0e29e493915e7c63e (5/16) Change-Id: I28dd1476ae522367b5ab7e5c1dc5864572404850
Diffstat (limited to '9/platforms')
-rw-r--r--9/platforms/android-19/arch-arm64/usr/include/arpa/inet.h23
-rw-r--r--9/platforms/android-19/arch-arm64/usr/include/dirent.h2
-rw-r--r--9/platforms/android-19/arch-arm64/usr/include/mntent.h20
-rw-r--r--9/platforms/android-19/arch-arm64/usr/include/nsswitch.h7
-rw-r--r--9/platforms/android-19/arch-arm64/usr/include/pthread.h6
-rw-r--r--9/platforms/android-19/arch-arm64/usr/include/pwd.h15
-rw-r--r--9/platforms/android-19/arch-arm64/usr/include/sched.h6
-rw-r--r--9/platforms/android-19/arch-arm64/usr/include/sys/endian.h16
-rw-r--r--9/platforms/android-19/arch-arm64/usr/include/sys/stat.h2
-rw-r--r--9/platforms/android-19/arch-arm64/usr/include/sys/statvfs.h10
-rw-r--r--9/platforms/android-19/arch-arm64/usr/include/sys/ucontext.h32
-rw-r--r--9/platforms/android-19/arch-arm64/usr/include/sys/user.h2
-rw-r--r--9/platforms/android-19/arch-arm64/usr/include/sys/vfs.h2
-rw-r--r--9/platforms/android-19/arch-arm64/usr/include/wchar.h14
-rwxr-xr-x9/platforms/android-19/arch-arm64/usr/lib/libEGL.sobin5987 -> 5987 bytes
-rwxr-xr-x9/platforms/android-19/arch-arm64/usr/lib/libGLESv1_CM.sobin28171 -> 28171 bytes
-rwxr-xr-x9/platforms/android-19/arch-arm64/usr/lib/libGLESv2.sobin21848 -> 21848 bytes
-rwxr-xr-x9/platforms/android-19/arch-arm64/usr/lib/libGLESv3.sobin27426 -> 27426 bytes
-rwxr-xr-x9/platforms/android-19/arch-arm64/usr/lib/libOpenMAXAL.sobin6821 -> 6821 bytes
-rwxr-xr-x9/platforms/android-19/arch-arm64/usr/lib/libOpenSLES.sobin7570 -> 7570 bytes
-rwxr-xr-x9/platforms/android-19/arch-arm64/usr/lib/libandroid.sobin21249 -> 21249 bytes
-rw-r--r--9/platforms/android-19/arch-arm64/usr/lib/libc.abin9699426 -> 9798886 bytes
-rwxr-xr-x9/platforms/android-19/arch-arm64/usr/lib/libc.sobin100360 -> 101161 bytes
-rwxr-xr-x9/platforms/android-19/arch-arm64/usr/lib/libdl.sobin3078 -> 3078 bytes
-rwxr-xr-x9/platforms/android-19/arch-arm64/usr/lib/libjnigraphics.sobin2638 -> 2638 bytes
-rwxr-xr-x9/platforms/android-19/arch-arm64/usr/lib/liblog.sobin3221 -> 3221 bytes
-rw-r--r--9/platforms/android-19/arch-arm64/usr/lib/libm.abin2825072 -> 2831336 bytes
-rwxr-xr-x9/platforms/android-19/arch-arm64/usr/lib/libm.sobin25566 -> 25566 bytes
-rw-r--r--9/platforms/android-19/arch-arm64/usr/lib/libstdc++.abin42816 -> 42944 bytes
-rwxr-xr-x9/platforms/android-19/arch-arm64/usr/lib/libstdc++.sobin4789 -> 4789 bytes
-rw-r--r--9/platforms/android-19/arch-arm64/usr/lib/libz.abin1162974 -> 1163406 bytes
-rw-r--r--9/platforms/android-19/arch-mips64/usr/include/arpa/inet.h23
-rw-r--r--9/platforms/android-19/arch-mips64/usr/include/asm/byteorder.h9
-rw-r--r--9/platforms/android-19/arch-mips64/usr/include/asm/inst.h183
-rw-r--r--9/platforms/android-19/arch-mips64/usr/include/dirent.h2
-rw-r--r--9/platforms/android-19/arch-mips64/usr/include/mntent.h20
-rw-r--r--9/platforms/android-19/arch-mips64/usr/include/nsswitch.h7
-rw-r--r--9/platforms/android-19/arch-mips64/usr/include/pthread.h6
-rw-r--r--9/platforms/android-19/arch-mips64/usr/include/pwd.h15
-rw-r--r--9/platforms/android-19/arch-mips64/usr/include/sched.h6
-rw-r--r--9/platforms/android-19/arch-mips64/usr/include/sys/endian.h16
-rw-r--r--9/platforms/android-19/arch-mips64/usr/include/sys/stat.h2
-rw-r--r--9/platforms/android-19/arch-mips64/usr/include/sys/statvfs.h10
-rw-r--r--9/platforms/android-19/arch-mips64/usr/include/sys/ucontext.h32
-rw-r--r--9/platforms/android-19/arch-mips64/usr/include/sys/user.h2
-rw-r--r--9/platforms/android-19/arch-mips64/usr/include/sys/vfs.h2
-rw-r--r--9/platforms/android-19/arch-mips64/usr/include/wchar.h14
-rw-r--r--9/platforms/android-19/arch-mips64/usr/lib/crtend_android.obin1817 -> 1817 bytes
-rwxr-xr-x9/platforms/android-19/arch-mips64/usr/lib/libEGL.sobin8970 -> 8970 bytes
-rwxr-xr-x9/platforms/android-19/arch-mips64/usr/lib/libGLESv1_CM.sobin45482 -> 45482 bytes
-rwxr-xr-x9/platforms/android-19/arch-mips64/usr/lib/libGLESv2.sobin34615 -> 34615 bytes
-rwxr-xr-x9/platforms/android-19/arch-mips64/usr/lib/libGLESv3.sobin43841 -> 43841 bytes
-rwxr-xr-x9/platforms/android-19/arch-mips64/usr/lib/libOpenMAXAL.sobin7569 -> 7569 bytes
-rwxr-xr-x9/platforms/android-19/arch-mips64/usr/lib/libOpenSLES.sobin8438 -> 8438 bytes
-rwxr-xr-x9/platforms/android-19/arch-mips64/usr/lib/libandroid.sobin32264 -> 32264 bytes
-rw-r--r--9/platforms/android-19/arch-mips64/usr/lib/libc.abin9242112 -> 9346526 bytes
-rwxr-xr-x9/platforms/android-19/arch-mips64/usr/lib/libc.sobin171169 -> 172382 bytes
-rwxr-xr-x9/platforms/android-19/arch-mips64/usr/lib/libdl.sobin4309 -> 4309 bytes
-rwxr-xr-x9/platforms/android-19/arch-mips64/usr/lib/libjnigraphics.sobin3453 -> 3453 bytes
-rwxr-xr-x9/platforms/android-19/arch-mips64/usr/lib/liblog.sobin4460 -> 4460 bytes
-rw-r--r--9/platforms/android-19/arch-mips64/usr/lib/libm.abin2688218 -> 2694610 bytes
-rwxr-xr-x9/platforms/android-19/arch-mips64/usr/lib/libm.sobin45851 -> 45851 bytes
-rw-r--r--9/platforms/android-19/arch-mips64/usr/lib/libstdc++.abin43834 -> 43954 bytes
-rwxr-xr-x9/platforms/android-19/arch-mips64/usr/lib/libstdc++.sobin6753 -> 6753 bytes
-rw-r--r--9/platforms/android-19/arch-mips64/usr/lib/libz.abin943088 -> 943552 bytes
-rw-r--r--9/platforms/android-19/arch-x86_64/usr/include/arpa/inet.h23
-rw-r--r--9/platforms/android-19/arch-x86_64/usr/include/dirent.h2
-rw-r--r--9/platforms/android-19/arch-x86_64/usr/include/mntent.h20
-rw-r--r--9/platforms/android-19/arch-x86_64/usr/include/nsswitch.h7
-rw-r--r--9/platforms/android-19/arch-x86_64/usr/include/pthread.h6
-rw-r--r--9/platforms/android-19/arch-x86_64/usr/include/pwd.h15
-rw-r--r--9/platforms/android-19/arch-x86_64/usr/include/sched.h6
-rw-r--r--9/platforms/android-19/arch-x86_64/usr/include/sys/endian.h16
-rw-r--r--9/platforms/android-19/arch-x86_64/usr/include/sys/stat.h2
-rw-r--r--9/platforms/android-19/arch-x86_64/usr/include/sys/statvfs.h10
-rw-r--r--9/platforms/android-19/arch-x86_64/usr/include/sys/ucontext.h32
-rw-r--r--9/platforms/android-19/arch-x86_64/usr/include/sys/user.h2
-rw-r--r--9/platforms/android-19/arch-x86_64/usr/include/sys/vfs.h2
-rw-r--r--9/platforms/android-19/arch-x86_64/usr/include/wchar.h14
-rwxr-xr-x9/platforms/android-19/arch-x86_64/usr/lib64/libEGL.sobin11208 -> 11208 bytes
-rwxr-xr-x9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv1_CM.sobin41368 -> 41368 bytes
-rwxr-xr-x9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv2.sobin30456 -> 30456 bytes
-rwxr-xr-x9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv3.sobin41056 -> 41056 bytes
-rwxr-xr-x9/platforms/android-19/arch-x86_64/usr/lib64/libOpenMAXAL.sobin7512 -> 7512 bytes
-rwxr-xr-x9/platforms/android-19/arch-x86_64/usr/lib64/libOpenSLES.sobin7872 -> 7872 bytes
-rwxr-xr-x9/platforms/android-19/arch-x86_64/usr/lib64/libandroid.sobin30408 -> 30408 bytes
-rw-r--r--9/platforms/android-19/arch-x86_64/usr/lib64/libc.abin10899204 -> 11016170 bytes
-rwxr-xr-x9/platforms/android-19/arch-x86_64/usr/lib64/libc.sobin150512 -> 155000 bytes
-rwxr-xr-x9/platforms/android-19/arch-x86_64/usr/lib64/libdl.sobin5848 -> 5848 bytes
-rwxr-xr-x9/platforms/android-19/arch-x86_64/usr/lib64/libjnigraphics.sobin5648 -> 5648 bytes
-rwxr-xr-x9/platforms/android-19/arch-x86_64/usr/lib64/liblog.sobin5920 -> 5920 bytes
-rw-r--r--9/platforms/android-19/arch-x86_64/usr/lib64/libm.abin2803600 -> 2811760 bytes
-rwxr-xr-x9/platforms/android-19/arch-x86_64/usr/lib64/libm.sobin40144 -> 40144 bytes
-rw-r--r--9/platforms/android-19/arch-x86_64/usr/lib64/libstdc++.abin38544 -> 38656 bytes
-rwxr-xr-x9/platforms/android-19/arch-x86_64/usr/lib64/libstdc++.sobin6536 -> 6536 bytes
-rw-r--r--9/platforms/android-19/arch-x86_64/usr/lib64/libz.abin1155910 -> 1156310 bytes
96 files changed, 410 insertions, 253 deletions
diff --git a/9/platforms/android-19/arch-arm64/usr/include/arpa/inet.h b/9/platforms/android-19/arch-arm64/usr/include/arpa/inet.h
index b008812..067be1f 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/arpa/inet.h
+++ b/9/platforms/android-19/arch-arm64/usr/include/arpa/inet.h
@@ -36,19 +36,18 @@ __BEGIN_DECLS
typedef uint32_t in_addr_t;
-extern uint32_t inet_addr(const char *);
-
-extern int inet_aton(const char *, struct in_addr *);
-extern char* inet_ntoa(struct in_addr);
-
-extern int inet_pton(int, const char *, void *);
-extern const char* inet_ntop(int, const void *, char *, socklen_t);
-
-extern unsigned int inet_nsap_addr(const char *, unsigned char *, int);
-extern char* inet_nsap_ntoa(int, const unsigned char *, char *);
+in_addr_t inet_addr(const char*);
+int inet_aton(const char*, struct in_addr*);
+in_addr_t inet_lnaof(struct in_addr);
+struct in_addr inet_makeaddr(in_addr_t, in_addr_t);
+in_addr_t inet_netof(struct in_addr);
+in_addr_t inet_network(const char*);
+char* inet_ntoa(struct in_addr);
+const char* inet_ntop(int, const void*, char*, socklen_t);
+unsigned int inet_nsap_addr(const char*, unsigned char*, int);
+char* inet_nsap_ntoa(int, const unsigned char*, char*);
+int inet_pton(int, const char*, void*);
__END_DECLS
#endif /* _ARPA_INET_H_ */
-
-
diff --git a/9/platforms/android-19/arch-arm64/usr/include/dirent.h b/9/platforms/android-19/arch-arm64/usr/include/dirent.h
index bfe4ea4..71eb2e7 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/dirent.h
+++ b/9/platforms/android-19/arch-arm64/usr/include/dirent.h
@@ -56,6 +56,8 @@ __BEGIN_DECLS
struct dirent { __DIRENT64_BODY };
struct dirent64 { __DIRENT64_BODY };
+#undef __DIRENT64_BODY
+
#define d_fileno d_ino
typedef struct DIR DIR;
diff --git a/9/platforms/android-19/arch-arm64/usr/include/mntent.h b/9/platforms/android-19/arch-arm64/usr/include/mntent.h
index 6cc0b18..de285d0 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/mntent.h
+++ b/9/platforms/android-19/arch-arm64/usr/include/mntent.h
@@ -35,23 +35,21 @@
#define MOUNTED _PATH_MOUNTED
#define MNTTYPE_IGNORE "ignore"
-struct mntent
-{
- char* mnt_fsname;
- char* mnt_dir;
- char* mnt_type;
- char* mnt_opts;
- int mnt_freq;
- int mnt_passno;
+struct mntent {
+ char* mnt_fsname;
+ char* mnt_dir;
+ char* mnt_type;
+ char* mnt_opts;
+ int mnt_freq;
+ int mnt_passno;
};
-
__BEGIN_DECLS
-
+int endmntent(FILE*);
struct mntent* getmntent(FILE*);
+struct mntent* getmntent_r(FILE*, struct mntent*, char*, int);
FILE* setmntent(const char*, const char*);
-int endmntent(FILE*);
__END_DECLS
diff --git a/9/platforms/android-19/arch-arm64/usr/include/nsswitch.h b/9/platforms/android-19/arch-arm64/usr/include/nsswitch.h
index d19d055..e03844b 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/nsswitch.h
+++ b/9/platforms/android-19/arch-arm64/usr/include/nsswitch.h
@@ -54,7 +54,7 @@
/*
* Layout of:
* uint32_t ns_src.flags
- */
+ */
/* nsswitch.conf status codes and nsdispatch(3) return values */
#define NS_SUCCESS (1<<0) /* entry was found */
#define NS_UNAVAIL (1<<1) /* source not responding, or corrupt */
@@ -125,7 +125,7 @@ typedef struct {
*/
#define NS_FILES_CB(F,C) { NSSRC_FILES, F, __UNCONST(C) },
#define NS_COMPAT_CB(F,C) { NSSRC_COMPAT, F, __UNCONST(C) },
-
+
#ifdef HESIOD
# define NS_DNS_CB(F,C) { NSSRC_DNS, F, __UNCONST(C) },
#else
@@ -149,6 +149,7 @@ typedef struct {
} ns_src;
+#if 0
/*
* Default sourcelists (if nsswitch.conf is missing, corrupt,
* or the requested database doesn't have an entry)
@@ -160,7 +161,7 @@ extern const ns_src __nsdefaultfiles[];
extern const ns_src __nsdefaultfiles_forceall[];
extern const ns_src __nsdefaultnis[];
extern const ns_src __nsdefaultnis_forceall[];
-
+#endif
/*
* ns_mtab - `nsswitch method table'
diff --git a/9/platforms/android-19/arch-arm64/usr/include/pthread.h b/9/platforms/android-19/arch-arm64/usr/include/pthread.h
index 7b8de81..49f943a 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/pthread.h
+++ b/9/platforms/android-19/arch-arm64/usr/include/pthread.h
@@ -35,7 +35,7 @@
#include <limits.h>
#include <sys/types.h>
-#ifdef __LP64__
+#if defined(__LP64__)
#define __RESERVED_INITIALIZER , {0}
#else
#define __RESERVED_INITIALIZER
@@ -112,7 +112,11 @@ typedef volatile int pthread_once_t;
#define PTHREAD_ONCE_INIT 0
+#if defined(__LP64__)
+#define PTHREAD_STACK_MIN (4 * PAGE_SIZE)
+#else
#define PTHREAD_STACK_MIN (2 * PAGE_SIZE)
+#endif
#define PTHREAD_CREATE_DETACHED 0x00000001
#define PTHREAD_CREATE_JOINABLE 0x00000000
diff --git a/9/platforms/android-19/arch-arm64/usr/include/pwd.h b/9/platforms/android-19/arch-arm64/usr/include/pwd.h
index 6f3fad5..6d483c0 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/pwd.h
+++ b/9/platforms/android-19/arch-arm64/usr/include/pwd.h
@@ -100,12 +100,15 @@
struct passwd
{
- char* pw_name;
- char* pw_passwd;
- uid_t pw_uid;
- gid_t pw_gid;
- char* pw_dir;
- char* pw_shell;
+ char* pw_name;
+ char* pw_passwd;
+ uid_t pw_uid;
+ gid_t pw_gid;
+#ifdef __LP64__
+ char* pw_gecos;
+#endif
+ char* pw_dir;
+ char* pw_shell;
};
__BEGIN_DECLS
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sched.h b/9/platforms/android-19/arch-arm64/usr/include/sched.h
index 68115bb..e43b6cc 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/sched.h
+++ b/9/platforms/android-19/arch-arm64/usr/include/sched.h
@@ -59,10 +59,10 @@ extern int unshare(int);
extern int sched_getcpu(void);
extern int setns(int, int);
-#ifdef __LP32__
-#define CPU_SETSIZE 32
-#else
+#ifdef __LP64__
#define CPU_SETSIZE 1024
+#else
+#define CPU_SETSIZE 32
#endif
#define __CPU_BITTYPE unsigned long int /* mandated by the kernel */
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/endian.h b/9/platforms/android-19/arch-arm64/usr/include/sys/endian.h
index cbde121..be4c905 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/sys/endian.h
+++ b/9/platforms/android-19/arch-arm64/usr/include/sys/endian.h
@@ -39,6 +39,8 @@
#include <sys/cdefs.h>
#include <machine/endian.h>
+#include <stdint.h>
+
#define _LITTLE_ENDIAN 1234
#define _BIG_ENDIAN 4321
#define _PDP_ENDIAN 3412
@@ -186,14 +188,22 @@
#define letoh64(x) (x)
#endif /* __BSD_VISIBLE */
-#define htons(x) __swap16(x)
+/* glibc compatibility. */
+__BEGIN_DECLS
+uint32_t htonl(uint32_t) __pure2;
+uint16_t htons(uint16_t) __pure2;
+uint32_t ntohl(uint32_t) __pure2;
+uint16_t ntohs(uint16_t) __pure2;
+__END_DECLS
+
#define htonl(x) __swap32(x)
-#define ntohs(x) __swap16(x)
+#define htons(x) __swap16(x)
#define ntohl(x) __swap32(x)
+#define ntohs(x) __swap16(x)
/* Bionic additions */
-#define ntohq(x) __swap64(x)
#define htonq(x) __swap64(x)
+#define ntohq(x) __swap64(x)
#define __LITTLE_ENDIAN_BITFIELD
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/stat.h b/9/platforms/android-19/arch-arm64/usr/include/sys/stat.h
index e62e76d..c0c168b 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/sys/stat.h
+++ b/9/platforms/android-19/arch-arm64/usr/include/sys/stat.h
@@ -130,6 +130,8 @@ __BEGIN_DECLS
struct stat { __STAT64_BODY };
struct stat64 { __STAT64_BODY };
+#undef __STAT64_BODY
+
#define st_atimensec st_atime_nsec
#define st_mtimensec st_mtime_nsec
#define st_ctimensec st_ctime_nsec
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/statvfs.h b/9/platforms/android-19/arch-arm64/usr/include/sys/statvfs.h
index 3d8179e..3495546 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/sys/statvfs.h
+++ b/9/platforms/android-19/arch-arm64/usr/include/sys/statvfs.h
@@ -23,6 +23,12 @@
__BEGIN_DECLS
+#ifdef __LP64__
+#define __STATVFS64_RESERVED uint32_t __f_reserved[6];
+#else
+#define __STATVFS64_RESERVED
+#endif
+
#define __STATVFS64_BODY \
unsigned long f_bsize; \
unsigned long f_frsize; \
@@ -35,10 +41,14 @@ __BEGIN_DECLS
unsigned long f_fsid; \
unsigned long f_flag; \
unsigned long f_namemax; \
+ __STATVFS64_RESERVED
struct statvfs { __STATVFS64_BODY };
struct statvfs64 { __STATVFS64_BODY };
+#undef __STATVFS64_BODY
+#undef __STATVFS64_RESERVED
+
#define ST_RDONLY 0x0001
#define ST_NOSUID 0x0002
#define ST_NODEV 0x0004
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ucontext.h b/9/platforms/android-19/arch-arm64/usr/include/sys/ucontext.h
index 3737cbe..f150ac7 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/sys/ucontext.h
+++ b/9/platforms/android-19/arch-arm64/usr/include/sys/ucontext.h
@@ -150,7 +150,8 @@ typedef struct ucontext {
stack_t uc_stack;
mcontext_t uc_mcontext;
sigset_t uc_sigmask;
- /* TODO: __fpregs_mem? */
+ char __padding[128 - sizeof(sigset_t)];
+ struct _libc_fpstate __fpregs_mem;
} ucontext_t;
#elif defined(__mips__)
@@ -238,7 +239,31 @@ enum {
typedef long greg_t;
typedef greg_t gregset_t[NGREG];
-typedef struct user_i387_struct* fpregset_t;
+struct _libc_fpxreg {
+ unsigned short significand[4];
+ unsigned short exponent;
+ unsigned short padding[3];
+};
+
+struct _libc_xmmreg {
+ uint32_t element[4];
+};
+
+struct _libc_fpstate {
+ uint16_t cwd;
+ uint16_t swd;
+ uint16_t ftw;
+ uint16_t fop;
+ uint64_t rip;
+ uint64_t rdp;
+ uint32_t mxcsr;
+ uint32_t mxcr_mask;
+ struct _libc_fpxreg _st[8];
+ struct _libc_xmmreg _xmm[16];
+ uint32_t padding[24];
+};
+
+typedef struct _libc_fpstate* fpregset_t;
typedef struct {
gregset_t gregs;
@@ -252,7 +277,8 @@ typedef struct ucontext {
stack_t uc_stack;
mcontext_t uc_mcontext;
sigset_t uc_sigmask;
- /* TODO: __fpregs_mem? */
+ char __padding[128 - sizeof(sigset_t)];
+ struct _libc_fpstate __fpregs_mem;
} ucontext_t;
#endif
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/user.h b/9/platforms/android-19/arch-arm64/usr/include/sys/user.h
index c578a6f..705e0e9 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/sys/user.h
+++ b/9/platforms/android-19/arch-arm64/usr/include/sys/user.h
@@ -103,7 +103,7 @@ struct user {
struct user_fpregs_struct {
unsigned short cwd;
unsigned short swd;
- unsigned short twd;
+ unsigned short ftw;
unsigned short fop;
__u64 rip;
__u64 rdp;
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/vfs.h b/9/platforms/android-19/arch-arm64/usr/include/sys/vfs.h
index cd6044d..5358ffb 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/sys/vfs.h
+++ b/9/platforms/android-19/arch-arm64/usr/include/sys/vfs.h
@@ -107,6 +107,8 @@ typedef __fsid_t fsid_t;
struct statfs { __STATFS64_BODY };
struct statfs64 { __STATFS64_BODY };
+#undef __STATFS64_BODY
+
/* Declare that we have the f_namelen, f_frsize, and f_flags fields. */
#define _STATFS_F_NAMELEN
#define _STATFS_F_FRSIZE
diff --git a/9/platforms/android-19/arch-arm64/usr/include/wchar.h b/9/platforms/android-19/arch-arm64/usr/include/wchar.h
index fe2fe07..af7593f 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/wchar.h
+++ b/9/platforms/android-19/arch-arm64/usr/include/wchar.h
@@ -41,15 +41,13 @@ __BEGIN_DECLS
typedef __WINT_TYPE__ wint_t;
typedef struct {
-#ifdef __LP32__
- int dummy;
-#else
- // 8 bytes should be enough to support at least UTF-8
- char __reserved[8];
+ uint8_t __seq[4];
+#ifdef __LP64__
+ char __reserved[4];
#endif
} mbstate_t;
-typedef enum {
+enum {
WC_TYPE_INVALID = 0,
WC_TYPE_ALNUM,
WC_TYPE_ALPHA,
@@ -64,7 +62,9 @@ typedef enum {
WC_TYPE_UPPER,
WC_TYPE_XDIGIT,
WC_TYPE_MAX
-} wctype_t;
+};
+
+typedef long wctype_t;
#define WEOF ((wint_t)(-1))
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libEGL.so b/9/platforms/android-19/arch-arm64/usr/lib/libEGL.so
index 1e15167..6798e3c 100755
--- a/9/platforms/android-19/arch-arm64/usr/lib/libEGL.so
+++ b/9/platforms/android-19/arch-arm64/usr/lib/libEGL.so
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libGLESv1_CM.so b/9/platforms/android-19/arch-arm64/usr/lib/libGLESv1_CM.so
index c9fb7c9..d67d5e6 100755
--- a/9/platforms/android-19/arch-arm64/usr/lib/libGLESv1_CM.so
+++ b/9/platforms/android-19/arch-arm64/usr/lib/libGLESv1_CM.so
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libGLESv2.so b/9/platforms/android-19/arch-arm64/usr/lib/libGLESv2.so
index c153102..5dbb8c9 100755
--- a/9/platforms/android-19/arch-arm64/usr/lib/libGLESv2.so
+++ b/9/platforms/android-19/arch-arm64/usr/lib/libGLESv2.so
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libGLESv3.so b/9/platforms/android-19/arch-arm64/usr/lib/libGLESv3.so
index e0c4fca..e26476b 100755
--- a/9/platforms/android-19/arch-arm64/usr/lib/libGLESv3.so
+++ b/9/platforms/android-19/arch-arm64/usr/lib/libGLESv3.so
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libOpenMAXAL.so b/9/platforms/android-19/arch-arm64/usr/lib/libOpenMAXAL.so
index 1339835..3b9af80 100755
--- a/9/platforms/android-19/arch-arm64/usr/lib/libOpenMAXAL.so
+++ b/9/platforms/android-19/arch-arm64/usr/lib/libOpenMAXAL.so
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libOpenSLES.so b/9/platforms/android-19/arch-arm64/usr/lib/libOpenSLES.so
index a7f2935..df6bdfa 100755
--- a/9/platforms/android-19/arch-arm64/usr/lib/libOpenSLES.so
+++ b/9/platforms/android-19/arch-arm64/usr/lib/libOpenSLES.so
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libandroid.so b/9/platforms/android-19/arch-arm64/usr/lib/libandroid.so
index ebba01d..7a840d2 100755
--- a/9/platforms/android-19/arch-arm64/usr/lib/libandroid.so
+++ b/9/platforms/android-19/arch-arm64/usr/lib/libandroid.so
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libc.a b/9/platforms/android-19/arch-arm64/usr/lib/libc.a
index 737b48d..ea9ec46 100644
--- a/9/platforms/android-19/arch-arm64/usr/lib/libc.a
+++ b/9/platforms/android-19/arch-arm64/usr/lib/libc.a
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libc.so b/9/platforms/android-19/arch-arm64/usr/lib/libc.so
index 3dadbfc..e253ddc 100755
--- a/9/platforms/android-19/arch-arm64/usr/lib/libc.so
+++ b/9/platforms/android-19/arch-arm64/usr/lib/libc.so
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libdl.so b/9/platforms/android-19/arch-arm64/usr/lib/libdl.so
index 364775d..3815a23 100755
--- a/9/platforms/android-19/arch-arm64/usr/lib/libdl.so
+++ b/9/platforms/android-19/arch-arm64/usr/lib/libdl.so
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libjnigraphics.so b/9/platforms/android-19/arch-arm64/usr/lib/libjnigraphics.so
index 37268de..0c6e14d 100755
--- a/9/platforms/android-19/arch-arm64/usr/lib/libjnigraphics.so
+++ b/9/platforms/android-19/arch-arm64/usr/lib/libjnigraphics.so
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/liblog.so b/9/platforms/android-19/arch-arm64/usr/lib/liblog.so
index 214ee45..9ae54c3 100755
--- a/9/platforms/android-19/arch-arm64/usr/lib/liblog.so
+++ b/9/platforms/android-19/arch-arm64/usr/lib/liblog.so
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libm.a b/9/platforms/android-19/arch-arm64/usr/lib/libm.a
index 2c5d4f8..5e95ceb 100644
--- a/9/platforms/android-19/arch-arm64/usr/lib/libm.a
+++ b/9/platforms/android-19/arch-arm64/usr/lib/libm.a
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libm.so b/9/platforms/android-19/arch-arm64/usr/lib/libm.so
index a63d39a..454ce52 100755
--- a/9/platforms/android-19/arch-arm64/usr/lib/libm.so
+++ b/9/platforms/android-19/arch-arm64/usr/lib/libm.so
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libstdc++.a b/9/platforms/android-19/arch-arm64/usr/lib/libstdc++.a
index 35b02d5..25d4657 100644
--- a/9/platforms/android-19/arch-arm64/usr/lib/libstdc++.a
+++ b/9/platforms/android-19/arch-arm64/usr/lib/libstdc++.a
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libstdc++.so b/9/platforms/android-19/arch-arm64/usr/lib/libstdc++.so
index 1fafc4b..2b7cf91 100755
--- a/9/platforms/android-19/arch-arm64/usr/lib/libstdc++.so
+++ b/9/platforms/android-19/arch-arm64/usr/lib/libstdc++.so
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libz.a b/9/platforms/android-19/arch-arm64/usr/lib/libz.a
index c6b60b0..b41e0fb 100644
--- a/9/platforms/android-19/arch-arm64/usr/lib/libz.a
+++ b/9/platforms/android-19/arch-arm64/usr/lib/libz.a
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/include/arpa/inet.h b/9/platforms/android-19/arch-mips64/usr/include/arpa/inet.h
index b008812..067be1f 100644
--- a/9/platforms/android-19/arch-mips64/usr/include/arpa/inet.h
+++ b/9/platforms/android-19/arch-mips64/usr/include/arpa/inet.h
@@ -36,19 +36,18 @@ __BEGIN_DECLS
typedef uint32_t in_addr_t;
-extern uint32_t inet_addr(const char *);
-
-extern int inet_aton(const char *, struct in_addr *);
-extern char* inet_ntoa(struct in_addr);
-
-extern int inet_pton(int, const char *, void *);
-extern const char* inet_ntop(int, const void *, char *, socklen_t);
-
-extern unsigned int inet_nsap_addr(const char *, unsigned char *, int);
-extern char* inet_nsap_ntoa(int, const unsigned char *, char *);
+in_addr_t inet_addr(const char*);
+int inet_aton(const char*, struct in_addr*);
+in_addr_t inet_lnaof(struct in_addr);
+struct in_addr inet_makeaddr(in_addr_t, in_addr_t);
+in_addr_t inet_netof(struct in_addr);
+in_addr_t inet_network(const char*);
+char* inet_ntoa(struct in_addr);
+const char* inet_ntop(int, const void*, char*, socklen_t);
+unsigned int inet_nsap_addr(const char*, unsigned char*, int);
+char* inet_nsap_ntoa(int, const unsigned char*, char*);
+int inet_pton(int, const char*, void*);
__END_DECLS
#endif /* _ARPA_INET_H_ */
-
-
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/byteorder.h b/9/platforms/android-19/arch-mips64/usr/include/asm/byteorder.h
index 477c93d..965fd8f 100644
--- a/9/platforms/android-19/arch-mips64/usr/include/asm/byteorder.h
+++ b/9/platforms/android-19/arch-mips64/usr/include/asm/byteorder.h
@@ -18,13 +18,6 @@
****************************************************************************/
#ifndef _ASM_BYTEORDER_H
#define _ASM_BYTEORDER_H
-#ifdef __MIPSEB__
-#include <linux/byteorder/big_endian.h>
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#elif defined(__MIPSEL__)
#include <linux/byteorder/little_endian.h>
-#else
-#error "MIPS, but neither __MIPSEB__, nor __MIPSEL__???"
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#endif
#endif
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/inst.h b/9/platforms/android-19/arch-mips64/usr/include/asm/inst.h
index 379286c..43e9a50 100644
--- a/9/platforms/android-19/arch-mips64/usr/include/asm/inst.h
+++ b/9/platforms/android-19/arch-mips64/usr/include/asm/inst.h
@@ -434,453 +434,446 @@ enum MIPS6e_i8_func {
MIPS16e_swrasp_func = 02,
};
#define MM_NOP16 0x0c00
-#ifdef __MIPSEB__
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BITFIELD_FIELD(field, more) field; more
-#elif defined(__MIPSEL__)
#define BITFIELD_FIELD(field, more) more field;
-#else
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#error "MIPS but neither __MIPSEL__ nor __MIPSEB__?"
-#endif
struct j_format {
BITFIELD_FIELD(unsigned int opcode : 6,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int target : 26,
;))
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
struct i_format {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int opcode : 6,
BITFIELD_FIELD(unsigned int rs : 5,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int rt : 5,
BITFIELD_FIELD(signed int simmediate : 16,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
;))))
};
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct u_format {
BITFIELD_FIELD(unsigned int opcode : 6,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int rs : 5,
BITFIELD_FIELD(unsigned int rt : 5,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int uimmediate : 16,
;))))
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
struct c_format {
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int opcode : 6,
BITFIELD_FIELD(unsigned int rs : 5,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int c_op : 3,
BITFIELD_FIELD(unsigned int cache : 2,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int simmediate : 16,
;)))))
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
struct r_format {
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int opcode : 6,
BITFIELD_FIELD(unsigned int rs : 5,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int rt : 5,
BITFIELD_FIELD(unsigned int rd : 5,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int re : 5,
BITFIELD_FIELD(unsigned int func : 6,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
;))))))
};
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct p_format {
BITFIELD_FIELD(unsigned int opcode : 6,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int rs : 5,
BITFIELD_FIELD(unsigned int rt : 5,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int rd : 5,
BITFIELD_FIELD(unsigned int re : 5,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int func : 6,
;))))))
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
struct f_format {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int opcode : 6,
BITFIELD_FIELD(unsigned int : 1,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int fmt : 4,
BITFIELD_FIELD(unsigned int rt : 5,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int rd : 5,
BITFIELD_FIELD(unsigned int re : 5,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int func : 6,
;)))))))
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
struct ma_format {
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int opcode : 6,
BITFIELD_FIELD(unsigned int fr : 5,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int ft : 5,
BITFIELD_FIELD(unsigned int fs : 5,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int fd : 5,
BITFIELD_FIELD(unsigned int func : 4,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int fmt : 2,
;)))))))
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
struct b_format {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int opcode : 6,
BITFIELD_FIELD(unsigned int code : 20,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int func : 6,
;)))
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
struct ps_format {
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int opcode : 6,
BITFIELD_FIELD(unsigned int rs : 5,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int ft : 5,
BITFIELD_FIELD(unsigned int fs : 5,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int fd : 5,
BITFIELD_FIELD(unsigned int func : 6,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
;))))))
};
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct v_format {
BITFIELD_FIELD(unsigned int opcode : 6,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int sel : 4,
BITFIELD_FIELD(unsigned int fmt : 1,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int vt : 5,
BITFIELD_FIELD(unsigned int vs : 5,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int vd : 5,
BITFIELD_FIELD(unsigned int func : 6,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
;)))))))
};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct fb_format {
BITFIELD_FIELD(unsigned int opcode : 6,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int bc : 5,
BITFIELD_FIELD(unsigned int cc : 3,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int flag : 2,
BITFIELD_FIELD(signed int simmediate : 16,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
;)))))
};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct fp0_format {
BITFIELD_FIELD(unsigned int opcode : 6,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int fmt : 5,
BITFIELD_FIELD(unsigned int ft : 5,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int fs : 5,
BITFIELD_FIELD(unsigned int fd : 5,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int func : 6,
;))))))
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
struct mm_fp0_format {
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int opcode : 6,
BITFIELD_FIELD(unsigned int ft : 5,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int fs : 5,
BITFIELD_FIELD(unsigned int fd : 5,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int fmt : 3,
BITFIELD_FIELD(unsigned int op : 2,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int func : 6,
;)))))))
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
struct fp1_format {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int opcode : 6,
BITFIELD_FIELD(unsigned int op : 5,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int rt : 5,
BITFIELD_FIELD(unsigned int fs : 5,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int fd : 5,
BITFIELD_FIELD(unsigned int func : 6,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
;))))))
};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct mm_fp1_format {
BITFIELD_FIELD(unsigned int opcode : 6,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int rt : 5,
BITFIELD_FIELD(unsigned int fs : 5,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int fmt : 2,
BITFIELD_FIELD(unsigned int op : 8,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int func : 6,
;))))))
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
struct mm_fp2_format {
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int opcode : 6,
BITFIELD_FIELD(unsigned int fd : 5,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int fs : 5,
BITFIELD_FIELD(unsigned int cc : 3,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int zero : 2,
BITFIELD_FIELD(unsigned int fmt : 2,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int op : 3,
BITFIELD_FIELD(unsigned int func : 6,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
;))))))))
};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct mm_fp3_format {
BITFIELD_FIELD(unsigned int opcode : 6,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int rt : 5,
BITFIELD_FIELD(unsigned int fs : 5,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int fmt : 3,
BITFIELD_FIELD(unsigned int op : 7,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int func : 6,
;))))))
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
struct mm_fp4_format {
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int opcode : 6,
BITFIELD_FIELD(unsigned int rt : 5,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int fs : 5,
BITFIELD_FIELD(unsigned int cc : 3,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int fmt : 3,
BITFIELD_FIELD(unsigned int cond : 4,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int func : 6,
;)))))))
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
struct mm_fp5_format {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int opcode : 6,
BITFIELD_FIELD(unsigned int index : 5,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int base : 5,
BITFIELD_FIELD(unsigned int fd : 5,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int op : 5,
BITFIELD_FIELD(unsigned int func : 6,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
;))))))
};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct fp6_format {
BITFIELD_FIELD(unsigned int opcode : 6,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int fr : 5,
BITFIELD_FIELD(unsigned int ft : 5,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int fs : 5,
BITFIELD_FIELD(unsigned int fd : 5,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int func : 6,
;))))))
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
struct mm_fp6_format {
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int opcode : 6,
BITFIELD_FIELD(unsigned int ft : 5,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int fs : 5,
BITFIELD_FIELD(unsigned int fd : 5,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int fr : 5,
BITFIELD_FIELD(unsigned int func : 6,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
;))))))
};
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct mm_i_format {
BITFIELD_FIELD(unsigned int opcode : 6,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int rt : 5,
BITFIELD_FIELD(unsigned int rs : 5,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(signed int simmediate : 16,
;))))
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
struct mm_m_format {
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int opcode : 6,
BITFIELD_FIELD(unsigned int rd : 5,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int base : 5,
BITFIELD_FIELD(unsigned int func : 4,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(signed int simmediate : 12,
;)))))
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
struct mm_x_format {
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int opcode : 6,
BITFIELD_FIELD(unsigned int index : 5,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int base : 5,
BITFIELD_FIELD(unsigned int rd : 5,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int func : 11,
;)))))
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
struct mm_b0_format {
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int opcode : 6,
BITFIELD_FIELD(signed int simmediate : 10,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int : 16,
;)))
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
struct mm_b1_format {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int opcode : 6,
BITFIELD_FIELD(unsigned int rs : 3,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(signed int simmediate : 7,
BITFIELD_FIELD(unsigned int : 16,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
;))))
};
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct mm16_m_format {
BITFIELD_FIELD(unsigned int opcode : 6,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int func : 4,
BITFIELD_FIELD(unsigned int rlist : 2,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int imm : 4,
BITFIELD_FIELD(unsigned int : 16,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
;)))))
};
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct mm16_rb_format {
BITFIELD_FIELD(unsigned int opcode : 6,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int rt : 3,
BITFIELD_FIELD(unsigned int base : 3,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(signed int simmediate : 4,
BITFIELD_FIELD(unsigned int : 16,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
;)))))
};
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct mm16_r3_format {
BITFIELD_FIELD(unsigned int opcode : 6,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int rt : 3,
BITFIELD_FIELD(signed int simmediate : 7,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int : 16,
;))))
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
struct mm16_r5_format {
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int opcode : 6,
BITFIELD_FIELD(unsigned int rt : 5,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(signed int simmediate : 5,
BITFIELD_FIELD(unsigned int : 16,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
;))))
};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct m16e_rr {
BITFIELD_FIELD(unsigned int opcode : 5,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int rx : 3,
BITFIELD_FIELD(unsigned int nd : 1,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int l : 1,
BITFIELD_FIELD(unsigned int ra : 1,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int func : 5,
;))))))
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
struct m16e_jal {
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int opcode : 5,
BITFIELD_FIELD(unsigned int x : 1,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int imm20_16 : 5,
BITFIELD_FIELD(signed int imm25_21 : 5,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
;))))
};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct m16e_i64 {
BITFIELD_FIELD(unsigned int opcode : 5,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int func : 3,
BITFIELD_FIELD(unsigned int imm : 8,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
;)))
};
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct m16e_ri64 {
BITFIELD_FIELD(unsigned int opcode : 5,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int func : 3,
BITFIELD_FIELD(unsigned int ry : 3,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int imm : 5,
;))))
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
struct m16e_ri {
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int opcode : 5,
BITFIELD_FIELD(unsigned int rx : 3,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int imm : 8,
;)))
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
struct m16e_rri {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int opcode : 5,
BITFIELD_FIELD(unsigned int rx : 3,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int ry : 3,
BITFIELD_FIELD(unsigned int imm : 5,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
;))))
};
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct m16e_i8 {
BITFIELD_FIELD(unsigned int opcode : 5,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
BITFIELD_FIELD(unsigned int func : 3,
BITFIELD_FIELD(unsigned int imm : 8,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
;)))
};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
union mips_instruction {
unsigned int word;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
unsigned short halfword[2];
unsigned char byte[4];
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct j_format j_format;
struct i_format i_format;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct u_format u_format;
struct c_format c_format;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct r_format r_format;
struct p_format p_format;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct f_format f_format;
struct ma_format ma_format;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct b_format b_format;
struct ps_format ps_format;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct v_format v_format;
struct fb_format fb_format;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct fp0_format fp0_format;
struct mm_fp0_format mm_fp0_format;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct fp1_format fp1_format;
struct mm_fp1_format mm_fp1_format;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct mm_fp2_format mm_fp2_format;
struct mm_fp3_format mm_fp3_format;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct mm_fp4_format mm_fp4_format;
struct mm_fp5_format mm_fp5_format;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct fp6_format fp6_format;
struct mm_fp6_format mm_fp6_format;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct mm_i_format mm_i_format;
struct mm_m_format mm_m_format;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct mm_x_format mm_x_format;
struct mm_b0_format mm_b0_format;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct mm_b1_format mm_b1_format;
struct mm16_m_format mm16_m_format ;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct mm16_rb_format mm16_rb_format;
struct mm16_r3_format mm16_r3_format;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct mm16_r5_format mm16_r5_format;
};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
union mips16e_instruction {
unsigned int full : 16;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct m16e_rr rr;
struct m16e_jal jal;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct m16e_i64 i64;
struct m16e_ri64 ri64;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct m16e_ri ri;
struct m16e_rri rri;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct m16e_i8 i8;
};
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#endif
diff --git a/9/platforms/android-19/arch-mips64/usr/include/dirent.h b/9/platforms/android-19/arch-mips64/usr/include/dirent.h
index bfe4ea4..71eb2e7 100644
--- a/9/platforms/android-19/arch-mips64/usr/include/dirent.h
+++ b/9/platforms/android-19/arch-mips64/usr/include/dirent.h
@@ -56,6 +56,8 @@ __BEGIN_DECLS
struct dirent { __DIRENT64_BODY };
struct dirent64 { __DIRENT64_BODY };
+#undef __DIRENT64_BODY
+
#define d_fileno d_ino
typedef struct DIR DIR;
diff --git a/9/platforms/android-19/arch-mips64/usr/include/mntent.h b/9/platforms/android-19/arch-mips64/usr/include/mntent.h
index 6cc0b18..de285d0 100644
--- a/9/platforms/android-19/arch-mips64/usr/include/mntent.h
+++ b/9/platforms/android-19/arch-mips64/usr/include/mntent.h
@@ -35,23 +35,21 @@
#define MOUNTED _PATH_MOUNTED
#define MNTTYPE_IGNORE "ignore"
-struct mntent
-{
- char* mnt_fsname;
- char* mnt_dir;
- char* mnt_type;
- char* mnt_opts;
- int mnt_freq;
- int mnt_passno;
+struct mntent {
+ char* mnt_fsname;
+ char* mnt_dir;
+ char* mnt_type;
+ char* mnt_opts;
+ int mnt_freq;
+ int mnt_passno;
};
-
__BEGIN_DECLS
-
+int endmntent(FILE*);
struct mntent* getmntent(FILE*);
+struct mntent* getmntent_r(FILE*, struct mntent*, char*, int);
FILE* setmntent(const char*, const char*);
-int endmntent(FILE*);
__END_DECLS
diff --git a/9/platforms/android-19/arch-mips64/usr/include/nsswitch.h b/9/platforms/android-19/arch-mips64/usr/include/nsswitch.h
index d19d055..e03844b 100644
--- a/9/platforms/android-19/arch-mips64/usr/include/nsswitch.h
+++ b/9/platforms/android-19/arch-mips64/usr/include/nsswitch.h
@@ -54,7 +54,7 @@
/*
* Layout of:
* uint32_t ns_src.flags
- */
+ */
/* nsswitch.conf status codes and nsdispatch(3) return values */
#define NS_SUCCESS (1<<0) /* entry was found */
#define NS_UNAVAIL (1<<1) /* source not responding, or corrupt */
@@ -125,7 +125,7 @@ typedef struct {
*/
#define NS_FILES_CB(F,C) { NSSRC_FILES, F, __UNCONST(C) },
#define NS_COMPAT_CB(F,C) { NSSRC_COMPAT, F, __UNCONST(C) },
-
+
#ifdef HESIOD
# define NS_DNS_CB(F,C) { NSSRC_DNS, F, __UNCONST(C) },
#else
@@ -149,6 +149,7 @@ typedef struct {
} ns_src;
+#if 0
/*
* Default sourcelists (if nsswitch.conf is missing, corrupt,
* or the requested database doesn't have an entry)
@@ -160,7 +161,7 @@ extern const ns_src __nsdefaultfiles[];
extern const ns_src __nsdefaultfiles_forceall[];
extern const ns_src __nsdefaultnis[];
extern const ns_src __nsdefaultnis_forceall[];
-
+#endif
/*
* ns_mtab - `nsswitch method table'
diff --git a/9/platforms/android-19/arch-mips64/usr/include/pthread.h b/9/platforms/android-19/arch-mips64/usr/include/pthread.h
index 7b8de81..49f943a 100644
--- a/9/platforms/android-19/arch-mips64/usr/include/pthread.h
+++ b/9/platforms/android-19/arch-mips64/usr/include/pthread.h
@@ -35,7 +35,7 @@
#include <limits.h>
#include <sys/types.h>
-#ifdef __LP64__
+#if defined(__LP64__)
#define __RESERVED_INITIALIZER , {0}
#else
#define __RESERVED_INITIALIZER
@@ -112,7 +112,11 @@ typedef volatile int pthread_once_t;
#define PTHREAD_ONCE_INIT 0
+#if defined(__LP64__)
+#define PTHREAD_STACK_MIN (4 * PAGE_SIZE)
+#else
#define PTHREAD_STACK_MIN (2 * PAGE_SIZE)
+#endif
#define PTHREAD_CREATE_DETACHED 0x00000001
#define PTHREAD_CREATE_JOINABLE 0x00000000
diff --git a/9/platforms/android-19/arch-mips64/usr/include/pwd.h b/9/platforms/android-19/arch-mips64/usr/include/pwd.h
index 6f3fad5..6d483c0 100644
--- a/9/platforms/android-19/arch-mips64/usr/include/pwd.h
+++ b/9/platforms/android-19/arch-mips64/usr/include/pwd.h
@@ -100,12 +100,15 @@
struct passwd
{
- char* pw_name;
- char* pw_passwd;
- uid_t pw_uid;
- gid_t pw_gid;
- char* pw_dir;
- char* pw_shell;
+ char* pw_name;
+ char* pw_passwd;
+ uid_t pw_uid;
+ gid_t pw_gid;
+#ifdef __LP64__
+ char* pw_gecos;
+#endif
+ char* pw_dir;
+ char* pw_shell;
};
__BEGIN_DECLS
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sched.h b/9/platforms/android-19/arch-mips64/usr/include/sched.h
index 68115bb..e43b6cc 100644
--- a/9/platforms/android-19/arch-mips64/usr/include/sched.h
+++ b/9/platforms/android-19/arch-mips64/usr/include/sched.h
@@ -59,10 +59,10 @@ extern int unshare(int);
extern int sched_getcpu(void);
extern int setns(int, int);
-#ifdef __LP32__
-#define CPU_SETSIZE 32
-#else
+#ifdef __LP64__
#define CPU_SETSIZE 1024
+#else
+#define CPU_SETSIZE 32
#endif
#define __CPU_BITTYPE unsigned long int /* mandated by the kernel */
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/endian.h b/9/platforms/android-19/arch-mips64/usr/include/sys/endian.h
index cbde121..be4c905 100644
--- a/9/platforms/android-19/arch-mips64/usr/include/sys/endian.h
+++ b/9/platforms/android-19/arch-mips64/usr/include/sys/endian.h
@@ -39,6 +39,8 @@
#include <sys/cdefs.h>
#include <machine/endian.h>
+#include <stdint.h>
+
#define _LITTLE_ENDIAN 1234
#define _BIG_ENDIAN 4321
#define _PDP_ENDIAN 3412
@@ -186,14 +188,22 @@
#define letoh64(x) (x)
#endif /* __BSD_VISIBLE */
-#define htons(x) __swap16(x)
+/* glibc compatibility. */
+__BEGIN_DECLS
+uint32_t htonl(uint32_t) __pure2;
+uint16_t htons(uint16_t) __pure2;
+uint32_t ntohl(uint32_t) __pure2;
+uint16_t ntohs(uint16_t) __pure2;
+__END_DECLS
+
#define htonl(x) __swap32(x)
-#define ntohs(x) __swap16(x)
+#define htons(x) __swap16(x)
#define ntohl(x) __swap32(x)
+#define ntohs(x) __swap16(x)
/* Bionic additions */
-#define ntohq(x) __swap64(x)
#define htonq(x) __swap64(x)
+#define ntohq(x) __swap64(x)
#define __LITTLE_ENDIAN_BITFIELD
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/stat.h b/9/platforms/android-19/arch-mips64/usr/include/sys/stat.h
index e62e76d..c0c168b 100644
--- a/9/platforms/android-19/arch-mips64/usr/include/sys/stat.h
+++ b/9/platforms/android-19/arch-mips64/usr/include/sys/stat.h
@@ -130,6 +130,8 @@ __BEGIN_DECLS
struct stat { __STAT64_BODY };
struct stat64 { __STAT64_BODY };
+#undef __STAT64_BODY
+
#define st_atimensec st_atime_nsec
#define st_mtimensec st_mtime_nsec
#define st_ctimensec st_ctime_nsec
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/statvfs.h b/9/platforms/android-19/arch-mips64/usr/include/sys/statvfs.h
index 3d8179e..3495546 100644
--- a/9/platforms/android-19/arch-mips64/usr/include/sys/statvfs.h
+++ b/9/platforms/android-19/arch-mips64/usr/include/sys/statvfs.h
@@ -23,6 +23,12 @@
__BEGIN_DECLS
+#ifdef __LP64__
+#define __STATVFS64_RESERVED uint32_t __f_reserved[6];
+#else
+#define __STATVFS64_RESERVED
+#endif
+
#define __STATVFS64_BODY \
unsigned long f_bsize; \
unsigned long f_frsize; \
@@ -35,10 +41,14 @@ __BEGIN_DECLS
unsigned long f_fsid; \
unsigned long f_flag; \
unsigned long f_namemax; \
+ __STATVFS64_RESERVED
struct statvfs { __STATVFS64_BODY };
struct statvfs64 { __STATVFS64_BODY };
+#undef __STATVFS64_BODY
+#undef __STATVFS64_RESERVED
+
#define ST_RDONLY 0x0001
#define ST_NOSUID 0x0002
#define ST_NODEV 0x0004
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/ucontext.h b/9/platforms/android-19/arch-mips64/usr/include/sys/ucontext.h
index 3737cbe..f150ac7 100644
--- a/9/platforms/android-19/arch-mips64/usr/include/sys/ucontext.h
+++ b/9/platforms/android-19/arch-mips64/usr/include/sys/ucontext.h
@@ -150,7 +150,8 @@ typedef struct ucontext {
stack_t uc_stack;
mcontext_t uc_mcontext;
sigset_t uc_sigmask;
- /* TODO: __fpregs_mem? */
+ char __padding[128 - sizeof(sigset_t)];
+ struct _libc_fpstate __fpregs_mem;
} ucontext_t;
#elif defined(__mips__)
@@ -238,7 +239,31 @@ enum {
typedef long greg_t;
typedef greg_t gregset_t[NGREG];
-typedef struct user_i387_struct* fpregset_t;
+struct _libc_fpxreg {
+ unsigned short significand[4];
+ unsigned short exponent;
+ unsigned short padding[3];
+};
+
+struct _libc_xmmreg {
+ uint32_t element[4];
+};
+
+struct _libc_fpstate {
+ uint16_t cwd;
+ uint16_t swd;
+ uint16_t ftw;
+ uint16_t fop;
+ uint64_t rip;
+ uint64_t rdp;
+ uint32_t mxcsr;
+ uint32_t mxcr_mask;
+ struct _libc_fpxreg _st[8];
+ struct _libc_xmmreg _xmm[16];
+ uint32_t padding[24];
+};
+
+typedef struct _libc_fpstate* fpregset_t;
typedef struct {
gregset_t gregs;
@@ -252,7 +277,8 @@ typedef struct ucontext {
stack_t uc_stack;
mcontext_t uc_mcontext;
sigset_t uc_sigmask;
- /* TODO: __fpregs_mem? */
+ char __padding[128 - sizeof(sigset_t)];
+ struct _libc_fpstate __fpregs_mem;
} ucontext_t;
#endif
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/user.h b/9/platforms/android-19/arch-mips64/usr/include/sys/user.h
index c578a6f..705e0e9 100644
--- a/9/platforms/android-19/arch-mips64/usr/include/sys/user.h
+++ b/9/platforms/android-19/arch-mips64/usr/include/sys/user.h
@@ -103,7 +103,7 @@ struct user {
struct user_fpregs_struct {
unsigned short cwd;
unsigned short swd;
- unsigned short twd;
+ unsigned short ftw;
unsigned short fop;
__u64 rip;
__u64 rdp;
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/vfs.h b/9/platforms/android-19/arch-mips64/usr/include/sys/vfs.h
index cd6044d..5358ffb 100644
--- a/9/platforms/android-19/arch-mips64/usr/include/sys/vfs.h
+++ b/9/platforms/android-19/arch-mips64/usr/include/sys/vfs.h
@@ -107,6 +107,8 @@ typedef __fsid_t fsid_t;
struct statfs { __STATFS64_BODY };
struct statfs64 { __STATFS64_BODY };
+#undef __STATFS64_BODY
+
/* Declare that we have the f_namelen, f_frsize, and f_flags fields. */
#define _STATFS_F_NAMELEN
#define _STATFS_F_FRSIZE
diff --git a/9/platforms/android-19/arch-mips64/usr/include/wchar.h b/9/platforms/android-19/arch-mips64/usr/include/wchar.h
index fe2fe07..af7593f 100644
--- a/9/platforms/android-19/arch-mips64/usr/include/wchar.h
+++ b/9/platforms/android-19/arch-mips64/usr/include/wchar.h
@@ -41,15 +41,13 @@ __BEGIN_DECLS
typedef __WINT_TYPE__ wint_t;
typedef struct {
-#ifdef __LP32__
- int dummy;
-#else
- // 8 bytes should be enough to support at least UTF-8
- char __reserved[8];
+ uint8_t __seq[4];
+#ifdef __LP64__
+ char __reserved[4];
#endif
} mbstate_t;
-typedef enum {
+enum {
WC_TYPE_INVALID = 0,
WC_TYPE_ALNUM,
WC_TYPE_ALPHA,
@@ -64,7 +62,9 @@ typedef enum {
WC_TYPE_UPPER,
WC_TYPE_XDIGIT,
WC_TYPE_MAX
-} wctype_t;
+};
+
+typedef long wctype_t;
#define WEOF ((wint_t)(-1))
diff --git a/9/platforms/android-19/arch-mips64/usr/lib/crtend_android.o b/9/platforms/android-19/arch-mips64/usr/lib/crtend_android.o
index b0f2ebe..5ca38bb 100644
--- a/9/platforms/android-19/arch-mips64/usr/lib/crtend_android.o
+++ b/9/platforms/android-19/arch-mips64/usr/lib/crtend_android.o
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib/libEGL.so b/9/platforms/android-19/arch-mips64/usr/lib/libEGL.so
index 06ec580..d749c82 100755
--- a/9/platforms/android-19/arch-mips64/usr/lib/libEGL.so
+++ b/9/platforms/android-19/arch-mips64/usr/lib/libEGL.so
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib/libGLESv1_CM.so b/9/platforms/android-19/arch-mips64/usr/lib/libGLESv1_CM.so
index a1dc42e..fb02a4e 100755
--- a/9/platforms/android-19/arch-mips64/usr/lib/libGLESv1_CM.so
+++ b/9/platforms/android-19/arch-mips64/usr/lib/libGLESv1_CM.so
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib/libGLESv2.so b/9/platforms/android-19/arch-mips64/usr/lib/libGLESv2.so
index 6abacf1..b1c300a 100755
--- a/9/platforms/android-19/arch-mips64/usr/lib/libGLESv2.so
+++ b/9/platforms/android-19/arch-mips64/usr/lib/libGLESv2.so
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib/libGLESv3.so b/9/platforms/android-19/arch-mips64/usr/lib/libGLESv3.so
index 412d028..bf823d9 100755
--- a/9/platforms/android-19/arch-mips64/usr/lib/libGLESv3.so
+++ b/9/platforms/android-19/arch-mips64/usr/lib/libGLESv3.so
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib/libOpenMAXAL.so b/9/platforms/android-19/arch-mips64/usr/lib/libOpenMAXAL.so
index 744cc99..99589d6 100755
--- a/9/platforms/android-19/arch-mips64/usr/lib/libOpenMAXAL.so
+++ b/9/platforms/android-19/arch-mips64/usr/lib/libOpenMAXAL.so
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib/libOpenSLES.so b/9/platforms/android-19/arch-mips64/usr/lib/libOpenSLES.so
index 0a9e081..afb816c 100755
--- a/9/platforms/android-19/arch-mips64/usr/lib/libOpenSLES.so
+++ b/9/platforms/android-19/arch-mips64/usr/lib/libOpenSLES.so
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib/libandroid.so b/9/platforms/android-19/arch-mips64/usr/lib/libandroid.so
index 86c2273..b31f589 100755
--- a/9/platforms/android-19/arch-mips64/usr/lib/libandroid.so
+++ b/9/platforms/android-19/arch-mips64/usr/lib/libandroid.so
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib/libc.a b/9/platforms/android-19/arch-mips64/usr/lib/libc.a
index 277ae8d..afb02c8 100644
--- a/9/platforms/android-19/arch-mips64/usr/lib/libc.a
+++ b/9/platforms/android-19/arch-mips64/usr/lib/libc.a
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib/libc.so b/9/platforms/android-19/arch-mips64/usr/lib/libc.so
index a84fc91..dfa294a 100755
--- a/9/platforms/android-19/arch-mips64/usr/lib/libc.so
+++ b/9/platforms/android-19/arch-mips64/usr/lib/libc.so
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib/libdl.so b/9/platforms/android-19/arch-mips64/usr/lib/libdl.so
index b364515..0d6cf6f 100755
--- a/9/platforms/android-19/arch-mips64/usr/lib/libdl.so
+++ b/9/platforms/android-19/arch-mips64/usr/lib/libdl.so
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib/libjnigraphics.so b/9/platforms/android-19/arch-mips64/usr/lib/libjnigraphics.so
index 0e05f4d..3fdf66a 100755
--- a/9/platforms/android-19/arch-mips64/usr/lib/libjnigraphics.so
+++ b/9/platforms/android-19/arch-mips64/usr/lib/libjnigraphics.so
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib/liblog.so b/9/platforms/android-19/arch-mips64/usr/lib/liblog.so
index 30af96a..dc93d92 100755
--- a/9/platforms/android-19/arch-mips64/usr/lib/liblog.so
+++ b/9/platforms/android-19/arch-mips64/usr/lib/liblog.so
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib/libm.a b/9/platforms/android-19/arch-mips64/usr/lib/libm.a
index e2bd16d..81baa14 100644
--- a/9/platforms/android-19/arch-mips64/usr/lib/libm.a
+++ b/9/platforms/android-19/arch-mips64/usr/lib/libm.a
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib/libm.so b/9/platforms/android-19/arch-mips64/usr/lib/libm.so
index 2e8d062..9c278b9 100755
--- a/9/platforms/android-19/arch-mips64/usr/lib/libm.so
+++ b/9/platforms/android-19/arch-mips64/usr/lib/libm.so
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib/libstdc++.a b/9/platforms/android-19/arch-mips64/usr/lib/libstdc++.a
index e1df123..09f242e 100644
--- a/9/platforms/android-19/arch-mips64/usr/lib/libstdc++.a
+++ b/9/platforms/android-19/arch-mips64/usr/lib/libstdc++.a
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib/libstdc++.so b/9/platforms/android-19/arch-mips64/usr/lib/libstdc++.so
index bb3fbde..2a3a354 100755
--- a/9/platforms/android-19/arch-mips64/usr/lib/libstdc++.so
+++ b/9/platforms/android-19/arch-mips64/usr/lib/libstdc++.so
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib/libz.a b/9/platforms/android-19/arch-mips64/usr/lib/libz.a
index 7363542..7da18ce 100644
--- a/9/platforms/android-19/arch-mips64/usr/lib/libz.a
+++ b/9/platforms/android-19/arch-mips64/usr/lib/libz.a
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/arpa/inet.h b/9/platforms/android-19/arch-x86_64/usr/include/arpa/inet.h
index b008812..067be1f 100644
--- a/9/platforms/android-19/arch-x86_64/usr/include/arpa/inet.h
+++ b/9/platforms/android-19/arch-x86_64/usr/include/arpa/inet.h
@@ -36,19 +36,18 @@ __BEGIN_DECLS
typedef uint32_t in_addr_t;
-extern uint32_t inet_addr(const char *);
-
-extern int inet_aton(const char *, struct in_addr *);
-extern char* inet_ntoa(struct in_addr);
-
-extern int inet_pton(int, const char *, void *);
-extern const char* inet_ntop(int, const void *, char *, socklen_t);
-
-extern unsigned int inet_nsap_addr(const char *, unsigned char *, int);
-extern char* inet_nsap_ntoa(int, const unsigned char *, char *);
+in_addr_t inet_addr(const char*);
+int inet_aton(const char*, struct in_addr*);
+in_addr_t inet_lnaof(struct in_addr);
+struct in_addr inet_makeaddr(in_addr_t, in_addr_t);
+in_addr_t inet_netof(struct in_addr);
+in_addr_t inet_network(const char*);
+char* inet_ntoa(struct in_addr);
+const char* inet_ntop(int, const void*, char*, socklen_t);
+unsigned int inet_nsap_addr(const char*, unsigned char*, int);
+char* inet_nsap_ntoa(int, const unsigned char*, char*);
+int inet_pton(int, const char*, void*);
__END_DECLS
#endif /* _ARPA_INET_H_ */
-
-
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/dirent.h b/9/platforms/android-19/arch-x86_64/usr/include/dirent.h
index bfe4ea4..71eb2e7 100644
--- a/9/platforms/android-19/arch-x86_64/usr/include/dirent.h
+++ b/9/platforms/android-19/arch-x86_64/usr/include/dirent.h
@@ -56,6 +56,8 @@ __BEGIN_DECLS
struct dirent { __DIRENT64_BODY };
struct dirent64 { __DIRENT64_BODY };
+#undef __DIRENT64_BODY
+
#define d_fileno d_ino
typedef struct DIR DIR;
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/mntent.h b/9/platforms/android-19/arch-x86_64/usr/include/mntent.h
index 6cc0b18..de285d0 100644
--- a/9/platforms/android-19/arch-x86_64/usr/include/mntent.h
+++ b/9/platforms/android-19/arch-x86_64/usr/include/mntent.h
@@ -35,23 +35,21 @@
#define MOUNTED _PATH_MOUNTED
#define MNTTYPE_IGNORE "ignore"
-struct mntent
-{
- char* mnt_fsname;
- char* mnt_dir;
- char* mnt_type;
- char* mnt_opts;
- int mnt_freq;
- int mnt_passno;
+struct mntent {
+ char* mnt_fsname;
+ char* mnt_dir;
+ char* mnt_type;
+ char* mnt_opts;
+ int mnt_freq;
+ int mnt_passno;
};
-
__BEGIN_DECLS
-
+int endmntent(FILE*);
struct mntent* getmntent(FILE*);
+struct mntent* getmntent_r(FILE*, struct mntent*, char*, int);
FILE* setmntent(const char*, const char*);
-int endmntent(FILE*);
__END_DECLS
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/nsswitch.h b/9/platforms/android-19/arch-x86_64/usr/include/nsswitch.h
index d19d055..e03844b 100644
--- a/9/platforms/android-19/arch-x86_64/usr/include/nsswitch.h
+++ b/9/platforms/android-19/arch-x86_64/usr/include/nsswitch.h
@@ -54,7 +54,7 @@
/*
* Layout of:
* uint32_t ns_src.flags
- */
+ */
/* nsswitch.conf status codes and nsdispatch(3) return values */
#define NS_SUCCESS (1<<0) /* entry was found */
#define NS_UNAVAIL (1<<1) /* source not responding, or corrupt */
@@ -125,7 +125,7 @@ typedef struct {
*/
#define NS_FILES_CB(F,C) { NSSRC_FILES, F, __UNCONST(C) },
#define NS_COMPAT_CB(F,C) { NSSRC_COMPAT, F, __UNCONST(C) },
-
+
#ifdef HESIOD
# define NS_DNS_CB(F,C) { NSSRC_DNS, F, __UNCONST(C) },
#else
@@ -149,6 +149,7 @@ typedef struct {
} ns_src;
+#if 0
/*
* Default sourcelists (if nsswitch.conf is missing, corrupt,
* or the requested database doesn't have an entry)
@@ -160,7 +161,7 @@ extern const ns_src __nsdefaultfiles[];
extern const ns_src __nsdefaultfiles_forceall[];
extern const ns_src __nsdefaultnis[];
extern const ns_src __nsdefaultnis_forceall[];
-
+#endif
/*
* ns_mtab - `nsswitch method table'
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/pthread.h b/9/platforms/android-19/arch-x86_64/usr/include/pthread.h
index 7b8de81..49f943a 100644
--- a/9/platforms/android-19/arch-x86_64/usr/include/pthread.h
+++ b/9/platforms/android-19/arch-x86_64/usr/include/pthread.h
@@ -35,7 +35,7 @@
#include <limits.h>
#include <sys/types.h>
-#ifdef __LP64__
+#if defined(__LP64__)
#define __RESERVED_INITIALIZER , {0}
#else
#define __RESERVED_INITIALIZER
@@ -112,7 +112,11 @@ typedef volatile int pthread_once_t;
#define PTHREAD_ONCE_INIT 0
+#if defined(__LP64__)
+#define PTHREAD_STACK_MIN (4 * PAGE_SIZE)
+#else
#define PTHREAD_STACK_MIN (2 * PAGE_SIZE)
+#endif
#define PTHREAD_CREATE_DETACHED 0x00000001
#define PTHREAD_CREATE_JOINABLE 0x00000000
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/pwd.h b/9/platforms/android-19/arch-x86_64/usr/include/pwd.h
index 6f3fad5..6d483c0 100644
--- a/9/platforms/android-19/arch-x86_64/usr/include/pwd.h
+++ b/9/platforms/android-19/arch-x86_64/usr/include/pwd.h
@@ -100,12 +100,15 @@
struct passwd
{
- char* pw_name;
- char* pw_passwd;
- uid_t pw_uid;
- gid_t pw_gid;
- char* pw_dir;
- char* pw_shell;
+ char* pw_name;
+ char* pw_passwd;
+ uid_t pw_uid;
+ gid_t pw_gid;
+#ifdef __LP64__
+ char* pw_gecos;
+#endif
+ char* pw_dir;
+ char* pw_shell;
};
__BEGIN_DECLS
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sched.h b/9/platforms/android-19/arch-x86_64/usr/include/sched.h
index 68115bb..e43b6cc 100644
--- a/9/platforms/android-19/arch-x86_64/usr/include/sched.h
+++ b/9/platforms/android-19/arch-x86_64/usr/include/sched.h
@@ -59,10 +59,10 @@ extern int unshare(int);
extern int sched_getcpu(void);
extern int setns(int, int);
-#ifdef __LP32__
-#define CPU_SETSIZE 32
-#else
+#ifdef __LP64__
#define CPU_SETSIZE 1024
+#else
+#define CPU_SETSIZE 32
#endif
#define __CPU_BITTYPE unsigned long int /* mandated by the kernel */
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/endian.h b/9/platforms/android-19/arch-x86_64/usr/include/sys/endian.h
index cbde121..be4c905 100644
--- a/9/platforms/android-19/arch-x86_64/usr/include/sys/endian.h
+++ b/9/platforms/android-19/arch-x86_64/usr/include/sys/endian.h
@@ -39,6 +39,8 @@
#include <sys/cdefs.h>
#include <machine/endian.h>
+#include <stdint.h>
+
#define _LITTLE_ENDIAN 1234
#define _BIG_ENDIAN 4321
#define _PDP_ENDIAN 3412
@@ -186,14 +188,22 @@
#define letoh64(x) (x)
#endif /* __BSD_VISIBLE */
-#define htons(x) __swap16(x)
+/* glibc compatibility. */
+__BEGIN_DECLS
+uint32_t htonl(uint32_t) __pure2;
+uint16_t htons(uint16_t) __pure2;
+uint32_t ntohl(uint32_t) __pure2;
+uint16_t ntohs(uint16_t) __pure2;
+__END_DECLS
+
#define htonl(x) __swap32(x)
-#define ntohs(x) __swap16(x)
+#define htons(x) __swap16(x)
#define ntohl(x) __swap32(x)
+#define ntohs(x) __swap16(x)
/* Bionic additions */
-#define ntohq(x) __swap64(x)
#define htonq(x) __swap64(x)
+#define ntohq(x) __swap64(x)
#define __LITTLE_ENDIAN_BITFIELD
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/stat.h b/9/platforms/android-19/arch-x86_64/usr/include/sys/stat.h
index e62e76d..c0c168b 100644
--- a/9/platforms/android-19/arch-x86_64/usr/include/sys/stat.h
+++ b/9/platforms/android-19/arch-x86_64/usr/include/sys/stat.h
@@ -130,6 +130,8 @@ __BEGIN_DECLS
struct stat { __STAT64_BODY };
struct stat64 { __STAT64_BODY };
+#undef __STAT64_BODY
+
#define st_atimensec st_atime_nsec
#define st_mtimensec st_mtime_nsec
#define st_ctimensec st_ctime_nsec
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/statvfs.h b/9/platforms/android-19/arch-x86_64/usr/include/sys/statvfs.h
index 3d8179e..3495546 100644
--- a/9/platforms/android-19/arch-x86_64/usr/include/sys/statvfs.h
+++ b/9/platforms/android-19/arch-x86_64/usr/include/sys/statvfs.h
@@ -23,6 +23,12 @@
__BEGIN_DECLS
+#ifdef __LP64__
+#define __STATVFS64_RESERVED uint32_t __f_reserved[6];
+#else
+#define __STATVFS64_RESERVED
+#endif
+
#define __STATVFS64_BODY \
unsigned long f_bsize; \
unsigned long f_frsize; \
@@ -35,10 +41,14 @@ __BEGIN_DECLS
unsigned long f_fsid; \
unsigned long f_flag; \
unsigned long f_namemax; \
+ __STATVFS64_RESERVED
struct statvfs { __STATVFS64_BODY };
struct statvfs64 { __STATVFS64_BODY };
+#undef __STATVFS64_BODY
+#undef __STATVFS64_RESERVED
+
#define ST_RDONLY 0x0001
#define ST_NOSUID 0x0002
#define ST_NODEV 0x0004
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/ucontext.h b/9/platforms/android-19/arch-x86_64/usr/include/sys/ucontext.h
index 3737cbe..f150ac7 100644
--- a/9/platforms/android-19/arch-x86_64/usr/include/sys/ucontext.h
+++ b/9/platforms/android-19/arch-x86_64/usr/include/sys/ucontext.h
@@ -150,7 +150,8 @@ typedef struct ucontext {
stack_t uc_stack;
mcontext_t uc_mcontext;
sigset_t uc_sigmask;
- /* TODO: __fpregs_mem? */
+ char __padding[128 - sizeof(sigset_t)];
+ struct _libc_fpstate __fpregs_mem;
} ucontext_t;
#elif defined(__mips__)
@@ -238,7 +239,31 @@ enum {
typedef long greg_t;
typedef greg_t gregset_t[NGREG];
-typedef struct user_i387_struct* fpregset_t;
+struct _libc_fpxreg {
+ unsigned short significand[4];
+ unsigned short exponent;
+ unsigned short padding[3];
+};
+
+struct _libc_xmmreg {
+ uint32_t element[4];
+};
+
+struct _libc_fpstate {
+ uint16_t cwd;
+ uint16_t swd;
+ uint16_t ftw;
+ uint16_t fop;
+ uint64_t rip;
+ uint64_t rdp;
+ uint32_t mxcsr;
+ uint32_t mxcr_mask;
+ struct _libc_fpxreg _st[8];
+ struct _libc_xmmreg _xmm[16];
+ uint32_t padding[24];
+};
+
+typedef struct _libc_fpstate* fpregset_t;
typedef struct {
gregset_t gregs;
@@ -252,7 +277,8 @@ typedef struct ucontext {
stack_t uc_stack;
mcontext_t uc_mcontext;
sigset_t uc_sigmask;
- /* TODO: __fpregs_mem? */
+ char __padding[128 - sizeof(sigset_t)];
+ struct _libc_fpstate __fpregs_mem;
} ucontext_t;
#endif
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/user.h b/9/platforms/android-19/arch-x86_64/usr/include/sys/user.h
index c578a6f..705e0e9 100644
--- a/9/platforms/android-19/arch-x86_64/usr/include/sys/user.h
+++ b/9/platforms/android-19/arch-x86_64/usr/include/sys/user.h
@@ -103,7 +103,7 @@ struct user {
struct user_fpregs_struct {
unsigned short cwd;
unsigned short swd;
- unsigned short twd;
+ unsigned short ftw;
unsigned short fop;
__u64 rip;
__u64 rdp;
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/vfs.h b/9/platforms/android-19/arch-x86_64/usr/include/sys/vfs.h
index cd6044d..5358ffb 100644
--- a/9/platforms/android-19/arch-x86_64/usr/include/sys/vfs.h
+++ b/9/platforms/android-19/arch-x86_64/usr/include/sys/vfs.h
@@ -107,6 +107,8 @@ typedef __fsid_t fsid_t;
struct statfs { __STATFS64_BODY };
struct statfs64 { __STATFS64_BODY };
+#undef __STATFS64_BODY
+
/* Declare that we have the f_namelen, f_frsize, and f_flags fields. */
#define _STATFS_F_NAMELEN
#define _STATFS_F_FRSIZE
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/wchar.h b/9/platforms/android-19/arch-x86_64/usr/include/wchar.h
index fe2fe07..af7593f 100644
--- a/9/platforms/android-19/arch-x86_64/usr/include/wchar.h
+++ b/9/platforms/android-19/arch-x86_64/usr/include/wchar.h
@@ -41,15 +41,13 @@ __BEGIN_DECLS
typedef __WINT_TYPE__ wint_t;
typedef struct {
-#ifdef __LP32__
- int dummy;
-#else
- // 8 bytes should be enough to support at least UTF-8
- char __reserved[8];
+ uint8_t __seq[4];
+#ifdef __LP64__
+ char __reserved[4];
#endif
} mbstate_t;
-typedef enum {
+enum {
WC_TYPE_INVALID = 0,
WC_TYPE_ALNUM,
WC_TYPE_ALPHA,
@@ -64,7 +62,9 @@ typedef enum {
WC_TYPE_UPPER,
WC_TYPE_XDIGIT,
WC_TYPE_MAX
-} wctype_t;
+};
+
+typedef long wctype_t;
#define WEOF ((wint_t)(-1))
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libEGL.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libEGL.so
index 4202ae5..bd6bf11 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libEGL.so
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libEGL.so
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv1_CM.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv1_CM.so
index 2b7c271..ade34c5 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv1_CM.so
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv1_CM.so
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv2.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv2.so
index 869d0fb..d5c1921 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv2.so
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv2.so
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv3.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv3.so
index 96867fb..3b843dd 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv3.so
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv3.so
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libOpenMAXAL.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libOpenMAXAL.so
index 4330696..b6240af 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libOpenMAXAL.so
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libOpenMAXAL.so
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libOpenSLES.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libOpenSLES.so
index fc0bf45..471fee5 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libOpenSLES.so
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libOpenSLES.so
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libandroid.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libandroid.so
index c7f412a..928da8d 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libandroid.so
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libandroid.so
Binary files differ
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
index f26b0ef..bd52a5f 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
Binary files differ
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
index ed64078..7a48943 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
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libdl.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libdl.so
index d1da8b0..827b072 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libdl.so
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libdl.so
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libjnigraphics.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libjnigraphics.so
index f54e0c4..df03c27 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libjnigraphics.so
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libjnigraphics.so
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/liblog.so b/9/platforms/android-19/arch-x86_64/usr/lib64/liblog.so
index 43d75cb..c4305be 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/liblog.so
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/liblog.so
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libm.a b/9/platforms/android-19/arch-x86_64/usr/lib64/libm.a
index a3f8af6..f719483 100644
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libm.a
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libm.a
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libm.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libm.so
index f762946..071945b 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libm.so
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libm.so
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libstdc++.a b/9/platforms/android-19/arch-x86_64/usr/lib64/libstdc++.a
index b54d0f9..fdc3580 100644
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libstdc++.a
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libstdc++.a
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libstdc++.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libstdc++.so
index fc35a00..1468dd5 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libstdc++.so
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libstdc++.so
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libz.a b/9/platforms/android-19/arch-x86_64/usr/lib64/libz.a
index 55f47cb..3b2c4f2 100644
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libz.a
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libz.a
Binary files differ