From: Bernhard Fischer <rep.dot.nop@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] make strace buildable
Date: Thu, 20 Sep 2007 16:45:27 +0200 [thread overview]
Message-ID: <20070920144527.GA6384@aon.at> (raw)
In-Reply-To: <200707162232.43774.yann.morin.1998@anciens.enib.fr>
Yann,
On Mon, Jul 16, 2007 at 10:32:43PM +0200, Yann E. MORIN wrote:
>Hello all!
>
>The second hunk in package/strace/strace-undef-syscall.patch is incorrect:
>
>--- strace-4.5.15.orig/linux/syscallent.h 2007-02-04 19:03:48.000000000 +0100
>+++ strace-4.5.15/linux/syscallent.h 2007-02-04 19:11:04.000000000 +0100
>@@ -130,7 +130,10 @@
> { 2, TF, sys_statfs, "statfs" }, /* 99 */
> { 2, TD, sys_fstatfs, "fstatfs" }, /* 100 */
> { 3, 0, sys_ioperm, "ioperm" }, /* 101 */
>- { 2, TD, sys_socketcall, "socketcall", SYS_socketcall }, /* 102 */
>+ { 2, TD, sys_socketcall, "socketcall",
>+#ifdef __NR_socketcall
>+ SYS_socketcall }, /* 102 */
>+#endif
> { 3, 0, sys_syslog, "syslog" }, /* 103 */
> { 3, 0, sys_setitimer, "setitimer" }, /* 104 */
> { 2, 0, sys_getitimer, "getitimer" }, /* 105 */
>@@ -145,7 +148,10 @@
> { 4, TP, sys_wait4, "wait4", SYS_wait4 }, /* 114 */
> { 1, 0, sys_swapoff, "swapoff" }, /* 115 */
> { 1, 0, sys_sysinfo, "sysinfo" }, /* 116 */
>- { 6, 0, sys_ipc, "ipc", SYS_ipc }, /* 117 */
>+ { 6, 0, sys_ipc, "ipc",
>+#ifdef __NR_ipc
>+ SYS_ipc }, /* 117 */
>+#endif
> { 1, TD, sys_fsync, "fsync" }, /* 118 */
> { 1, TS, sys_sigreturn, "sigreturn" }, /* 119 */
> { 5, TP, sys_clone, "clone", SYS_clone }, /* 120 */
>
>If either or both of __NR_socketcall and __NR_ipc are not defined, then the
>closing curly braces are omitted, thus resulting in incorrect C statements.
>
>The attached patch to r19112 solves the issue.
>
>Regards,
>Yann E. MORIN.
>
>--
>.-----------------.--------------------.------------------.--------------------.
>| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
>| +0/33 662376056 | Software Designer | \ / CAMPAIGN | ^ |
>| --==< ?_? >==-- ?------------.-------: X AGAINST | /e\ There is no |
>| http://ymorin.is-a-geek.org/ | (*_*) | / \ HTML MAIL | """ conspiracy. |
>?------------------------------?-------?------------------?--------------------?
>Index: buildroot/package/strace/strace-undef-syscall.patch
>===================================================================
>--- buildroot/package/strace/strace-undef-syscall.patch (revision 19112)
>+++ buildroot/package/strace/strace-undef-syscall.patch (working copy)
>@@ -15,27 +15,29 @@
> { 4, 0, sys_epoll_ctl, "epoll_ctl" }, /* 255 */
> --- strace-4.5.15.orig/linux/syscallent.h 2007-02-04 19:03:48.000000000 +0100
> +++ strace-4.5.15/linux/syscallent.h 2007-02-04 19:11:04.000000000 +0100
>-@@ -130,7 +130,10 @@
>+@@ -130,7 +130,11 @@
> { 2, TF, sys_statfs, "statfs" }, /* 99 */
> { 2, TD, sys_fstatfs, "fstatfs" }, /* 100 */
> { 3, 0, sys_ioperm, "ioperm" }, /* 101 */
> - { 2, TD, sys_socketcall, "socketcall", SYS_socketcall }, /* 102 */
>-+ { 2, TD, sys_socketcall, "socketcall",
>++ { 2, TD, sys_socketcall, "socketcall"
> +#ifdef __NR_socketcall
>-+ SYS_socketcall }, /* 102 */
>++ , SYS_socketcall
> +#endif
>++ }, /* 102 */
Hm. I just ment to push this change upstream but..
Now if there is no socketcall, where does that closing curly bracket
come from, again?
I think it should be right here, but i can't see it?
> { 3, 0, sys_syslog, "syslog" }, /* 103 */
> { 3, 0, sys_setitimer, "setitimer" }, /* 104 */
> { 2, 0, sys_getitimer, "getitimer" }, /* 105 */
>-@@ -145,7 +148,10 @@
>+@@ -145,7 +149,11 @@
> { 4, TP, sys_wait4, "wait4", SYS_wait4 }, /* 114 */
> { 1, 0, sys_swapoff, "swapoff" }, /* 115 */
> { 1, 0, sys_sysinfo, "sysinfo" }, /* 116 */
> - { 6, 0, sys_ipc, "ipc", SYS_ipc }, /* 117 */
>-+ { 6, 0, sys_ipc, "ipc",
>++ { 6, 0, sys_ipc, "ipc"
> +#ifdef __NR_ipc
>-+ SYS_ipc }, /* 117 */
>++ , SYS_ipc
> +#endif
>++ }, /* 117 */
ditto. +}, is missing, no?
> { 1, TD, sys_fsync, "fsync" }, /* 118 */
> { 1, TS, sys_sigreturn, "sigreturn" }, /* 119 */
> { 5, TP, sys_clone, "clone", SYS_clone }, /* 120 */
next prev parent reply other threads:[~2007-09-20 14:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-16 20:32 [Buildroot] [PATCH] make strace buildable Yann E. MORIN
2007-07-24 17:33 ` Yann E. MORIN
2007-07-24 17:53 ` Bernhard Fischer
2007-09-20 14:45 ` Bernhard Fischer [this message]
2007-09-20 14:48 ` Bernhard Fischer
2007-09-20 16:34 ` Yann E. MORIN
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070920144527.GA6384@aon.at \
--to=rep.dot.nop@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox