From patchwork Sun Jun 9 21:35:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Zankel X-Patchwork-Id: 250152 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 4C8BA2C007B for ; Mon, 10 Jun 2013 07:44:34 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 52F0B317ED; Sun, 9 Jun 2013 21:44:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WQukpTaWyMft; Sun, 9 Jun 2013 21:44:31 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id C80A5316A1; Sun, 9 Jun 2013 21:44:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 127F58F75E for ; Sun, 9 Jun 2013 21:44:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2A75C8A669 for ; Sun, 9 Jun 2013 21:44:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dbnu26Nz3eUB for ; Sun, 9 Jun 2013 21:44:27 +0000 (UTC) X-Greylist: delayed 01:54:47 by SQLgrey-1.7.6 Received: from mail-pb0-f54.google.com (mail-pb0-f54.google.com [209.85.160.54]) by whitealder.osuosl.org (Postfix) with ESMTPS id 9974785C85 for ; Sun, 9 Jun 2013 21:44:27 +0000 (UTC) Received: by mail-pb0-f54.google.com with SMTP id ro2so6581845pbb.27 for ; Sun, 09 Jun 2013 14:44:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:from:to:cc:date:subject:x-gm-message-state; bh=nK55VCCO90y/EkJryWBm2vb+DC/12cMDURUyAL374+I=; b=RTjpMQjiSW+MqL2uotTwh7mtjcPD0RT4MYgbRhEXFlMcrmyH5gBYEV7FnYm5LuSFmW tElglDeXNeo5P56izVuRQnpxPa17D/Bk5+TT+0kBkUz6ozFusYnEDG1g8e9FpYGEby5C 6P63I9NAum2z9cuX14S10TQe+D8gSIslQ0SDFqPzpSV4JwD2bh949LZso9pINBMh8n1i /8ArMRsKvHxb8ivc5ly6Ee4hmjff2fz7EYm+jKZ+MNumuT9dutUExWqjrvJWJ+u5JXSa hNB3mVc/14ffzuGQxDQRSj3LFJzUdfq9VIQnWGP900nayZjLsb4fnNBSFZk/j3abC/r8 6AxA== X-Received: by 10.68.224.104 with SMTP id rb8mr7226175pbc.206.1370814267099; Sun, 09 Jun 2013 14:44:27 -0700 (PDT) Received: from localhost (c-67-161-9-61.hsd1.ca.comcast.net. [67.161.9.61]) by mx.google.com with ESMTPSA id dr6sm12704589pac.11.2013.06.09.14.44.24 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 09 Jun 2013 14:44:26 -0700 (PDT) Message-ID: <51b4f73a.e6b4420a.5627.fffffb01@mx.google.com> Received: by localhost (sSMTP sendmail emulation); Sun, 09 Jun 2013 14:44:23 -0700 From: Chris Zankel To: buildroot@uclibc.org Date: Sun, 9 Jun 2013 14:35:44 -0700 X-Gm-Message-State: ALoCoQmHR8RdmihjNvGKEGutClgQpobmZUES6Pt6sOkeL29YHRTXVxjxbhjlA8sELxHr2zehQndz Cc: rep.dot.nop@gmail.com Subject: [Buildroot] [PATCH] strace: upgrade to 4.8, supporting now aarch64, arc, and xtensa X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Remove 'strace-fix-arm-bad-syscall.patch'. This patch had been integrated in v4.6 (commit: 9bc6340d2) and was later replaced with a generic solution in v.7 (commit: 2ce12ed31c2). Strace still cannot handle non-LFS environments, so a modified version of strace-fix-disabled-largefile-syscalls.patch remains. The 64-bit syscalls (sys_truncate64, etc.) are references in the sysent structure but the functinon definitions are commented out becuase of the missing LFS support. The workaround for the 'forced lfs mode' doesn't seem to be necessary anymore. Build tested on arm w and w/o LFS support. Signed-off-by: Chris Zankel diff --git a/package/strace/Config.in b/package/strace/Config.in index 153bcf6..bbb582a 100644 --- a/package/strace/Config.in +++ b/package/strace/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_STRACE bool "strace" - depends on !(BR2_xtensa || BR2_aarch64 || BR2_arc) help A useful diagnostic, instructional, and debugging tool. Allows you to track what system calls a program makes diff --git a/package/strace/strace-fix-arm-bad-syscall.patch b/package/strace/strace-fix-arm-bad-syscall.patch deleted file mode 100644 index 3f3144e..0000000 --- a/package/strace/strace-fix-arm-bad-syscall.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/syscall.c -+++ b/syscall.c -@@ -1016,6 +1016,15 @@ struct tcb *tcp; - /* - * Note: we only deal with only 32-bit CPUs here. - */ -+ -+ if (!(tcp->flags & TCB_INSYSCALL) && -+ (tcp->flags & TCB_WAITEXECVE)) { -+ /* caught a fake syscall from the execve's exit */ -+ tcp->flags &= ~TCB_WAITEXECVE; -+ return 0; -+ } -+ -+ - if (regs.ARM_cpsr & 0x20) { - /* - * Get the Thumb-mode system call number diff --git a/package/strace/strace-fix-disabled-largefile-syscalls.patch b/package/strace/strace-fix-disabled-largefile-syscalls.patch index f6bcf96..2117a0e 100644 --- a/package/strace/strace-fix-disabled-largefile-syscalls.patch +++ b/package/strace/strace-fix-disabled-largefile-syscalls.patch @@ -1,8 +1,8 @@ --- a/syscall.c +++ b/syscall.c @@ -125,6 +125,18 @@ - #define TP TRACE_PROCESS - #define TS TRACE_SIGNAL + #define NF SYSCALL_NEVER_FAILS + #define MA MAX_ARGS +#ifndef HAVE_STATFS64 +/* @@ -16,6 +16,6 @@ +#define sys_fstatfs64 sys_fstatfs +#endif + - static const struct sysent sysent0[] = { + const struct_sysent sysent0[] = { #include "syscallent.h" }; diff --git a/package/strace/strace.mk b/package/strace/strace.mk index b172a20..0dce096 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 4.7 +STRACE_VERSION = 4.8 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = http://downloads.sourceforge.net/project/strace/strace/$(STRACE_VERSION) STRACE_LICENSE = BSD-3c @@ -13,13 +13,6 @@ STRACE_LICENSE_FILES = COPYRIGHT STRACE_CONF_ENV = ac_cv_header_linux_if_packet_h=yes \ ac_cv_header_linux_netlink_h=yes -ifeq ($(BR2_LARGEFILE),y) -# strace gets confused when lfs mode is forced, so don't -STRACE_CONF_ENV += \ - CFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS))" \ - CPPFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS))" -endif - define STRACE_REMOVE_STRACE_GRAPH rm -f $(TARGET_DIR)/usr/bin/strace-graph endef