update sizeof: remove two arch specific types from the test

diff --git a/data/sizeof.glibc.i386 b/data/sizeof.glibc.i386
index 3bdfd8a..5e7de26 100644 (file)
--- a/data/sizeof.glibc.i386
+++ b/data/sizeof.glibc.i386
@@ -79,7 +79,6 @@ div_t 8
 double 8
 double_t       12
 elf_fpregset_t 108
-elf_fpxregset_t        512
 elf_greg_t     4
 elf_gregset_t  68
 epoll_data_t   8
@@ -373,7 +372,6 @@ struct ucred        12
 struct udphdr  8
 struct user    284
 struct user_fpregs_struct      108
-struct user_fpxregs_struct     512
 struct user_regs_struct        68
 struct utimbuf 8
 struct utmpx   384

diff --git a/data/sizeof.i386.diff b/data/sizeof.i386.diff
index b8555e1..77e8d5e 100644 (file)
--- a/data/sizeof.i386.diff
+++ b/data/sizeof.i386.diff
@@ -1,43 +1,43 @@
---- data/glibc.sizeof  2013-02-26 10:10:32.000000000 +0100
-+++ data/musl.sizeof   2013-02-26 10:10:32.000000000 +0100
-@@ -88,3 +88,3 @@
+--- 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
-@@ -123,3 +123,3 @@
+@@ -122,3 +122,3 @@
  intptr_t      4
 -jmp_buf       156
 +jmp_buf       24
  key_t 4
-@@ -182,3 +182,3 @@
+@@ -181,3 +181,3 @@
  quad_t        8
 -regex_t       32
 +regex_t       28
  register_t    4
-@@ -209,3 +209,3 @@
+@@ -208,3 +208,3 @@
  struct __res_state    512
 -struct _fpstate       624
 +struct _fpstate       112
  struct _ns_flagdata   8
-@@ -223,3 +223,3 @@
+@@ -222,3 +222,3 @@
  struct cmsghdr        12
 -struct crypt_data     131228
 +struct crypt_data     260
  struct dirent 276
-@@ -327,4 +327,4 @@
+@@ -326,4 +326,4 @@
  struct rtentry        84
 -struct rusage 72
 -struct sched_param    4
 +struct rusage 136
 +struct sched_param    28
  struct sembuf 6
-@@ -349,3 +349,3 @@
+@@ -348,3 +348,3 @@
  struct sockaddr_ll    20
 -struct sockaddr_storage       128
 +struct sockaddr_storage       132
  struct sockaddr_un    110
-@@ -362,3 +362,3 @@
+@@ -361,3 +361,3 @@
  struct strrecvfd      20
 -struct sysinfo        64
 +struct sysinfo        312

diff --git a/data/sizeof.musl.i386 b/data/sizeof.musl.i386
index 84e753d..c9db0c4 100644 (file)
--- a/data/sizeof.musl.i386
+++ b/data/sizeof.musl.i386
@@ -79,7 +79,6 @@ div_t 8
 double 8
 double_t       12
 elf_fpregset_t 108
-elf_fpxregset_t        512
 elf_greg_t     4
 elf_gregset_t  68
 epoll_data_t   8
@@ -373,7 +372,6 @@ struct ucred        12
 struct udphdr  8
 struct user    284
 struct user_fpregs_struct      108
-struct user_fpxregs_struct     512
 struct user_regs_struct        68
 struct utimbuf 8
 struct utmpx   384

diff --git a/sizeof.c b/sizeof.c
index f334769..1b2ae72 100644 (file)
--- a/sizeof.c
+++ b/sizeof.c
@@ -252,7 +252,7 @@ p(div_t)
 p(double)
 p(double_t)
 p(elf_fpregset_t)
-p(elf_fpxregset_t)
+//p(elf_fpxregset_t)
 p(elf_greg_t)
 p(elf_gregset_t)
 p(epoll_data_t)
@@ -551,7 +551,7 @@ p(struct ucred)
 p(struct udphdr)
 p(struct user)
 p(struct user_fpregs_struct)
-p(struct user_fpxregs_struct)
+//p(struct user_fpxregs_struct)
 p(struct user_regs_struct)
 p(struct utimbuf)
 p(struct utmpx)

diff --git a/sizeof.sh b/sizeof.sh
index 723d01d..849fd36 100755 (executable)
--- a/sizeof.sh
+++ b/sizeof.sh
@@ -38,6 +38,6 @@ echo '#define p(x) printf("%s\\t%u\\n", #x, sizeof(x));' >>sizeof.c
 echo 'int main(){' >>sizeof.c
 sort /tmp/m.type |uniq |awk '
        /^(struct|union) __(CODE|ptcb|siginfo|ucontext|sigjmp_buf|double_repr|float_repr)$/ ||
-       /^(DIR|FILE|Sg_io_vec)$/ { printf "//" }
+       /^(DIR|FILE|elf_fpxregset_t|struct user_fpxregs_struct|Sg_io_vec)$/ { printf "//" }
        { print "p(" $0 ")" }' >>sizeof.c
 echo 'return 0;}' >>sizeof.c