| 1 |
vapier 08/06/29 14:28:36 |
| 2 |
|
| 3 |
Added: strace-4.5.16-sparc-fix.patch |
| 4 |
strace-4.5.16-sparc-socketipc.patch |
| 5 |
Log: |
| 6 |
Fix building on sparc with patches from Fedora #229229. |
| 7 |
(Portage version: 2.2_rc1/cvs/Linux 2.6.25 x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-util/strace/files/strace-4.5.16-sparc-fix.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/strace/files/strace-4.5.16-sparc-fix.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/strace/files/strace-4.5.16-sparc-fix.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: strace-4.5.16-sparc-fix.patch |
| 16 |
=================================================================== |
| 17 |
ripped from fedora and hacked a bit |
| 18 |
|
| 19 |
http://bugs.gentoo.org/229229 |
| 20 |
|
| 21 |
diff -up strace-4.5.16/linux/sparc/syscallent.h.BAD strace-4.5.16/linux/sparc/syscallent.h |
| 22 |
--- strace-4.5.16/linux/sparc/syscallent.h.BAD 2008-03-26 10:09:47.000000000 -0500 |
| 23 |
+++ strace-4.5.16/linux/sparc/syscallent.h 2008-03-26 11:43:34.000000000 -0500 |
| 24 |
@@ -23,7 +23,7 @@ |
| 25 |
{ 2, 0, sys_capset, "capset" }, /* 22 */ |
| 26 |
{ 1, 0, sys_setuid, "setuid" }, /* 23 */ |
| 27 |
{ 0, 0, sys_getuid, "getuid" }, /* 24 */ |
| 28 |
- { 1, 0, sys_time, "time" }, /* 25 */ |
| 29 |
+ { 1, 0, printargs, "vmsplice" }, /* 25 */ |
| 30 |
{ 5, 0, sys_ptrace, "ptrace" }, /* 26 */ |
| 31 |
{ 1, 0, sys_alarm, "alarm" }, /* 27 */ |
| 32 |
{ 2, TS, sys_sigaltstack,"sigaltstack" }, /* 28 */ |
| 33 |
@@ -65,8 +65,8 @@ |
| 34 |
{ 0, 0, sys_getpagesize,"getpagesize" }, /* 64 */ |
| 35 |
{ 3, 0, sys_msync, "msync" }, /* 65 */ |
| 36 |
{ 0, TP, sys_vfork, "vfork" }, /* 66 */ |
| 37 |
- { 5, TD, sys_pread, "pread" }, /* 67 */ |
| 38 |
- { 5, TD, sys_pwrite, "pwrite" }, /* 68 */ |
| 39 |
+ { 5, TD, sys_pread, "pread64" }, /* 67 */ |
| 40 |
+ { 5, TD, sys_pwrite, "pwrite64" }, /* 68 */ |
| 41 |
{ 0, 0, sys_geteuid, "geteuid32" }, /* 69 */ |
| 42 |
{ 0, 0, sys_getegid, "getegid32" }, /* 70 */ |
| 43 |
{ 6, 0, sys_mmap, "mmap" }, /* 71 */ |
| 44 |
@@ -149,12 +149,12 @@ |
| 45 |
{ 5, 0, printargs, "pciconfig_read" }, /* 148 */ |
| 46 |
{ 5, 0, printargs, "pciconfig_write" }, /* 149 */ |
| 47 |
{ 3, TN, sys_getsockname,"getsockname" }, /* 150 */ |
| 48 |
- { 4, TN, sys_getmsg, "getmsg" }, /* 151 */ |
| 49 |
- { 4, TN, sys_putmsg, "putmsg" }, /* 152 */ |
| 50 |
+ { 0, TD, printargs, "inotify_init" }, /* 151 */ |
| 51 |
+ { 3, TD, sys_inotify_add_watch, "inotify_add_watch" },/* 152 */ |
| 52 |
{ 3, TD, sys_poll, "poll" }, /* 153 */ |
| 53 |
{ 4, TD, sys_getdents64, "getdents64" }, /* 154 */ |
| 54 |
{ 3, TD, sys_fcntl, "fcntl64" }, /* 155 */ |
| 55 |
- { 4, 0, printargs, "getdirentries" }, /* 156 */ |
| 56 |
+ { 2, TD, sys_inotify_rm_watch, "inotify_rm_watch" },/* 156 */ |
| 57 |
{ 2, TF, sys_statfs, "statfs" }, /* 157 */ |
| 58 |
{ 2, TD, sys_fstatfs, "fstatfs" }, /* 158 */ |
| 59 |
{ 1, TF, sys_umount, "oldumount" }, /* 159 */ |
| 60 |
@@ -194,13 +194,13 @@ |
| 61 |
{ 1, 0, sys_epoll_create,"epoll_create" }, /* 193 */ |
| 62 |
{ 4, TD, sys_epoll_ctl, "epoll_ctl" }, /* 194 */ |
| 63 |
{ 4, TD, sys_epoll_wait, "epoll_wait" }, /* 195 */ |
| 64 |
- { 2, 0, sys_ulimit, "ulimit" }, /* 196 */ |
| 65 |
+ { 3, 0, printargs, "ioprio_set"}, /* 196 */ |
| 66 |
{ 0, 0, sys_getppid, "getppid" }, /* 197 */ |
| 67 |
{ 3, TS, sys_sigaction, "sigaction" }, /* 198 */ |
| 68 |
{ 5, 0, printargs, "sgetmask" }, /* 199 */ |
| 69 |
{ 5, 0, printargs, "ssetmask" }, /* 200 */ |
| 70 |
{ 3, TS, sys_sigsuspend, "sigsuspend" }, /* 201 */ |
| 71 |
- { 2, TF, sys_lstat, "lstat" }, /* 202 */ |
| 72 |
+ { 2, TF, sys_oldlstat, "oldlstat" }, /* 202 */ |
| 73 |
{ 1, TF, sys_uselib, "uselib" }, /* 203 */ |
| 74 |
{ 3, TD, sys_readdir, "readdir" }, /* 204 */ |
| 75 |
{ 4, TD, sys_readahead, "readahead" }, /* 205 */ |
| 76 |
@@ -216,7 +216,7 @@ |
| 77 |
{ 5, 0, sys_ipc, "ipc" }, /* 215 */ |
| 78 |
{ 1, TS, sys_sigreturn, "sigreturn" }, /* 216 */ |
| 79 |
{ 5, TP, sys_clone, "clone" }, /* 217 */ |
| 80 |
- { 3, 0, sys_modify_ldt, "modify_ldt" }, /* 218 */ |
| 81 |
+ { 2, 0, printargs, "ioprio_get" }, /* 218 */ |
| 82 |
{ 1, 0, sys_adjtimex, "adjtimex" }, /* 219 */ |
| 83 |
{ 3, TS, sys_sigprocmask,"sigprocmask" }, /* 220 */ |
| 84 |
{ 2, 0, sys_create_module,"create_module" }, /* 221 */ |
| 85 |
@@ -228,9 +228,9 @@ |
| 86 |
{ 5, 0, sys_afs_syscall,"afs_syscall" }, /* 227 */ |
| 87 |
{ 1, 0, sys_setfsuid, "setfsuid" }, /* 228 */ |
| 88 |
{ 1, 0, sys_setfsgid, "setfsgid" }, /* 229 */ |
| 89 |
- { 5, TD, sys_select, "select" }, /* 230 */ |
| 90 |
+ { 5, TD, sys_select, "_newselect" }, /* 230 */ |
| 91 |
{ 1, 0, sys_time, "time" }, /* 231 */ |
| 92 |
- { 2, TF, sys_stat, "stat" }, /* 232 */ |
| 93 |
+ { 6, TD, printargs, "splice" }, /* 232 */ |
| 94 |
{ 1, 0, sys_stime, "stime" }, /* 233 */ |
| 95 |
{ 3, TF, sys_statfs64, "statfs64" }, /* 234 */ |
| 96 |
{ 3, TD, sys_fstatfs64, "fstatfs64" }, /* 235 */ |
| 97 |
@@ -253,7 +253,7 @@ |
| 98 |
{ 1, 0, sys_getsid, "getsid" }, /* 252 */ |
| 99 |
{ 1, TD, sys_fdatasync, "fdatasync" }, /* 253 */ |
| 100 |
{ 3, 0, printargs, "nfsservctl" }, /* 254 */ |
| 101 |
- { 5, 0, printargs, "aplib" }, /* 255 */ |
| 102 |
+ { 4, TD, printargs, "sync_file_range" }, /* 255 */ |
| 103 |
{ 2, 0, sys_clock_settime,"clock_settime" }, /* 256 */ |
| 104 |
{ 2, 0, sys_clock_gettime,"clock_gettime" }, /* 257 */ |
| 105 |
{ 2, 0, sys_clock_getres,"clock_getres" }, /* 258 */ |
| 106 |
@@ -300,18 +300,18 @@ |
| 107 |
{ 1, TP, sys_unshare, "unshare" }, /* 299 */ |
| 108 |
{ 2, 0, printargs, "set_robust_list" }, /* 300 */ |
| 109 |
{ 3, 0, printargs, "get_robust_list" }, /* 301 */ |
| 110 |
- { 5, 0, printargs, "SYS_302" }, /* 302 */ |
| 111 |
- { 5, 0, printargs, "SYS_303" }, /* 303 */ |
| 112 |
- { 5, 0, printargs, "SYS_304" }, /* 304 */ |
| 113 |
- { 5, 0, printargs, "SYS_305" }, /* 305 */ |
| 114 |
- { 5, 0, printargs, "SYS_306" }, /* 306 */ |
| 115 |
- { 6, 0, sys_move_pages, "move_pages" }, /* 307 */ |
| 116 |
- { 3, 0, sys_getcpu, "getcpu" }, /* 308 */ |
| 117 |
- { 5, TD, sys_epoll_pwait,"epoll_pwait" }, /* 309 */ |
| 118 |
- { 5, 0, printargs, "SYS_310" }, /* 310 */ |
| 119 |
- { 3, TD|TS, sys_signalfd, "signalfd"}, /* 311 */ |
| 120 |
- { 4, TD, sys_timerfd, "timerfd" }, /* 312 */ |
| 121 |
- { 1, TD, sys_eventfd, "eventfd" }, /* 313 */ |
| 122 |
+ { 4, 0, printargs, "migrate_pages" }, /* 302 */ |
| 123 |
+ { 6, 0, sys_mbind, "mbind" }, /* 303 */ |
| 124 |
+ { 5, 0, sys_get_mempolicy, "get_mempolicy" }, /* 304 */ |
| 125 |
+ { 3, 0, sys_set_mempolicy, "set_mempolicy" }, /* 305 */ |
| 126 |
+ { 5, 0, printargs, "kexec_load" }, /* 306 */ |
| 127 |
+ { 6, 0, sys_move_pages, "move_pages" }, /* 307 */ |
| 128 |
+ { 3, 0, sys_getcpu, "getcpu" }, /* 308 */ |
| 129 |
+ { 5, TD, sys_epoll_pwait, "epoll_pwait" },/* 309 */ |
| 130 |
+ { 4, TD|TF, sys_utimensat, "utimensat"}, /* 310 */ |
| 131 |
+ { 3, TD|TS, sys_signalfd, "signalfd"}, /* 311 */ |
| 132 |
+ { 4, TD, sys_timerfd, "timerfd" }, /* 312 */ |
| 133 |
+ { 1, TD, sys_eventfd, "eventfd" }, /* 313 */ |
| 134 |
{ 5, 0, printargs, "SYS_314" }, /* 314 */ |
| 135 |
{ 5, 0, printargs, "SYS_315" }, /* 315 */ |
| 136 |
{ 5, 0, printargs, "SYS_316" }, /* 316 */ |
| 137 |
diff -up strace-4.5.16/linux/sparc/syscall.h.BAD strace-4.5.16/linux/sparc/syscall.h |
| 138 |
--- strace-4.5.16/linux/sparc/syscall.h.BAD 2008-03-26 12:00:19.000000000 -0500 |
| 139 |
+++ strace-4.5.16/linux/sparc/syscall.h 2008-03-26 12:00:07.000000000 -0500 |
| 140 |
@@ -203,6 +203,9 @@ int sys_fstatfs64(), sys_clock_settime() |
| 141 |
int sys_clock_getres(), sys_clock_nanosleep(); |
| 142 |
int sys_timer_create(), sys_timer_settime(), sys_timer_gettime(); |
| 143 |
|
| 144 |
+int sys_inotify_add_watch(), sys_inotify_rm_watch(), sys_oldlstat(); |
| 145 |
+int sys_mbind(), sys_get_mempolicy(), sys_set_mempolicy(); |
| 146 |
+int sys_utimensat(); |
| 147 |
int sys_io_setup(), sys_io_destroy(), sys_io_submit(), sys_io_cancel(), sys_io_getevents(); |
| 148 |
int sys_mq_open(), sys_mq_unlink(), sys_mq_timedsend(), sys_mq_timedreceive(), sys_mq_notify(), sys_mq_getsetattr(); |
| 149 |
int sys_waitid(); |
| 150 |
diff -up strace-4.5.16/defs.h.BAD strace-4.5.16/defs.h |
| 151 |
--- strace-4.5.16/defs.h.BAD 2008-03-26 11:49:08.000000000 -0500 |
| 152 |
+++ strace-4.5.16/defs.h 2008-03-26 11:49:30.000000000 -0500 |
| 153 |
@@ -192,8 +192,7 @@ extern int ptrace(); |
| 154 |
#define DEFAULT_PERSONALITY 0 |
| 155 |
|
| 156 |
#ifdef LINUXSPARC |
| 157 |
-#include <linux/a.out.h> |
| 158 |
-#include <asm/psr.h> |
| 159 |
+#include <asm/a.out.h> |
| 160 |
#define PERSONALITY0_WORDSIZE 4 |
| 161 |
#define PERSONALITY1_WORDSIZE 4 |
| 162 |
#undef SUPPORTED_PERSONALITIES |
| 163 |
@@ -201,6 +200,7 @@ extern int ptrace(); |
| 164 |
#define SUPPORTED_PERSONALITIES 3 |
| 165 |
#define PERSONALITY2_WORDSIZE 8 |
| 166 |
#else |
| 167 |
+#include <asm/psr.h> |
| 168 |
#define SUPPORTED_PERSONALITIES 2 |
| 169 |
#endif /* SPARC64 */ |
| 170 |
#endif /* LINUXSPARC */ |
| 171 |
|
| 172 |
|
| 173 |
|
| 174 |
1.1 dev-util/strace/files/strace-4.5.16-sparc-socketipc.patch |
| 175 |
|
| 176 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/strace/files/strace-4.5.16-sparc-socketipc.patch?rev=1.1&view=markup |
| 177 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/strace/files/strace-4.5.16-sparc-socketipc.patch?rev=1.1&content-type=text/plain |
| 178 |
|
| 179 |
Index: strace-4.5.16-sparc-socketipc.patch |
| 180 |
=================================================================== |
| 181 |
ripped from fedora and hacked a bit |
| 182 |
|
| 183 |
http://bugs.gentoo.org/229229 |
| 184 |
|
| 185 |
diff -up strace-4.5.16/linux/sparc/syscallent.h.BAD strace-4.5.16/linux/sparc/syscallent.h |
| 186 |
--- strace-4.5.16/linux/sparc/syscallent.h.BAD 2008-05-15 16:06:36.000000000 -0500 |
| 187 |
+++ strace-4.5.16/linux/sparc/syscallent.h 2008-05-15 18:21:01.000000000 -0500 |
| 188 |
@@ -351,3 +351,57 @@ |
| 189 |
{ 5, 0, printargs, "SYS_350" }, /* 350 */ |
| 190 |
{ 5, 0, printargs, "SYS_351" }, /* 351 */ |
| 191 |
{ 5, 0, printargs, "SYS_352" }, /* 352 */ |
| 192 |
+#if SYS_socket_subcall != 353 |
| 193 |
+ #error fix me |
| 194 |
+#endif |
| 195 |
+ { 8, 0, printargs, "socket_subcall" }, /* 353 */ |
| 196 |
+ { 3, TN, sys_socket, "socket" }, /* 354 */ |
| 197 |
+ { 3, TN, sys_bind, "bind" }, /* 355 */ |
| 198 |
+ { 3, TN, sys_connect, "connect" }, /* 356 */ |
| 199 |
+ { 2, TN, sys_listen, "listen" }, /* 357 */ |
| 200 |
+ { 3, TN, sys_accept, "accept" }, /* 358 */ |
| 201 |
+ { 3, TN, sys_getsockname, "getsockname" }, /* 359 */ |
| 202 |
+ { 3, TN, sys_getpeername, "getpeername" }, /* 360 */ |
| 203 |
+ { 4, TN, sys_socketpair, "socketpair" }, /* 361 */ |
| 204 |
+ { 4, TN, sys_send, "send" }, /* 362 */ |
| 205 |
+ { 4, TN, sys_recv, "recv" }, /* 363 */ |
| 206 |
+ { 6, TN, sys_sendto, "sendto" }, /* 364 */ |
| 207 |
+ { 6, TN, sys_recvfrom, "recvfrom" }, /* 365 */ |
| 208 |
+ { 2, TN, sys_shutdown, "shutdown" }, /* 366 */ |
| 209 |
+ { 5, TN, sys_setsockopt, "setsockopt" }, /* 367 */ |
| 210 |
+ { 5, TN, sys_getsockopt, "getsockopt" }, /* 368 */ |
| 211 |
+ { 5, TN, sys_sendmsg, "sendmsg" }, /* 369 */ |
| 212 |
+ { 5, TN, sys_recvmsg, "recvmsg" }, /* 370 */ |
| 213 |
+#if SYS_ipc_subcall != 371 |
| 214 |
+ #error fix me |
| 215 |
+#endif |
| 216 |
+ { 4, 0, printargs, "ipc_subcall" }, /* 371 */ |
| 217 |
+ { 4, TI, printargs, "semop" }, /* 372 */ |
| 218 |
+ { 4, TI, sys_semget, "semget" }, /* 373 */ |
| 219 |
+ { 4, TI, sys_semctl, "semctl" }, /* 374 */ |
| 220 |
+ { 5, TI, sys_semtimedop, "semtimedop" }, /* 375 */ |
| 221 |
+ { 4, 0, printargs, "ipc_subcall" }, /* 376 */ |
| 222 |
+ { 4, 0, printargs, "ipc_subcall" }, /* 377 */ |
| 223 |
+ { 4, 0, printargs, "ipc_subcall" }, /* 378 */ |
| 224 |
+ { 4, 0, printargs, "ipc_subcall" }, /* 379 */ |
| 225 |
+ { 4, 0, printargs, "ipc_subcall" }, /* 380 */ |
| 226 |
+ { 4, 0, printargs, "ipc_subcall" }, /* 381 */ |
| 227 |
+ { 4, TI, sys_msgsnd, "msgsnd" }, /* 382 */ |
| 228 |
+ { 4, TI, sys_msgrcv, "msgrcv" }, /* 383 */ |
| 229 |
+ { 4, TI, sys_msgget, "msgget" }, /* 384 */ |
| 230 |
+ { 4, TI, sys_msgctl, "msgctl" }, /* 385 */ |
| 231 |
+ { 4, 0, printargs, "ipc_subcall" }, /* 386 */ |
| 232 |
+ { 4, 0, printargs, "ipc_subcall" }, /* 387 */ |
| 233 |
+ { 4, 0, printargs, "ipc_subcall" }, /* 388 */ |
| 234 |
+ { 4, 0, printargs, "ipc_subcall" }, /* 389 */ |
| 235 |
+ { 4, 0, printargs, "ipc_subcall" }, /* 390 */ |
| 236 |
+ { 4, 0, printargs, "ipc_subcall" }, /* 391 */ |
| 237 |
+ { 4, TI, sys_shmat, "shmat" }, /* 392 */ |
| 238 |
+ { 4, TI, sys_shmdt, "shmdt" }, /* 393 */ |
| 239 |
+ { 4, TI, sys_shmget, "shmget" }, /* 394 */ |
| 240 |
+ { 4, TI, sys_shmctl, "shmctl" }, /* 395 */ |
| 241 |
+ { 5, 0, printargs, "SYS_343" }, /* 396 */ |
| 242 |
+ { 5, 0, printargs, "SYS_344" }, /* 397 */ |
| 243 |
+ { 5, 0, printargs, "SYS_345" }, /* 398 */ |
| 244 |
+ { 5, 0, printargs, "SYS_346" }, /* 399 */ |
| 245 |
+ { 5, 0, printargs, "SYS_347" }, /* 400 */ |
| 246 |
diff -up strace-4.5.16/linux/sparc/syscall.h.BAD strace-4.5.16/linux/sparc/syscall.h |
| 247 |
--- strace-4.5.16/linux/sparc/syscall.h.BAD 2008-05-15 16:02:07.000000000 -0500 |
| 248 |
+++ strace-4.5.16/linux/sparc/syscall.h 2008-05-15 16:06:03.000000000 -0500 |
| 249 |
@@ -213,4 +214,42 @@ int sys_fstatfs64(), sys_clock_settime() |
| 250 |
int sys_clock_getres(), sys_clock_nanosleep(); |
| 251 |
int sys_timer_create(), sys_timer_settime(), sys_timer_gettime(); |
| 252 |
|
| 253 |
+int sys_semtimedop(); |
| 254 |
+# define SYS_socket_subcall 353 |
| 255 |
+#define SYS_sub_socket (SYS_socket_subcall + 1) |
| 256 |
+#define SYS_sub_bind (SYS_socket_subcall + 2) |
| 257 |
+#define SYS_sub_connect (SYS_socket_subcall + 3) |
| 258 |
+#define SYS_sub_listen (SYS_socket_subcall + 4) |
| 259 |
+#define SYS_sub_accept (SYS_socket_subcall + 5) |
| 260 |
+#define SYS_sub_getsockname (SYS_socket_subcall + 6) |
| 261 |
+#define SYS_sub_getpeername (SYS_socket_subcall + 7) |
| 262 |
+#define SYS_sub_socketpair (SYS_socket_subcall + 8) |
| 263 |
+#define SYS_sub_send (SYS_socket_subcall + 9) |
| 264 |
+#define SYS_sub_recv (SYS_socket_subcall + 10) |
| 265 |
+#define SYS_sub_sendto (SYS_socket_subcall + 11) |
| 266 |
+#define SYS_sub_recvfrom (SYS_socket_subcall + 12) |
| 267 |
+#define SYS_sub_shutdown (SYS_socket_subcall + 13) |
| 268 |
+#define SYS_sub_setsockopt (SYS_socket_subcall + 14) |
| 269 |
+#define SYS_sub_getsockopt (SYS_socket_subcall + 15) |
| 270 |
+#define SYS_sub_sendmsg (SYS_socket_subcall + 16) |
| 271 |
+#define SYS_sub_recvmsg (SYS_socket_subcall + 17) |
| 272 |
+ |
| 273 |
+#define SYS_socket_nsubcalls 18 |
| 274 |
+ |
| 275 |
+#define SYS_ipc_subcall ((SYS_socket_subcall)+(SYS_socket_nsubcalls)) |
| 276 |
+#define SYS_sub_semop (SYS_ipc_subcall + 1) |
| 277 |
+#define SYS_sub_semget (SYS_ipc_subcall + 2) |
| 278 |
+#define SYS_sub_semctl (SYS_ipc_subcall + 3) |
| 279 |
+#define SYS_sub_semtimedop (SYS_ipc_subcall + 4) |
| 280 |
+#define SYS_sub_msgsnd (SYS_ipc_subcall + 11) |
| 281 |
+#define SYS_sub_msgrcv (SYS_ipc_subcall + 12) |
| 282 |
+#define SYS_sub_msgget (SYS_ipc_subcall + 13) |
| 283 |
+#define SYS_sub_msgctl (SYS_ipc_subcall + 14) |
| 284 |
+#define SYS_sub_shmat (SYS_ipc_subcall + 21) |
| 285 |
+#define SYS_sub_shmdt (SYS_ipc_subcall + 22) |
| 286 |
+#define SYS_sub_shmget (SYS_ipc_subcall + 23) |
| 287 |
+#define SYS_sub_shmctl (SYS_ipc_subcall + 24) |
| 288 |
+ |
| 289 |
+#define SYS_ipc_nsubcalls 25 |
| 290 |
+ |
| 291 |
#include "syscall1.h" |
| 292 |
diff -up strace-4.5.16/syscall.c.BAD strace-4.5.16/syscall.c |
| 293 |
--- strace-4.5.16/syscall.c.BAD 2008-05-15 16:01:49.000000000 -0500 |
| 294 |
+++ strace-4.5.16/syscall.c 2008-05-15 16:01:53.000000000 -0500 |
| 295 |
@@ -579,51 +579,6 @@ static const struct subcall subcalls_tab |
| 296 |
#endif /* FREEBSD */ |
| 297 |
|
| 298 |
#if !(defined(LINUX) && ( defined(ALPHA) || defined(MIPS) )) |
| 299 |
- |
| 300 |
-static const int socket_map [] = { |
| 301 |
- /* SYS_SOCKET */ 97, |
| 302 |
- /* SYS_BIND */ 104, |
| 303 |
- /* SYS_CONNECT */ 98, |
| 304 |
- /* SYS_LISTEN */ 106, |
| 305 |
- /* SYS_ACCEPT */ 99, |
| 306 |
- /* SYS_GETSOCKNAME */ 150, |
| 307 |
- /* SYS_GETPEERNAME */ 141, |
| 308 |
- /* SYS_SOCKETPAIR */ 135, |
| 309 |
- /* SYS_SEND */ 101, |
| 310 |
- /* SYS_RECV */ 102, |
| 311 |
- /* SYS_SENDTO */ 133, |
| 312 |
- /* SYS_RECVFROM */ 125, |
| 313 |
- /* SYS_SHUTDOWN */ 134, |
| 314 |
- /* SYS_SETSOCKOPT */ 105, |
| 315 |
- /* SYS_GETSOCKOPT */ 118, |
| 316 |
- /* SYS_SENDMSG */ 114, |
| 317 |
- /* SYS_RECVMSG */ 113 |
| 318 |
-}; |
| 319 |
- |
| 320 |
-#if defined (SPARC) || defined (SPARC64) |
| 321 |
-static void |
| 322 |
-sparc_socket_decode (tcp) |
| 323 |
-struct tcb *tcp; |
| 324 |
-{ |
| 325 |
- volatile long addr; |
| 326 |
- volatile int i, n; |
| 327 |
- |
| 328 |
- if (tcp->u_arg [0] < 1 || tcp->u_arg [0] > sizeof(socket_map)/sizeof(int)+1){ |
| 329 |
- return; |
| 330 |
- } |
| 331 |
- tcp->scno = socket_map [tcp->u_arg [0]-1]; |
| 332 |
- n = tcp->u_nargs = sysent [tcp->scno].nargs; |
| 333 |
- addr = tcp->u_arg [1]; |
| 334 |
- for (i = 0; i < n; i++){ |
| 335 |
- int arg; |
| 336 |
- if (umoven (tcp, addr, sizeof (arg), (void *) &arg) < 0) |
| 337 |
- arg = 0; |
| 338 |
- tcp->u_arg [i] = arg; |
| 339 |
- addr += sizeof (arg); |
| 340 |
- } |
| 341 |
-} |
| 342 |
-#endif |
| 343 |
- |
| 344 |
static void |
| 345 |
decode_subcall(tcp, subcall, nsubcalls, style) |
| 346 |
struct tcb *tcp; |
| 347 |
@@ -2382,7 +2337,7 @@ trace_syscall(struct tcb *tcp) |
| 348 |
|
| 349 |
switch (known_scno(tcp)) { |
| 350 |
#ifdef LINUX |
| 351 |
-#if !defined (ALPHA) && !defined(SPARC) && !defined(SPARC64) && !defined(MIPS) && !defined(HPPA) |
| 352 |
+#if !defined (ALPHA) && !defined(MIPS) && !defined(HPPA) |
| 353 |
case SYS_socketcall: |
| 354 |
decode_subcall(tcp, SYS_socket_subcall, |
| 355 |
SYS_socket_nsubcalls, deref_style); |
| 356 |
@@ -2391,12 +2346,7 @@ trace_syscall(struct tcb *tcp) |
| 357 |
decode_subcall(tcp, SYS_ipc_subcall, |
| 358 |
SYS_ipc_nsubcalls, shift_style); |
| 359 |
break; |
| 360 |
-#endif /* !ALPHA && !MIPS && !SPARC && !SPARC64 && !HPPA */ |
| 361 |
-#if defined (SPARC) || defined (SPARC64) |
| 362 |
- case SYS_socketcall: |
| 363 |
- sparc_socket_decode (tcp); |
| 364 |
- break; |
| 365 |
-#endif |
| 366 |
+#endif /* !(ALPHA || MIPS || HPPA) */ |
| 367 |
#endif /* LINUX */ |
| 368 |
#ifdef SVR4 |
| 369 |
#ifdef SYS_pgrpsys_subcall |
| 370 |
|
| 371 |
|
| 372 |
|
| 373 |
-- |
| 374 |
gentoo-commits@l.g.o mailing list |
Archives