Gitiles
Code Review Sign In
gerrit-public.fairphone.software / fp2-dev / platform / external / strace / bb0c2d52fc596f5e21652486c0b6a0b3e3b7e4cb / . / Android.patch
blob: 8e873366d33b716106f82a2c1769b9dea64d3b34 [file] [log] [blame]
Elliott Hughesbb0c2d52014-01-07 17:34:14 -0800[diff] [blame^]1diff -r -u -d /home/enh/Downloads/strace-4.7/defs.h ./defs.h
2--- /home/enh/Downloads/strace-4.7/defs.h 2012-04-28 05:58:35.000000000 -0700
3+++ ./defs.h 2014-01-07 18:55:56.199027145 -0800
4@@ -36,9 +36,6 @@
5 # define _LFS64_LARGEFILE 1
6 # endif
Elliott Hughese10a1e22013-03-21 18:08:32 -0700[diff] [blame]7 #endif
Elliott Hughese10a1e22013-03-21 18:08:32 -0700[diff] [blame]8-#ifdef MIPS
Elliott Hughesbb0c2d52014-01-07 17:34:14 -0800[diff] [blame^]9-# include <sgidefs.h>
Elliott Hughese10a1e22013-03-21 18:08:32 -0700[diff] [blame]10-#endif
Elliott Hughese10a1e22013-03-21 18:08:32 -0700[diff] [blame]11 #include <features.h>
Elliott Hughesbb0c2d52014-01-07 17:34:14 -0800[diff] [blame^]12 #ifdef HAVE_STDBOOL_H
13 # include <stdbool.h>
14diff -r -u -d /home/enh/Downloads/strace-4.7/file.c ./file.c
15--- /home/enh/Downloads/strace-4.7/file.c 2012-04-18 08:02:40.000000000 -0700
16+++ ./file.c 2014-01-07 18:55:26.409389991 -0800
17@@ -32,6 +32,16 @@
18 #include <dirent.h>
19 #include <sys/swap.h>
Jeff Brownf76f96e2012-03-02 16:23:23 -0800[diff] [blame]20
21+#ifdef HAVE_ANDROID_OS
Jeff Brownf76f96e2012-03-02 16:23:23 -0800[diff] [blame]22+struct dirent64 {
23+ __u64 d_ino;
24+ __s64 d_off;
25+ unsigned short d_reclen;
26+ unsigned char d_type;
27+ char d_name[256];
28+};
Jeff Brownf76f96e2012-03-02 16:23:23 -0800[diff] [blame]29+#endif /* HAVE_ANDROID_OS */
30+
Elliott Hughesbb0c2d52014-01-07 17:34:14 -0800[diff] [blame^]31 #ifdef LINUXSPARC
Jeff Brownf76f96e2012-03-02 16:23:23 -0800[diff] [blame]32 struct stat {
Elliott Hughesbb0c2d52014-01-07 17:34:14 -0800[diff] [blame^]33 unsigned short st_dev;
34diff -r -u -d /home/enh/Downloads/strace-4.7/ioctl.c ./ioctl.c
35--- /home/enh/Downloads/strace-4.7/ioctl.c 2012-04-18 08:27:25.000000000 -0700
36+++ ./ioctl.c 2014-01-07 18:55:26.409389991 -0800
37@@ -86,8 +86,10 @@
Jeff Brownf76f96e2012-03-02 16:23:23 -0800[diff] [blame]38 case 0x03:
39 case 0x12:
40 return block_ioctl(tcp, code, arg);
41+#ifndef HAVE_ANDROID_OS
42 case 0x22:
43 return scsi_ioctl(tcp, code, arg);
Jeff Brownf76f96e2012-03-02 16:23:23 -0800[diff] [blame]44+#endif
Elliott Hughesbb0c2d52014-01-07 17:34:14 -0800[diff] [blame^]45 case 'L':
46 return loop_ioctl(tcp, code, arg);
47 case 'M':
48diff -r -u -d /home/enh/Downloads/strace-4.7/ipc.c ./ipc.c
49--- /home/enh/Downloads/strace-4.7/ipc.c 2012-04-16 04:00:01.000000000 -0700
50+++ ./ipc.c 2014-01-07 18:55:26.409389991 -0800
51@@ -34,9 +34,15 @@
52 #endif
Jeff Brownf76f96e2012-03-02 16:23:23 -0800[diff] [blame]53 #include <fcntl.h>
54 #include <sys/ipc.h>
55+#ifdef HAVE_ANDROID_OS
56+#include <linux/sem.h>
57+#include <linux/msg.h>
58+#include <linux/shm.h>
59+#else
60 #include <sys/sem.h>
61 #include <sys/msg.h>
62 #include <sys/shm.h>
63+#endif
64
65 #ifndef MSG_STAT
66 #define MSG_STAT 11
Elliott Hughesbb0c2d52014-01-07 17:34:14 -0800[diff] [blame^]67diff -r -u -d /home/enh/Downloads/strace-4.7/signal.c ./signal.c
68--- /home/enh/Downloads/strace-4.7/signal.c 2012-04-16 19:38:17.000000000 -0700
69+++ ./signal.c 2014-01-07 18:55:26.439389625 -0800
70@@ -419,7 +419,7 @@
71 # define SI_FROMUSER(sip) ((sip)->si_code <= 0)
72 #endif
Jeff Brownf76f96e2012-03-02 16:23:23 -0800[diff] [blame]73
74-#if __GLIBC_MINOR__ < 1
75+#if __GLIBC_MINOR__ < 1 && !defined(HAVE_ANDROID_OS)
76 /* Type for data associated with a signal. */
77 typedef union sigval
78 {
Elliott Hughesbb0c2d52014-01-07 17:34:14 -0800[diff] [blame^]79diff -r -u -d /home/enh/Downloads/strace-4.7/time.c ./time.c
80--- /home/enh/Downloads/strace-4.7/time.c 2012-05-01 14:17:51.000000000 -0700
81+++ ./time.c 2014-01-07 18:55:26.439389625 -0800
82@@ -29,7 +29,11 @@
Jeff Brownf76f96e2012-03-02 16:23:23 -0800[diff] [blame]83
84 #include "defs.h"
Jeff Brownf76f96e2012-03-02 16:23:23 -0800[diff] [blame]85 #include <linux/version.h>
Elliott Hughesbb0c2d52014-01-07 17:34:14 -0800[diff] [blame^]86+#if HAVE_ANDROID_OS
Jeff Brownf76f96e2012-03-02 16:23:23 -0800[diff] [blame]87+#include <linux/timex.h>
88+#else
89 #include <sys/timex.h>
90+#endif
91 #include <linux/ioctl.h>
92 #include <linux/rtc.h>
93