Patch by Kirill A. Shutemov:

Fix some warnings on ARM build.
* defs.h: include <sys/ptrace.h> on arm too.
* syscall.c: EABI arm does not need decode_subcall(), ifdef it out.

diff --git a/ChangeLog b/ChangeLog
index 82e9b8c40f920955ad81ca50f1d1d146a9e80b45..e8ed5f468ee60f941507072bf342181aeb9a3b40 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-30  Kirill A. Shutemov  <kirill@shutemov.name>
+
+       Fix some warnings on ARM build.
+       * defs.h: include <sys/ptrace.h> on arm too.
+       * syscall.c: EABI arm does not need decode_subcall(),
+       ifdef it out.
+
 2008-12-29  Nick Black  <dankamongmen@acm.org>
 
        * linux/syscallent.h: Mark sendfile(2) as network syscall.

diff --git a/defs.h b/defs.h
index 7baaf145b59f5e486cdc1f257a0f20dd02232f25..4d4a78c889c13602fc67c0147e3b0ac395ca541d 100644 (file)
--- a/defs.h
+++ b/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/syscall.c b/syscall.c
index 7d570d179d454fbab13075e53118e9330c0c4ee8..eb9746921a9950defd8918f15aaa12a4eab1894d 100644 (file)
--- a/syscall.c
+++ b/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)