From 3ec3f1149975e8c7ac221df01b657e522102431f Mon Sep 17 00:00:00 2001 From: nsz Date: Tue, 11 Mar 2014 11:29:47 +0100 Subject: [PATCH] update i386 sizeof data --- data/sizeof.glibc.i386 | 29 +++++++++++++++++++++++++---- data/sizeof.i386.diff | 42 ++++++++++++++++-------------------------- data/sizeof.musl.i386 | 31 ++++++++++++++++++++++++++----- 3 files changed, 67 insertions(+), 35 deletions(-) diff --git a/data/sizeof.glibc.i386 b/data/sizeof.glibc.i386 index 5e7de26..9d39979 100644 --- a/data/sizeof.glibc.i386 +++ b/data/sizeof.glibc.i386 @@ -64,9 +64,7 @@ Sg_req_info 20 Sg_scsi_id 32 VISIT 4 _Bool 1 -__uint16_t 2 -__uint32_t 4 -__uint64_t 8 +__jmp_buf 24 blkcnt_t 8 blksize_t 4 caddr_t 4 @@ -74,6 +72,7 @@ cc_t 1 clock_t 4 clockid_t 4 comp_t 2 +cpu_set_t 128 dev_t 8 div_t 8 double 8 @@ -190,6 +189,7 @@ sem_t 16 sg_io_hdr_t 64 sg_iovec_t 8 sg_req_info_t 20 +shmatt_t 4 short 2 sig_atomic_t 4 sig_t 4 @@ -203,6 +203,7 @@ speed_t 4 ssize_t 4 stack_t 12 struct FTW 8 +struct __jmp_buf_tag 156 struct __ns_msg 48 struct __ns_rr 1044 struct __res_state 512 @@ -223,17 +224,25 @@ struct cmsghdr 12 struct crypt_data 131228 struct dirent 276 struct dl_phdr_info 40 +struct dqblk 68 +struct dqinfo 24 struct elf_prpsinfo 124 struct elf_prstatus 144 struct elf_siginfo 12 +struct entry 8 struct epoll_event 12 struct ether_addr 6 struct ether_arp 28 struct ether_header 14 struct ethhdr 14 struct f_owner_ex 8 +struct fanotify_event_metadata 24 +struct fanotify_response 8 struct flock 24 struct group 16 +struct group_filter 268 +struct group_req 132 +struct group_source_req 260 struct hostent 20 struct icmp 28 struct icmp6_filter 32 @@ -243,9 +252,11 @@ struct icmp_ra_addr 8 struct icmphdr 8 struct if_nameindex 8 struct ifaddr 40 +struct ifaddrs 28 struct ifconf 8 struct ifmap 16 struct ifreq 32 +struct igmp 8 struct ih_idseq 4 struct ih_pmtu 4 struct ih_rtradv 4 @@ -272,7 +283,9 @@ struct ip6_opt_tunnel 3 struct ip6_rthdr 4 struct ip6_rthdr0 8 struct ip_mreq 8 +struct ip_mreq_source 12 struct ip_mreqn 12 +struct ip_msfilter 20 struct ip_opts 44 struct ip_timestamp 40 struct ipc_perm 36 @@ -310,7 +323,7 @@ struct nd_router_solicit 8 struct netent 16 struct ns_tcp_tsig_state 528 struct ns_tsig_key 2060 -struct ntptimeval 16 +struct ntptimeval 36 struct option 16 struct packet_mreq 16 struct passwd 28 @@ -318,6 +331,7 @@ struct pollfd 8 struct protoent 12 struct qelem 12 struct r_debug 20 +struct re_pattern_buffer 32 struct res_sym 12 struct rlimit 16 struct rr_pco_match 24 @@ -339,6 +353,7 @@ struct shm_info 24 struct shmid_ds 84 struct shminfo 36 struct sigaction 140 +struct sigaltstack 12 struct sigcontext 88 struct sigevent 64 struct signalfd_siginfo 128 @@ -360,7 +375,12 @@ struct strioctl 16 struct strpeek 28 struct strrecvfd 20 struct sysinfo 64 +struct tcp_info 104 +struct tcp_md5sig 216 +struct tcphdr 20 struct termios 60 +struct tftphdr 5 +struct timeb 12 struct timespec 8 struct timestamp 40 struct timeval 8 @@ -410,6 +430,7 @@ uintptr_t 4 ulong 4 union epoll_data 8 union sigval 4 +useconds_t 4 ushort 2 va_list 4 void* 4 diff --git a/data/sizeof.i386.diff b/data/sizeof.i386.diff index 77e8d5e..966c7a2 100644 --- a/data/sizeof.i386.diff +++ b/data/sizeof.i386.diff @@ -1,44 +1,34 @@ ---- data/glibc.sizeof 2013-02-26 11:49:20.000000000 +0100 -+++ data/musl.sizeof 2013-02-26 11:49:20.000000000 +0100 -@@ -87,3 +87,3 @@ - fd_set 128 --fenv_t 28 -+fenv_t 32 - fexcept_t 2 -@@ -122,3 +122,3 @@ - intptr_t 4 --jmp_buf 156 -+jmp_buf 24 - key_t 4 -@@ -181,3 +181,3 @@ - quad_t 8 --regex_t 32 -+regex_t 28 - register_t 4 -@@ -208,3 +208,3 @@ +--- data/glibc.sizeof 2014-03-10 13:41:09.259452744 +0100 ++++ data/musl.sizeof 2014-03-10 13:41:09.259452744 +0100 +@@ -209,3 +209,3 @@ struct __res_state 512 -struct _fpstate 624 +struct _fpstate 112 struct _ns_flagdata 8 -@@ -222,3 +222,3 @@ +@@ -223,3 +223,3 @@ struct cmsghdr 12 -struct crypt_data 131228 +struct crypt_data 260 struct dirent 276 -@@ -326,4 +326,4 @@ +@@ -325,3 +325,3 @@ + struct ns_tsig_key 2060 +-struct ntptimeval 36 ++struct ntptimeval 16 + struct option 16 +@@ -340,4 +340,4 @@ struct rtentry 84 -struct rusage 72 -struct sched_param 4 +struct rusage 136 +struct sched_param 28 struct sembuf 6 -@@ -348,3 +348,3 @@ - struct sockaddr_ll 20 --struct sockaddr_storage 128 -+struct sockaddr_storage 132 - struct sockaddr_un 110 -@@ -361,3 +361,3 @@ +@@ -376,3 +376,3 @@ struct strrecvfd 20 -struct sysinfo 64 +struct sysinfo 312 + struct tcp_info 104 +@@ -381,3 +381,3 @@ struct termios 60 +-struct tftphdr 5 ++struct tftphdr 6 + struct timeb 12 diff --git a/data/sizeof.musl.i386 b/data/sizeof.musl.i386 index 1715aa1..910b3e0 100644 --- a/data/sizeof.musl.i386 +++ b/data/sizeof.musl.i386 @@ -64,9 +64,7 @@ Sg_req_info 20 Sg_scsi_id 32 VISIT 4 _Bool 1 -__uint16_t 2 -__uint32_t 4 -__uint64_t 8 +__jmp_buf 24 blkcnt_t 8 blksize_t 4 caddr_t 4 @@ -74,6 +72,7 @@ cc_t 1 clock_t 4 clockid_t 4 comp_t 2 +cpu_set_t 128 dev_t 8 div_t 8 double 8 @@ -85,7 +84,7 @@ epoll_data_t 8 eventfd_t 8 fd_mask 4 fd_set 128 -fenv_t 32 +fenv_t 28 fexcept_t 2 float 4 float_t 12 @@ -120,7 +119,7 @@ int_least64_t 8 int_least8_t 1 intmax_t 8 intptr_t 4 -jmp_buf 24 +jmp_buf 156 key_t 4 ldiv_t 8 lldiv_t 16 @@ -190,6 +189,7 @@ sem_t 16 sg_io_hdr_t 64 sg_iovec_t 8 sg_req_info_t 20 +shmatt_t 4 short 2 sig_atomic_t 4 sig_t 4 @@ -203,6 +203,7 @@ speed_t 4 ssize_t 4 stack_t 12 struct FTW 8 +struct __jmp_buf_tag 156 struct __ns_msg 48 struct __ns_rr 1044 struct __res_state 512 @@ -223,17 +224,25 @@ struct cmsghdr 12 struct crypt_data 260 struct dirent 276 struct dl_phdr_info 40 +struct dqblk 68 +struct dqinfo 24 struct elf_prpsinfo 124 struct elf_prstatus 144 struct elf_siginfo 12 +struct entry 8 struct epoll_event 12 struct ether_addr 6 struct ether_arp 28 struct ether_header 14 struct ethhdr 14 struct f_owner_ex 8 +struct fanotify_event_metadata 24 +struct fanotify_response 8 struct flock 24 struct group 16 +struct group_filter 268 +struct group_req 132 +struct group_source_req 260 struct hostent 20 struct icmp 28 struct icmp6_filter 32 @@ -243,9 +252,11 @@ struct icmp_ra_addr 8 struct icmphdr 8 struct if_nameindex 8 struct ifaddr 40 +struct ifaddrs 28 struct ifconf 8 struct ifmap 16 struct ifreq 32 +struct igmp 8 struct ih_idseq 4 struct ih_pmtu 4 struct ih_rtradv 4 @@ -272,7 +283,9 @@ struct ip6_opt_tunnel 3 struct ip6_rthdr 4 struct ip6_rthdr0 8 struct ip_mreq 8 +struct ip_mreq_source 12 struct ip_mreqn 12 +struct ip_msfilter 20 struct ip_opts 44 struct ip_timestamp 40 struct ipc_perm 36 @@ -318,6 +331,7 @@ struct pollfd 8 struct protoent 12 struct qelem 12 struct r_debug 20 +struct re_pattern_buffer 32 struct res_sym 12 struct rlimit 16 struct rr_pco_match 24 @@ -339,6 +353,7 @@ struct shm_info 24 struct shmid_ds 84 struct shminfo 36 struct sigaction 140 +struct sigaltstack 12 struct sigcontext 88 struct sigevent 64 struct signalfd_siginfo 128 @@ -360,7 +375,12 @@ struct strioctl 16 struct strpeek 28 struct strrecvfd 20 struct sysinfo 312 +struct tcp_info 104 +struct tcp_md5sig 216 +struct tcphdr 20 struct termios 60 +struct tftphdr 6 +struct timeb 12 struct timespec 8 struct timestamp 40 struct timeval 8 @@ -410,6 +430,7 @@ uintptr_t 4 ulong 4 union epoll_data 8 union sigval 4 +useconds_t 4 ushort 2 va_list 4 void* 4 -- 2.20.1