From dee94b1f9bfa41f80d8d8f6507539562da7390b5 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 18 Jan 2009 01:59:59 +0000
Subject: [PATCH] fix strace for eabi and newer kernel versions

git-svn-id: svn://svn.openwrt.org/openwrt/packages@14082 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 utils/strace/Makefile                              | 15 +++-------
 .../001-arm_eabi_syscalls.patch                    |  0
 .../002-arm_bad_syscall.patch                      |  0
 .../003-avr32_support.patch                        |  0
 utils/strace/patches/100-eabi.patch                | 33 ++++++++++++++++++++++
 5 files changed, 37 insertions(+), 11 deletions(-)
 rename utils/strace/{patches => patches-4.5.16}/001-arm_eabi_syscalls.patch (100%)
 rename utils/strace/{patches => patches-4.5.16}/002-arm_bad_syscall.patch (100%)
 rename utils/strace/{patches => patches-4.5.16}/003-avr32_support.patch (100%)
 create mode 100644 utils/strace/patches/100-eabi.patch

diff --git a/utils/strace/Makefile b/utils/strace/Makefile
index ca71c056b..c0dafcffa 100644
--- a/utils/strace/Makefile
+++ b/utils/strace/Makefile
@@ -11,21 +11,14 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=strace
 PKG_RELEASE:=2
 
-ifneq ($(CONFIG_LINUX_2_6_27),y)
+OLD_KERNEL=$(findstring y,$(foreach v,23 24 25 26,$(CONFIG_LINUX_2_6_$(v))))
+ifneq ($(OLD_KERNEL),)
   PKG_VERSION:=4.5.16
   PKG_MD5SUM:=77f66d09aa82981bb6d65fa19a2c1ba9
-endif
-
-ifeq ($(CONFIG_TARGET_uml),y)
-  PKG_VERSION:=4.5.18
-  PKG_MD5SUM:=e9449fcee97e6a8ed73934c883c870e0
-  PATCH_DIR:=./none
-endif
-
-ifeq ($(CONFIG_LINUX_2_6_27)$(CONFIG_LINUX_2_6_28),y)
+  PATCH_DIR:=patches-4.5.16
+else
   PKG_VERSION:=4.5.18
   PKG_MD5SUM:=e9449fcee97e6a8ed73934c883c870e0
-  PATCH_DIR:=./none
 endif
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/utils/strace/patches/001-arm_eabi_syscalls.patch b/utils/strace/patches-4.5.16/001-arm_eabi_syscalls.patch
similarity index 100%
rename from utils/strace/patches/001-arm_eabi_syscalls.patch
rename to utils/strace/patches-4.5.16/001-arm_eabi_syscalls.patch
diff --git a/utils/strace/patches/002-arm_bad_syscall.patch b/utils/strace/patches-4.5.16/002-arm_bad_syscall.patch
similarity index 100%
rename from utils/strace/patches/002-arm_bad_syscall.patch
rename to utils/strace/patches-4.5.16/002-arm_bad_syscall.patch
diff --git a/utils/strace/patches/003-avr32_support.patch b/utils/strace/patches-4.5.16/003-avr32_support.patch
similarity index 100%
rename from utils/strace/patches/003-avr32_support.patch
rename to utils/strace/patches-4.5.16/003-avr32_support.patch
diff --git a/utils/strace/patches/100-eabi.patch b/utils/strace/patches/100-eabi.patch
new file mode 100644
index 000000000..018022a38
--- /dev/null
+++ b/utils/strace/patches/100-eabi.patch
@@ -0,0 +1,33 @@
+--- a/linux/arm/syscallent.h
++++ b/linux/arm/syscallent.h
+@@ -431,7 +431,7 @@
+ 	{ 5,	0,	printargs,		"SYS_398"	}, /* 398 */
+ 	{ 5,	0,	printargs,		"SYS_399"	}, /* 399 */
+ 
+-#if SYS_socket_subcall != 400
++#if defined(SYS_socket_subcall) && (SYS_socket_subcall != 400)
+  #error fix me
+ #endif
+ 	{ 8,	0,	printargs,		"socket_subcall"}, /* 400 */
+@@ -453,7 +453,7 @@
+ 	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 416 */
+ 	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 417 */
+ 
+-#if SYS_ipc_subcall != 418
++#if defined(SYS_ipc_subcall) && (SYS_ipc_subcall != 418)
+  #error fix me
+ #endif
+ 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 418 */
+--- a/system.c
++++ b/system.c
+@@ -70,10 +70,6 @@
+ #include <linux/capability.h>
+ #endif
+ 
+-#ifdef SYS_cacheflush
+-#include <asm/cachectl.h>
+-#endif
+-
+ #ifdef HAVE_LINUX_USTNAME_H
+ #include <linux/utsname.h>
+ #endif
-- 
2.11.0