From patchwork Thu Apr 17 04:49:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 587 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx20.g.dreamhost.com (mx2.sub5.homie.mail.dreamhost.com [208.113.200.128]) by wilcox.dreamhost.com (Postfix) with ESMTP id 2F9D1360072 for ; Wed, 16 Apr 2014 21:52:43 -0700 (PDT) Received: by homiemail-mx20.g.dreamhost.com (Postfix, from userid 14307373) id DCCFB4100B1A6; Wed, 16 Apr 2014 21:52:42 -0700 (PDT) X-Original-To: glibc@patchwork.siddhesh.in Delivered-To: x14307373@homiemail-mx20.g.dreamhost.com 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 homiemail-mx20.g.dreamhost.com (Postfix) with ESMTPS id BD68A4100B1B9 for ; Wed, 16 Apr 2014 21:52:42 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=oHfTr3Yfi1P8v/IiKKkhyMegU3bVxza S5GIQ0GOOblAuNIOAfqpBK3YXLlVjXM5raBU44ryJlHptZA7+jTdHRjtQlB/kJGt 3az5jOPV0uwta5roponxL0w2G9uFSjkdesTr9XwB5qy9ORnQZul29uP23J/QKDCF GvoOh0SKo7Jg= 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:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=YsCqs7Bo0qMKUEJe3tDhk+LFMzQ=; b=VjyEM +2oDSRbfnonAtLCf+mpzbOZTI0xhiwbMT0Zw7zQaagzPJ56EhRj4M2KCsqAjR+N0 1NGhbyVzOoU+de63INoyV4QYSTtdeO63n7x8ITv+h02+zgIukCH9GOB6SKeeVFEv OHdCtu/ke/4eUgDVKdLQCeTVawZjoFaKk3tVQ0= Received: (qmail 18107 invoked by alias); 17 Apr 2014 04:52:40 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 18096 invoked by uid 89); 17 Apr 2014 04:52:40 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.7 required=5.0 tests=AWL, BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-pa0-f42.google.com X-Received: by 10.67.30.168 with SMTP id kf8mr13161519pad.84.1397710357405; Wed, 16 Apr 2014 21:52:37 -0700 (PDT) From: Richard Henderson To: libc-alpha@sourceware.org Subject: [PATCH 2/4] alpha: Fix __pointer_chk_guard definition for the testsuite Date: Wed, 16 Apr 2014 21:49:37 -0700 Message-Id: <1397710179-28556-3-git-send-email-rth@twiddle.net> In-Reply-To: <1397710179-28556-1-git-send-email-rth@twiddle.net> References: <1397710179-28556-1-git-send-email-rth@twiddle.net> X-DH-Original-To: glibc@patchwork.siddhesh.in --- ChangeLog | 3 +++ sysdeps/unix/alpha/sysdep.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3f9b7ea..31731d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2014-04-16 Richard Henderson + * sysdeps/unix/alpha/sysdep.h (__pointer_chk_guard): Remove + const from the non-libc, non-ldso copy. + * sysdeps/alpha/libm-test-ulps: Regenerate. 2014-04-16 Marcus Shawcroft diff --git a/sysdeps/unix/alpha/sysdep.h b/sysdeps/unix/alpha/sysdep.h index 7425026..0c40ca6 100644 --- a/sysdeps/unix/alpha/sysdep.h +++ b/sysdeps/unix/alpha/sysdep.h @@ -377,7 +377,7 @@ extern uintptr_t __pointer_chk_guard_local attribute_relro attribute_hidden; # define PTR_MANGLE(var) \ (var) = (__typeof (var)) ((uintptr_t) (var) ^ __pointer_chk_guard_local) # else -extern const uintptr_t __pointer_chk_guard attribute_relro; +extern uintptr_t __pointer_chk_guard attribute_relro; # define PTR_MANGLE(var) \ (var) = (__typeof(var)) ((uintptr_t) (var) ^ __pointer_chk_guard) # endif