Gitiles
Code Review Sign In
gerrit-public.fairphone.software / fp2-dev / platform / external / strace / 4ee743a040fc20663de1490e46dba003e25aee32 / . / Android.patch
blob: e6c9f2100167c27e41a00848dc3ccf93505e6312 [file] [log] [blame]
Elliott Hughes15fc6a22014-01-09 10:30:06 -0800[diff] [blame]1diff -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
3+++ ./defs.h 2014-01-09 13:41:19.118883996 -0800
4@@ -222,7 +222,7 @@
5 # define PTRACE_EVENT_EXIT 6
Elliott Hughes10bd42d2014-01-08 16:34:09 -0800[diff] [blame]6 #endif
Jeff Brownf76f96e2012-03-02 16:23:23 -0800[diff] [blame]7
Elliott Hughes10bd42d2014-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 Hughes15fc6a22014-01-09 10:30:06 -0800[diff] [blame]13diff -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
15+++ ./ioctl.c 2014-01-09 13:36:50.612156623 -0800
Elliott Hughesbb0c2d52014-01-07 17:34:14 -0800[diff] [blame]16@@ -86,8 +86,10 @@
Jeff Brownf76f96e2012-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 Brownf76f96e2012-03-02 16:23:23 -0800[diff] [blame]23+#endif
Elliott Hughesbb0c2d52014-01-07 17:34:14 -0800[diff] [blame]24 case 'L':
25 return loop_ioctl(tcp, code, arg);
26 case 'M':
Elliott Hughes15fc6a22014-01-09 10:30:06 -0800[diff] [blame]27diff -r -u -d /home/enh/Downloads/strace-4.8/ipc.c ./ipc.c
28--- /home/enh/Downloads/strace-4.8/ipc.c 2013-02-23 11:07:44.000000000 -0800
29+++ ./ipc.c 2014-01-09 13:36:50.612156623 -0800
Elliott Hughesbb0c2d52014-01-07 17:34:14 -0800[diff] [blame]30@@ -34,9 +34,15 @@
31 #endif
Jeff Brownf76f96e2012-03-02 16:23:23 -0800[diff] [blame]32 #include <fcntl.h>
33 #include <sys/ipc.h>
34+#ifdef HAVE_ANDROID_OS
35+#include <linux/sem.h>
36+#include <linux/msg.h>
37+#include <linux/shm.h>
38+#else
39 #include <sys/sem.h>
40 #include <sys/msg.h>
41 #include <sys/shm.h>
42+#endif
43
44 #ifndef MSG_STAT
45 #define MSG_STAT 11
Elliott Hughes15fc6a22014-01-09 10:30:06 -0800[diff] [blame]46diff -r -u -d /home/enh/Downloads/strace-4.8/time.c ./time.c
47--- /home/enh/Downloads/strace-4.8/time.c 2012-05-01 14:17:51.000000000 -0700
48+++ ./time.c 2014-01-09 12:41:29.912928183 -0800
Elliott Hughesbb0c2d52014-01-07 17:34:14 -0800[diff] [blame]49@@ -29,7 +29,11 @@
Jeff Brownf76f96e2012-03-02 16:23:23 -0800[diff] [blame]50
51 #include "defs.h"
Jeff Brownf76f96e2012-03-02 16:23:23 -0800[diff] [blame]52 #include <linux/version.h>
Elliott Hughesbb0c2d52014-01-07 17:34:14 -0800[diff] [blame]53+#if HAVE_ANDROID_OS
Jeff Brownf76f96e2012-03-02 16:23:23 -0800[diff] [blame]54+#include <linux/timex.h>
55+#else
56 #include <sys/timex.h>
57+#endif
58 #include <linux/ioctl.h>
59 #include <linux/rtc.h>
60
Elliott Hughes15fc6a22014-01-09 10:30:06 -0800[diff] [blame]61diff -r -u -d /home/enh/Downloads/strace-4.8/util.c ./util.c
62--- /home/enh/Downloads/strace-4.8/util.c 2013-05-06 11:23:01.000000000 -0700
63+++ ./util.c 2014-01-09 13:36:50.622156503 -0800
64@@ -46,7 +46,9 @@
Elliott Hughes10bd42d2014-01-08 16:34:09 -0800[diff] [blame]65
66 #ifdef HAVE_SYS_REG_H
67 # include <sys/reg.h>
68-# define PTRACE_PEEKUSR PTRACE_PEEKUSER
69+# ifndef PTRACE_PEEKUSR
70+# define PTRACE_PEEKUSR PTRACE_PEEKUSER
71+# endif
72 #elif defined(HAVE_LINUX_PTRACE_H)
73 # undef PTRACE_SYSCALL
74 # ifdef HAVE_STRUCT_IA64_FPREG