[PATCH, v2] Fix all warnings on ARM.

[Kirill A. Shutemov]

Signed-off-by: Kirill A. Shutemov <kirill at shutemov.name>
---
 strace/defs.h    |    5 ++++-
 strace/syscall.c |    8 +++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/strace/defs.h b/strace/defs.h
index b2f6fe3..4fe6613 100644
--- a/strace/defs.h
+++ b/strace/defs.h
@@ -113,6 +113,9 @@
 #     define LINUX_MIPSN64
 #     define LINUX_MIPS64
 #  endif
+#  if defined(ARM)
+#     define LINUX_ARM
+#  endif
 #endif
 
 #if defined(SVR4) || defined(FREEBSD)
@@ -139,7 +142,7 @@
 #include <sys/pioctl.h>
 #endif /* FREEBSD */
 #else /* !USE_PROCFS */
-#if (defined(LINUXSPARC) || defined (LINUX_X86_64)) && defined(__GLIBC__)
+#if (defined(LINUXSPARC) || defined(LINUX_X86_64) || defined(LINUX_ARM)) && defined(__GLIBC__)
 #include <sys/ptrace.h>
 #else
 /* Work around awkward prototype in ptrace.h. */
diff --git a/strace/syscall.c b/strace/syscall.c
index f5da861..f87055f 100644
--- a/strace/syscall.c
+++ b/strace/syscall.c
@@ -582,7 +582,7 @@ static const struct subcall subcalls_table[] = {
 };
 #endif /* FREEBSD */
 
-#if !(defined(LINUX) && ( defined(ALPHA) || defined(MIPS) ))
+#if !(defined(LINUX) && ( defined(ALPHA) || defined(MIPS) || defined(__ARM_EABI__) ))
 
 static void
 decode_subcall(tcp, subcall, nsubcalls, style)
@@ -1334,7 +1334,9 @@ syscall_fixup(tcp)
 struct tcb *tcp;
 {
 #ifndef USE_PROCFS
+#ifndef ARM
 	int pid = tcp->pid;
+#endif
 #else /* USE_PROCFS */
 	int scno = known_scno(tcp);
 
@@ -1929,9 +1931,9 @@ static int
 syscall_enter(tcp)
 struct tcb *tcp;
 {
-#ifndef USE_PROCFS
+#if !defined(USE_PROCFS) && !defined(ARM)
 	int pid = tcp->pid;
-#endif /* !USE_PROCFS */
+#endif /* !USE_PROCFS && !ARM */
 #ifdef LINUX
 #if defined(S390) || defined(S390X)
 	{
-- 
1.6.0.2.GIT