From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/2849 Path: news.gmane.org!not-for-mail From: Ivan Kanakarakis Newsgroups: gmane.linux.lib.musl.general Subject: Re: Fix for fields in utmp Date: Tue, 26 Feb 2013 12:34:43 +0200 Message-ID: References: <5125148D.8080205@gmail.com> <20130220184937.GU6181@port70.net> <20130221005634.GM20323@brightrain.aerifal.cx> <20130226064929.GC20323@brightrain.aerifal.cx> <20130226092227.GE6181@port70.net> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=f46d0444eeff729ab504d69e3695 X-Trace: ger.gmane.org 1361874927 15098 80.91.229.3 (26 Feb 2013 10:35:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 26 Feb 2013 10:35:27 +0000 (UTC) To: musl@lists.openwall.com Original-X-From: musl-return-2850-gllmg-musl=m.gmane.org@lists.openwall.com Tue Feb 26 11:35:48 2013 Return-path: Envelope-to: gllmg-musl@plane.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by plane.gmane.org with smtp (Exim 4.69) (envelope-from ) id 1UAHsx-00081w-Gu for gllmg-musl@plane.gmane.org; Tue, 26 Feb 2013 11:35:47 +0100 Original-Received: (qmail 17967 invoked by uid 550); 26 Feb 2013 10:35:26 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Original-Received: (qmail 17949 invoked from network); 26 Feb 2013 10:35:25 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:mime-version:in-reply-to:references:from:date:message-id :subject:to:content-type; bh=ZNlVY9IyWLh70uPUTPi2FvCIj2R43c8XoL54KeHqQV4=; b=tf25/RqKW9cVV5OMirtGQnfff1Q4nGPB1hOkXdFTZPiMs10Yrd4KbPaLVMK5srASWD g0RYd4Zk9zVqV3b39I/8MW8tq331ULXjwPK7ak/8hG1Wy2aKAu9xZ3VLdxy2fAbjWBRP +Gf2rXPd4b4JoNlILUYFdEDFa1KkSR3y0eUWqlxu5ZyiWyRtlxaz7dbSDpy/hzl+3wuV 5CZ5r2EeAtChKSW6RMqKrqHF4OiMHJR/e4k9vdBvOHNmimB9kvEOOpdsuCV8DsNDIfh3 MvpmLUwYg4hQXa760+kIfqs4EOhO+eGd4j/oQn+RHAl5iNDgDMknjiP+m6hbEgZ8m9el i7iA== X-Received: by 10.182.123.49 with SMTP id lx17mr10673703obb.63.1361874913496; Tue, 26 Feb 2013 02:35:13 -0800 (PST) In-Reply-To: <20130226092227.GE6181@port70.net> Xref: news.gmane.org gmane.linux.lib.musl.general:2849 Archived-At: --f46d0444eeff729ab504d69e3695 Content-Type: text/plain; charset=ISO-8859-1 here is the output from musl-tables' sizeof test (also attached). I had to comment out 'elf_fpxregset_t' to make it build. this is run with latest musl from git (HEAD e201d82) Linux suicidemachine 3.7.5-1-ARCH #1 SMP PREEMPT Mon Jan 28 10:03:32 CET 2013 x86_64 GNU/Linux ---------------------------------- diff --git a/sizeof.c b/sizeof.c index f334769..47a7790 100644 --- 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) +// FIXME 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) +// FIXME p(struct user_fpxregs_struct) p(struct user_regs_struct) p(struct utimbuf) p(struct utmpx) ---------------------------------- ./sizeof-glibc >data/glibc.sizeof ./sizeof-musl >data/musl.sizeof diff -U1 data/glibc.sizeof data/musl.sizeof >data/sizeof.diff || true ---------------------------------- --- data/glibc.sizeof 2013-02-26 12:27:48.112569344 +0200 +++ data/musl.sizeof 2013-02-26 12:27:48.119236080 +0200 @@ -90,3 +90,3 @@ float 4 -float_t 4 +float_t 8 fpos_t 16 @@ -112,4 +112,4 @@ int8_t 1 -int_fast16_t 8 -int_fast32_t 8 +int_fast16_t 4 +int_fast32_t 4 int_fast64_t 8 @@ -122,3 +122,3 @@ intptr_t 8 -jmp_buf 200 +jmp_buf 64 key_t 4 @@ -181,6 +181,6 @@ quad_t 8 -regex_t 64 +regex_t 56 register_t 8 -regmatch_t 8 -regoff_t 4 +regmatch_t 16 +regoff_t 8 res_state 8 @@ -196,3 +196,3 @@ sighandler_t 8 -siginfo_t 128 +siginfo_t 136 sigjmp_buf 200 @@ -215,3 +215,3 @@ struct ar_hdr 60 -struct arpd_request 40 +struct arpd_request 28 struct arphdr 8 @@ -222,3 +222,3 @@ struct cmsghdr 16 -struct crypt_data 131232 +struct crypt_data 260 struct dirent 280 @@ -282,3 +282,3 @@ struct itimerval 32 -struct lastlog 292 +struct lastlog 296 struct lconv 96 @@ -312,3 +312,3 @@ struct ns_tsig_key 2072 -struct ntptimeval 72 +struct ntptimeval 32 struct option 32 @@ -326,4 +326,4 @@ struct rtentry 120 -struct rusage 144 -struct sched_param 4 +struct rusage 272 +struct sched_param 48 struct sembuf 6 @@ -348,3 +348,3 @@ struct sockaddr_ll 20 -struct sockaddr_storage 128 +struct sockaddr_storage 136 struct sockaddr_un 110 @@ -361,3 +361,3 @@ struct strrecvfd 20 -struct sysinfo 112 +struct sysinfo 368 struct termios 60 @@ -376,3 +376,3 @@ struct utimbuf 16 -struct utmpx 384 +struct utmpx 400 struct utsname 390 @@ -399,4 +399,4 @@ uint8_t 1 -uint_fast16_t 8 -uint_fast32_t 8 +uint_fast16_t 4 +uint_fast32_t 4 uint_fast64_t 8 @@ -416,4 +416,4 @@ wchar_t 4 -wctrans_t 8 -wctype_t 8 +wctrans_t 4 +wctype_t 4 wint_t 4 On 26 February 2013 11:22, Szabolcs Nagy wrote: > * Rich Felker [2013-02-26 01:49:29 -0500]: >> On Wed, Feb 20, 2013 at 07:56:35PM -0500, Rich Felker wrote: >> > On Wed, Feb 20, 2013 at 07:49:37PM +0100, Szabolcs Nagy wrote: >> > > and the 64bit abi is different on musl >> > > (see ut_session and ut_tv) >> > >> > That should be fixed. Since it's all stubs, I don't think ABI is a big >> > issue here. >> >> Can you elaborate on what needs to be changed here? >> > > from the code it seemed they have ifdefs for 64bit > > i think someone should run > > http://nsz.repo.hu/git/?p=musl-tables;a=blob;f=sizeof.c > > on x86_64 with glibc and musl and report back the > outputs (you can git clone and make sizeof) > (it may be useful to do this other archs as well) -- Ivan c00kiemon5ter V Kanakarakis >:3 --f46d0444eeff729ab504d69e3695 Content-Type: text/plain; charset=US-ASCII; name="report.txt" Content-Disposition: attachment; filename="report.txt" Content-Transfer-Encoding: base64 X-Attachment-Id: f_hdmwyyw90 TGludXggc3VpY2lkZW1hY2hpbmUgMy43LjUtMS1BUkNIICMxIFNNUCBQUkVFTVBUIE1vbiBKYW4g MjggMTA6MDM6MzIgQ0VUIDIwMTMgeDg2XzY0IEdOVS9MaW51eAotLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tCmRpZmYgLS1naXQgYS9zaXplb2YuYyBiL3NpemVvZi5jCmluZGV4IGYz MzQ3NjkuLjQ3YTc3OTAgMTAwNjQ0Ci0tLSBhL3NpemVvZi5jCisrKyBiL3NpemVvZi5jCkBAIC0y NTIsNyArMjUyLDcgQEAgcChkaXZfdCkKIHAoZG91YmxlKQogcChkb3VibGVfdCkKIHAoZWxmX2Zw cmVnc2V0X3QpCi1wKGVsZl9mcHhyZWdzZXRfdCkKKy8vIEZJWE1FIHAoZWxmX2ZweHJlZ3NldF90 KQogcChlbGZfZ3JlZ190KQogcChlbGZfZ3JlZ3NldF90KQogcChlcG9sbF9kYXRhX3QpCkBAIC01 NTEsNyArNTUxLDcgQEAgcChzdHJ1Y3QgdWNyZWQpCiBwKHN0cnVjdCB1ZHBoZHIpCiBwKHN0cnVj dCB1c2VyKQogcChzdHJ1Y3QgdXNlcl9mcHJlZ3Nfc3RydWN0KQotcChzdHJ1Y3QgdXNlcl9mcHhy ZWdzX3N0cnVjdCkKKy8vIEZJWE1FIHAoc3RydWN0IHVzZXJfZnB4cmVnc19zdHJ1Y3QpCiBwKHN0 cnVjdCB1c2VyX3JlZ3Nfc3RydWN0KQogcChzdHJ1Y3QgdXRpbWJ1ZikKIHAoc3RydWN0IHV0bXB4 KQotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCi4vc2l6ZW9mLWdsaWJjID5kYXRh L2dsaWJjLnNpemVvZgouL3NpemVvZi1tdXNsID5kYXRhL211c2wuc2l6ZW9mCmRpZmYgLVUxIGRh dGEvZ2xpYmMuc2l6ZW9mIGRhdGEvbXVzbC5zaXplb2YgPmRhdGEvc2l6ZW9mLmRpZmYgfHwgdHJ1 ZQotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCi0tLSBkYXRhL2dsaWJjLnNpemVv ZgkyMDEzLTAyLTI2IDEyOjI3OjQ4LjExMjU2OTM0NCArMDIwMAorKysgZGF0YS9tdXNsLnNpemVv ZgkyMDEzLTAyLTI2IDEyOjI3OjQ4LjExOTIzNjA4MCArMDIwMApAQCAtOTAsMyArOTAsMyBAQAog ZmxvYXQJNAotZmxvYXRfdAk0CitmbG9hdF90CTgKIGZwb3NfdAkxNgpAQCAtMTEyLDQgKzExMiw0 IEBACiBpbnQ4X3QJMQotaW50X2Zhc3QxNl90CTgKLWludF9mYXN0MzJfdAk4CitpbnRfZmFzdDE2 X3QJNAoraW50X2Zhc3QzMl90CTQKIGludF9mYXN0NjRfdAk4CkBAIC0xMjIsMyArMTIyLDMgQEAK IGludHB0cl90CTgKLWptcF9idWYJMjAwCitqbXBfYnVmCTY0CiBrZXlfdAk0CkBAIC0xODEsNiAr MTgxLDYgQEAKIHF1YWRfdAk4Ci1yZWdleF90CTY0CityZWdleF90CTU2CiByZWdpc3Rlcl90CTgK LXJlZ21hdGNoX3QJOAotcmVnb2ZmX3QJNAorcmVnbWF0Y2hfdAkxNgorcmVnb2ZmX3QJOAogcmVz X3N0YXRlCTgKQEAgLTE5NiwzICsxOTYsMyBAQAogc2lnaGFuZGxlcl90CTgKLXNpZ2luZm9fdAkx MjgKK3NpZ2luZm9fdAkxMzYKIHNpZ2ptcF9idWYJMjAwCkBAIC0yMTUsMyArMjE1LDMgQEAKIHN0 cnVjdCBhcl9oZHIJNjAKLXN0cnVjdCBhcnBkX3JlcXVlc3QJNDAKK3N0cnVjdCBhcnBkX3JlcXVl c3QJMjgKIHN0cnVjdCBhcnBoZHIJOApAQCAtMjIyLDMgKzIyMiwzIEBACiBzdHJ1Y3QgY21zZ2hk cgkxNgotc3RydWN0IGNyeXB0X2RhdGEJMTMxMjMyCitzdHJ1Y3QgY3J5cHRfZGF0YQkyNjAKIHN0 cnVjdCBkaXJlbnQJMjgwCkBAIC0yODIsMyArMjgyLDMgQEAKIHN0cnVjdCBpdGltZXJ2YWwJMzIK LXN0cnVjdCBsYXN0bG9nCTI5Mgorc3RydWN0IGxhc3Rsb2cJMjk2CiBzdHJ1Y3QgbGNvbnYJOTYK QEAgLTMxMiwzICszMTIsMyBAQAogc3RydWN0IG5zX3RzaWdfa2V5CTIwNzIKLXN0cnVjdCBudHB0 aW1ldmFsCTcyCitzdHJ1Y3QgbnRwdGltZXZhbAkzMgogc3RydWN0IG9wdGlvbgkzMgpAQCAtMzI2 LDQgKzMyNiw0IEBACiBzdHJ1Y3QgcnRlbnRyeQkxMjAKLXN0cnVjdCBydXNhZ2UJMTQ0Ci1zdHJ1 Y3Qgc2NoZWRfcGFyYW0JNAorc3RydWN0IHJ1c2FnZQkyNzIKK3N0cnVjdCBzY2hlZF9wYXJhbQk0 OAogc3RydWN0IHNlbWJ1Zgk2CkBAIC0zNDgsMyArMzQ4LDMgQEAKIHN0cnVjdCBzb2NrYWRkcl9s bAkyMAotc3RydWN0IHNvY2thZGRyX3N0b3JhZ2UJMTI4CitzdHJ1Y3Qgc29ja2FkZHJfc3RvcmFn ZQkxMzYKIHN0cnVjdCBzb2NrYWRkcl91bgkxMTAKQEAgLTM2MSwzICszNjEsMyBAQAogc3RydWN0 IHN0cnJlY3ZmZAkyMAotc3RydWN0IHN5c2luZm8JMTEyCitzdHJ1Y3Qgc3lzaW5mbwkzNjgKIHN0 cnVjdCB0ZXJtaW9zCTYwCkBAIC0zNzYsMyArMzc2LDMgQEAKIHN0cnVjdCB1dGltYnVmCTE2Ci1z dHJ1Y3QgdXRtcHgJMzg0CitzdHJ1Y3QgdXRtcHgJNDAwCiBzdHJ1Y3QgdXRzbmFtZQkzOTAKQEAg LTM5OSw0ICszOTksNCBAQAogdWludDhfdAkxCi11aW50X2Zhc3QxNl90CTgKLXVpbnRfZmFzdDMy X3QJOAordWludF9mYXN0MTZfdAk0Cit1aW50X2Zhc3QzMl90CTQKIHVpbnRfZmFzdDY0X3QJOApA QCAtNDE2LDQgKzQxNiw0IEBACiB3Y2hhcl90CTQKLXdjdHJhbnNfdAk4Ci13Y3R5cGVfdAk4Cit3 Y3RyYW5zX3QJNAord2N0eXBlX3QJNAogd2ludF90CTQK --f46d0444eeff729ab504d69e3695--