From patchwork Tue Jan 10 13:19:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jessica Clarke X-Patchwork-Id: 713253 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tyXgx0RvDz9sDF for ; Wed, 11 Jan 2017 00:20:11 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="RhUBc8F8"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:in-reply-to:references; q=dns; s= default; b=yHirH1HSvuc26i41QTKOrvhpWGJ0wXlpcirXNkajzKGpDe9zRorDR G/V1zbb1h+f7Epax2hx8YHnktYvcpgGv+6l3DFqNniPX+Z1d3n67fieHBvlMMQ2M jwp4KUICLaxiiveIkxDDB1h1bdX40LWTc9vJ+IsbwOdcF4EbTlMV8U= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:in-reply-to:references; s= default; bh=Ae/R/Wdkj6HQrdKVr5Q3tN18G+M=; b=RhUBc8F8y02KzKWY7fn9 kHWI9dvS2y8t9gooWTlVjpfMllxbt6G3ugHI/hCmtO445ENlCQZ2e9e3x8ClKrjK AU9FmXZREeYXx+siXPTN09gNSX+cLCbN+hZY7uWmOikRuht9JrZ6wyp8IfIMQ9It JRuWYDbuLQzfRTPHL9x1y2A= Received: (qmail 30949 invoked by alias); 10 Jan 2017 13:20:00 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 30922 invoked by uid 89); 10 Jan 2017 13:19:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.4 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=no version=3.3.2 spammy=H*r:501 X-HELO: mail-wm0-f50.google.com Received: from mail-wm0-f50.google.com (HELO mail-wm0-f50.google.com) (74.125.82.50) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 10 Jan 2017 13:19:49 +0000 Received: by mail-wm0-f50.google.com with SMTP id k184so160691435wme.1 for ; Tue, 10 Jan 2017 05:19:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qAbVkPkt970ZpLoBj3MG4Jiosq+2j7V8SgM/sNduNLE=; b=fmfQ1drSm6em91V6LTJSxn3ivgfkBaBV2+6sAiTsMhYSh7gMifbGldRMzpU2RJwexJ wnZBzPEwwsM0NhzLSEcW1HFVB7XLmpQKYc/ME45NRmddgbqSPbbmFLCYG/6eQzWATR5I JClrmqe5qDlJMyFWp4Wjj8bahbWzgq7SXHAZLI2cf1EsMaPp9c3hJw64NbetoaJAnDaY DYZCoKVowLIabV3b9giarbIk7WzZp4wOwV37cGuxpzYaDuyPvVr6A9Vv2SwcQjBoDH6x UDjpI7vRgDFeIv+RDg5GTzPayFXy8wRgT91PZTwER+2H/5WzPBF22lyETHaRPjEFSRnT OlWA== X-Gm-Message-State: AIkVDXJ1eXtF7l6Mmh45o7iwHXIyJU8CW1vj/NbJ+3/l4/qcy91eCaKROm9HcSuUAwyp0XQ3 X-Received: by 10.28.52.76 with SMTP id b73mr7948364wma.8.1484054386923; Tue, 10 Jan 2017 05:19:46 -0800 (PST) Received: from Jamess-MacBook.home (host81-134-41-189.in-addr.btopenworld.com. [81.134.41.189]) by smtp.gmail.com with ESMTPSA id g6sm3272649wjp.28.2017.01.10.05.19.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jan 2017 05:19:46 -0800 (PST) Received: by Jamess-MacBook.home (Postfix, from userid 501) id EC0129F74AB; Tue, 10 Jan 2017 13:19:43 +0000 (GMT) From: James Clarke To: gcc-patches@gcc.gnu.org Cc: James Clarke , Jakub Jelinek Subject: [PATCH v2] PR sanitizer/78992: Fix sigaction definition on 32-bit sparc Date: Tue, 10 Jan 2017 13:19:32 +0000 Message-Id: <20170110131932.80911-1-jrtc27@jrtc27.com> In-Reply-To: <20170104210513.GP21933@tucnak> References: <20170104210513.GP21933@tucnak> libsanitizer: PR sanitizer/78992 * sanitizer_common/sanitizer_platform_limits_posix.h (struct __sanitizer_sigaction): Cherry-pick upstream r291561. --- libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h index 066bf41ffef..c139322839a 100644 --- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h @@ -633,9 +633,12 @@ namespace __sanitizer { #ifndef __mips__ #if defined(__sparc__) #if __GLIBC_PREREQ (2, 20) - // On sparc glibc 2.19 and earlier sa_flags was unsigned long, and - // __glibc_reserved0 didn't exist. + // On sparc glibc 2.19 and earlier sa_flags was unsigned long. +#if defined(__arch64__) + // To maintain ABI compatibility on sparc64 when switching to an int, + // __glibc_reserved0 was added. int __glibc_reserved0; +#endif int sa_flags; #else unsigned long sa_flags;