From patchwork Mon Nov 25 07:58:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Zimmermann X-Patchwork-Id: 293842 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9FE932C007B for ; Mon, 25 Nov 2013 18:58:35 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:content-type:mime-version :content-transfer-encoding:subject:message-id:date:from:to:cc; q=dns; s=default; b=gRAA05sHURCs4H8P5x+zTZq7myUG/K9E1spfr1+TnfV uIIdqP2b8UWlVFCeeEn3NkxfbNkL4JcN5CkOtJ41c9V7rlYJ+i1BLYrMm+ogTIrH kXK42i+6OQO/CiLecPVf8bfYosEHPPIhwE1U5gm2XXSs9crcD8FYrdDTNdCJnsck = DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:content-type:mime-version :content-transfer-encoding:subject:message-id:date:from:to:cc; s=default; bh=Pd3FCrW1ZjNpH5J9udpBnS1HWww=; b=E8unojJ1SdnFQMtuP 70FmzcEbRqA62GFOMNoBfEfMi7ljNpu9UoPHAzDl9V3AjDDLvYf2gZzPWGbgpD2U 6fRp647mrbYkv/PSzaQd/04OYEuXMeplYmCd3020yVm6ArqBQ4h9tgFx+MnkbFbD V1lvEHDcpSEiZ6A6yMC24eDd2U= Received: (qmail 16324 invoked by alias); 25 Nov 2013 07:58:24 -0000 Mailing-List: contact crossgcc-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: crossgcc-owner@sourceware.org Delivered-To: mailing list crossgcc@sourceware.org Received: (qmail 16311 invoked by uid 89); 25 Nov 2013 07:58:23 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=1.5 required=5.0 tests=AWL, BAYES_50, FREEMAIL_FROM, RDNS_NONE, SPF_PASS, URIBL_BLOCKED autolearn=no version=3.3.2 X-HELO: mail-wi0-f172.google.com Received: from Unknown (HELO mail-wi0-f172.google.com) (209.85.212.172) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Mon, 25 Nov 2013 07:58:21 +0000 Received: by mail-wi0-f172.google.com with SMTP id en1so3157446wid.5 for ; Sun, 24 Nov 2013 23:58:12 -0800 (PST) X-Received: by 10.180.211.71 with SMTP id na7mr12639617wic.5.1385366292363; Sun, 24 Nov 2013 23:58:12 -0800 (PST) Received: from [127.0.1.1] (dslb-088-066-032-061.pools.arcor-ip.net. [88.66.32.61]) by mx.google.com with ESMTPSA id b7sm47110216wiz.8.2013.11.24.23.58.10 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 24 Nov 2013 23:58:11 -0800 (PST) MIME-Version: 1.0 Subject: [PATCH] debug/strace: pump version to 4.7 and 4.8 X-Mercurial-Node: 67b082cf1cdc8276eb4a709e8098f0f45e1e63e2 Message-Id: <67b082cf1cdc8276eb4a.1385366288@haus-VirtualBox> User-Agent: Mercurial-patchbomb/2.6.3 Date: Mon, 25 Nov 2013 08:58:08 +0100 From: Daniel Zimmermann To: "Yann E. MORIN" Cc: crossgcc@sourceware.org # HG changeset patch # User Daniel Zimmermann # Date 1385366215 -3600 # Mon Nov 25 08:56:55 2013 +0100 # Node ID 67b082cf1cdc8276eb4a709e8098f0f45e1e63e2 # Parent 7e569a9cb5fd3ab591bb307328b947a5b7312cba debug/strace: pump version to 4.7 and 4.8 Pump version for strace to 4.7 and 4.8. Add patch from strace mainline. Work around conflict between and Since glibc-2.18~39 defines ptrace_peeksiginfo_args which collides with . * configure.ac: Check for `struct ptrace_peeksiginfo_args' in . * process.c: Work around potential conflict between and by redefining ptrace_peeksiginfo_args. * signal.c: Likewise. * syscall.c: Likewise. * util.c: Likewise. http://sourceforge.net/p/strace/code/ci/0b4060f61f1bb101b5d8d084714b7d2feacdb199/ Signed-off-by: "Daniel Zimmermann" --- For unsubscribe information see http://sourceware.org/lists.html#faq diff -r 7e569a9cb5fd -r 67b082cf1cdc config/debug/strace.in --- a/config/debug/strace.in Sat Nov 16 18:14:45 2013 +0100 +++ b/config/debug/strace.in Mon Nov 25 08:56:55 2013 +0100 @@ -8,6 +8,16 @@ # Don't remove next line # CT_INSERT_VERSION_BELOW +config STRACE_V_4_8 + bool + prompt "4.8" + depends on CONFIGURE_has_xz + +config STRACE_V_4_7 + bool + prompt "4.7" + depends on CONFIGURE_has_xz + config STRACE_V_4_6 bool prompt "4.6" @@ -31,6 +41,8 @@ string # Don't remove next line # CT_INSERT_VERSION_STRING_BELOW + default "4.8" if STRACE_V_4_8 + default "4.7" if STRACE_V_4_7 default "4.6" if STRACE_V_4_6 default "4.5.20" if STRACE_V_4_5_20 default "4.5.19" if STRACE_V_4_5_19 diff -r 7e569a9cb5fd -r 67b082cf1cdc patches/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch Mon Nov 25 08:56:55 2013 +0100 @@ -0,0 +1,78 @@ +Submitted By: Ken Moffat +Date: 2013-08-26 +Initial Package Version: 4.8 +Upstream Status: Unknown +Origin: Unknown +Description: Fixes compilation with glibc-2.18. +From OpenSuse factory, found in strace-4.8-2.1.src.rpm by rpmfind.net. +http://download.opensuse.org/factory/repo/src-oss/suse/strace-4.8-2.1.src.rpm +Their changelog reports: + * Wed Aug 14 2013 schwab@suse.de + - strace-linux-ptrace-h.patch: handle conflict with struct + ptrace_peeksiginfo_args between and + + +Index: strace-4.8/process.c +=================================================================== +--- strace-4.8.orig/process.c ++++ strace-4.8/process.c +@@ -63,9 +63,11 @@ + # ifdef HAVE_STRUCT_PT_ALL_USER_REGS + # define pt_all_user_regs XXX_pt_all_user_regs + # endif ++# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args + # include + # undef ia64_fpreg + # undef pt_all_user_regs ++# undef ptrace_peeksiginfo_args + #endif + + #if defined(SPARC64) +Index: strace-4.8/signal.c +=================================================================== +--- strace-4.8.orig/signal.c ++++ strace-4.8/signal.c +@@ -51,9 +51,11 @@ + # ifdef HAVE_STRUCT_PT_ALL_USER_REGS + # define pt_all_user_regs XXX_pt_all_user_regs + # endif ++# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args + # include + # undef ia64_fpreg + # undef pt_all_user_regs ++# undef ptrace_peeksiginfo_args + #endif + + #ifdef IA64 +Index: strace-4.8/syscall.c +=================================================================== +--- strace-4.8.orig/syscall.c ++++ strace-4.8/syscall.c +@@ -48,9 +48,11 @@ + # ifdef HAVE_STRUCT_PT_ALL_USER_REGS + # define pt_all_user_regs XXX_pt_all_user_regs + # endif ++# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args + # include + # undef ia64_fpreg + # undef pt_all_user_regs ++# undef ptrace_peeksiginfo_args + #endif + + #if defined(SPARC64) +Index: strace-4.8/util.c +=================================================================== +--- strace-4.8.orig/util.c ++++ strace-4.8/util.c +@@ -55,9 +55,11 @@ + # ifdef HAVE_STRUCT_PT_ALL_USER_REGS + # define pt_all_user_regs XXX_pt_all_user_regs + # endif ++# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args + # include + # undef ia64_fpreg + # undef pt_all_user_regs ++# undef ptrace_peeksiginfo_args + #endif + + int