| Elliott Hughes | 15fc6a2 | 2014-01-09 10:30:06 -0800 | [diff] [blame] | 1 | diff -r -u -d /home/enh/Downloads/strace-4.8/defs.h ./defs.h |
| 2 | --- /home/enh/Downloads/strace-4.8/defs.h 2013-05-14 07:10:42.000000000 -0700 |
| Elliott Hughes | 02f3b9b | 2014-01-10 15:44:16 -0800 | [diff] [blame] | 3 | +++ ./defs.h 2014-01-09 14:34:13.520344153 -0800 |
| Elliott Hughes | 15fc6a2 | 2014-01-09 10:30:06 -0800 | [diff] [blame] | 4 | @@ -222,7 +222,7 @@ |
| 5 | # define PTRACE_EVENT_EXIT 6 |
| Elliott Hughes | 10bd42d | 2014-01-08 16:34:09 -0800 | [diff] [blame] | 6 | #endif |
| Jeff Brown | f76f96e | 2012-03-02 16:23:23 -0800 | [diff] [blame] | 7 | |
| Elliott Hughes | 10bd42d | 2014-01-08 16:34:09 -0800 | [diff] [blame] | 8 | -#if !defined(__GLIBC__) |
| 9 | +#if !defined(__GLIBC__) && !defined(__BIONIC__) |
| 10 | # define PTRACE_PEEKUSER PTRACE_PEEKUSR |
| 11 | # define PTRACE_POKEUSER PTRACE_POKEUSR |
| 12 | #endif |
| Elliott Hughes | 15fc6a2 | 2014-01-09 10:30:06 -0800 | [diff] [blame] | 13 | diff -r -u -d /home/enh/Downloads/strace-4.8/ioctl.c ./ioctl.c |
| 14 | --- /home/enh/Downloads/strace-4.8/ioctl.c 2013-05-02 15:50:55.000000000 -0700 |
| Elliott Hughes | 02f3b9b | 2014-01-10 15:44:16 -0800 | [diff] [blame] | 15 | +++ ./ioctl.c 2014-01-08 17:40:04.763917183 -0800 |
| Elliott Hughes | bb0c2d5 | 2014-01-07 17:34:14 -0800 | [diff] [blame] | 16 | @@ -86,8 +86,10 @@ |
| Jeff Brown | f76f96e | 2012-03-02 16:23:23 -0800 | [diff] [blame] | 17 | case 0x03: |
| 18 | case 0x12: |
| 19 | return block_ioctl(tcp, code, arg); |
| 20 | +#ifndef HAVE_ANDROID_OS |
| 21 | case 0x22: |
| 22 | return scsi_ioctl(tcp, code, arg); |
| Jeff Brown | f76f96e | 2012-03-02 16:23:23 -0800 | [diff] [blame] | 23 | +#endif |
| Elliott Hughes | bb0c2d5 | 2014-01-07 17:34:14 -0800 | [diff] [blame] | 24 | case 'L': |
| 25 | return loop_ioctl(tcp, code, arg); |
| 26 | case 'M': |
| Elliott Hughes | 15fc6a2 | 2014-01-09 10:30:06 -0800 | [diff] [blame] | 27 | diff -r -u -d /home/enh/Downloads/strace-4.8/util.c ./util.c |
| 28 | --- /home/enh/Downloads/strace-4.8/util.c 2013-05-06 11:23:01.000000000 -0700 |
| Elliott Hughes | 02f3b9b | 2014-01-10 15:44:16 -0800 | [diff] [blame] | 29 | +++ ./util.c 2014-01-08 17:40:04.803916706 -0800 |
| Elliott Hughes | 15fc6a2 | 2014-01-09 10:30:06 -0800 | [diff] [blame] | 30 | @@ -46,7 +46,9 @@ |
| Elliott Hughes | 10bd42d | 2014-01-08 16:34:09 -0800 | [diff] [blame] | 31 | |
| 32 | #ifdef HAVE_SYS_REG_H |
| 33 | # include <sys/reg.h> |
| 34 | -# define PTRACE_PEEKUSR PTRACE_PEEKUSER |
| 35 | +# ifndef PTRACE_PEEKUSR |
| 36 | +# define PTRACE_PEEKUSR PTRACE_PEEKUSER |
| 37 | +# endif |
| 38 | #elif defined(HAVE_LINUX_PTRACE_H) |
| 39 | # undef PTRACE_SYSCALL |
| 40 | # ifdef HAVE_STRUCT_IA64_FPREG |