make strace buildable

PATCH New Yann E. MORIN 2 participants 6 messages Jul 16, 2007 – Sep 20, 2007

lore

Share & tools

lore

Yann E. MORIN

author

2007-07-16 20:32 UTC #0 lore raw

PATCH 1/1 make strace buildable

Hello all!

The second hunk in package/strace/strace-undef-syscall.patch is incorrect:

linux/syscallent.h 2007-02-04 19:11:04.000000000 +0100 renamed from linux/syscallent.h 2007-02-04 19:03:48.000000000 +0100 +8 -2

@@ -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.

Signature · 13 lines

.-----------------.--------------------.------------------.--------------------.
|  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.  |
?------------------------------?-------?------------------?--------------------?
-------------- next part --------------
A non-text attachment was scrubbed...
Name: strace-syscallent.h-r19112.patch
Type: text/x-diff
Size: 1645 bytes
Desc: not available
Url : http://busybox.net/lists/buildroot/attachments/20070716/61ad059d/attachment.bin

Yann E. MORIN

author

2007-07-24 17:33 UTC #1 lore raw

PATCH 1/1 make strace buildable

Hello!

Any taker?

Quoted 29 lines · Yann E. MORIN

The second hunk in package/strace/strace-undef-syscall.patch is incorrect:

linux/syscallent.h 2007-02-04 19:11:04.000000000 +0100 renamed from linux/syscallent.h 2007-02-04 19:03:48.000000000 +0100 +8 -2

@@ -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 */

Quoted 4 lines

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.

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  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.  |
?------------------------------?-------?------------------?--------------------?

Bernhard Fischer

2007-07-24 17:53 UTC #2 lore raw

PATCH 1/1 make strace buildable

Quoted 3 lines · Yann E. MORIN

Hello!
Any taker?

Merged as r19254.
Still catching up with my mail-backlog, sorry..

Thanks!
cheers,
Bernhard

Bernhard Fischer

2007-09-20 14:45 UTC #3 lore raw

PATCH 1/1 make strace buildable

In reply to Yann E. MORIN

Yann,

Quoted 58 lines · Yann E. MORIN

Hello all!

The second hunk in package/strace/strace-undef-syscall.patch is incorrect:

linux/syscallent.h 2007-02-04 19:11:04.000000000 +0100 renamed from linux/syscallent.h 2007-02-04 19:03:48.000000000 +0100 +8 -2

@@ -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.

Signature · 9 lines

.-----------------.--------------------.------------------.--------------------.
|  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
===================================================================

package/strace/strace-undef-syscall.patch +0 -0

@@ -15,27 +15,29 @@
 	{ 4,	0,	sys_epoll_ctl,		"epoll_ctl"	}, /* 255 */

linux/syscallent.h +1 -1

-@@ -130,7 +130,10 @@
+@@ -130,7 +130,11 @@
 	{ 2,	TF,	sys_statfs,		"statfs"	}, /* 99 */

linux/syscallent.h

Quoted 10 lines

linux/syscallent.h +5 -3

 	{ 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?

Quoted 6 lines

linux/syscallent.h +1 -1

 	{ 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 */

linux/syscallent.h

Quoted 10 lines

linux/syscallent.h +5 -3

 	{ 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?

Quoted 3 lines

linux/syscallent.h +0 -0

 	{ 1,	TD,	sys_fsync,		"fsync"		}, /* 118 */
 	{ 1,	TS,	sys_sigreturn,		"sigreturn"	}, /* 119 */
 	{ 5,	TP,	sys_clone,		"clone", SYS_clone }, /* 120 */

Bernhard Fischer

2007-09-20 14:48 UTC #4 lore raw

PATCH 1/1 make strace buildable

Quoted 11 lines · Bernhard Fischer

Yann,

Review

Quoted 9 lines

(quoted diff) +5 -3

 	{ 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 */

----------------------------------------------------------------^

It's right here on the far right. Everything is fine, sorry for the noise..

Quoted 5 lines

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?

Yann E. MORIN

author

2007-09-20 16:34 UTC #5 lore raw

PATCH 1/1 make strace buildable

Bernhard,

Quoted 5 lines · On Thursday 20 September 2007 16:48:44 Bernhard Fischer wrote:

Quoted 1 line · Bernhard Fischer
Quoted 1 line
++ }, /* 102 */
----------------------------------------------------------------^ It's right here on the far right. Everything is fine, sorry for the noise..

No problem... It also took me two minutes to find it again! ;-)

Regards,
Yann E. MORIN.

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  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.  |
?------------------------------?-------?------------------?--------------------?