From patchwork Thu Jul 30 09:30:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 502037 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 5F30C140291 for ; Thu, 30 Jul 2015 19:31:01 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=rO+RoEU4; dkim-atps=neutral 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; q=dns; s= default; b=o/etiKcCF3VLThK4RxaLfYzMASnFR4Ex3NI3D+lShn/uv5zKzsYRU AOdLcg9EHn4zormQvji1SLa9xvK6gde2V1pixNOCdsKYcyp6MfNgse4jiil9ssvJ y7DQZAITdIayStC5AZ98DhDr3ZWEI/sW0m5Zf4Iqo3L4usurR8NEtM= 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; s=default; bh=wLLcZVvd3TkPF4cmqD1CA+WeGG0=; b=rO+RoEU4BtoGlcfF4t78Af+DMLJd DBcB8gqQ7uGc694cBnWmqx85n8SjZkq4ViD1stKXGUPf1ycMDpmzwNx8tDYMCYon v4KTmJlL7gNvQ3ThYrXdXJf+flno4Jl1jLKEB/Vfrcsioyn1hn2/htX9qfATPCWW EXJhRDl0Jbd2jG8= Received: (qmail 20445 invoked by alias); 30 Jul 2015 09:30:55 -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 20354 invoked by uid 89); 30 Jul 2015 09:30:54 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: smtp.gentoo.org From: Mike Frysinger To: libc-alpha@sourceware.org Subject: [PATCH/committed] hppa: fix pthreadtypes.h namespace failures Date: Thu, 30 Jul 2015 05:30:54 -0400 Message-Id: <1438248654-9047-1-git-send-email-vapier@gentoo.org> The conform tests flag the "aligned" symbol used inside the attributes, so rename it to __aligned__ like other headers. --- ChangeLog | 6 ++++++ sysdeps/hppa/nptl/bits/pthreadtypes.h | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e686f42..bcb14cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-07-30 Mike Frysinger + + * sysdeps/hppa/nptl/bits/pthreadtypes.h (pthread_mutex_t): Change + aligned to __aligned__. + (pthread_cond_t, pthread_rwlock_t): Likewise. + 2015-07-30 Torvald Riegel * sysdeps/unix/sysv/linux/hppa/lowlevellock.h: Remove file. diff --git a/sysdeps/hppa/nptl/bits/pthreadtypes.h b/sysdeps/hppa/nptl/bits/pthreadtypes.h index 845629d..a361ecf 100644 --- a/sysdeps/hppa/nptl/bits/pthreadtypes.h +++ b/sysdeps/hppa/nptl/bits/pthreadtypes.h @@ -67,7 +67,7 @@ typedef union { struct __pthread_mutex_s { - int __lock __attribute__ ((aligned(16))); + int __lock __attribute__ ((__aligned__(16))); unsigned int __count; int __owner; /* KIND must stay at this position in the structure to maintain @@ -119,7 +119,7 @@ typedef union start of the 4-word lock structure, the next four words are set all to 1 by the Linuxthreads PTHREAD_COND_INITIALIZER. */ - int __lock __attribute__ ((aligned(16))); + int __lock __attribute__ ((__aligned__(16))); /* Tracks the initialization of this structure: 0 initialized with NPTL PTHREAD_COND_INITIALIZER. 1 initialized with Linuxthreads PTHREAD_COND_INITIALIZER. @@ -167,7 +167,7 @@ typedef union start of the 4-word 16-byte aligned lock structure. The next four words are all set to 1 by the Linuxthreads PTHREAD_RWLOCK_INITIALIZER. We ignore them in NPTL. */ - int __compat_padding[4] __attribute__ ((aligned(16))); + int __compat_padding[4] __attribute__ ((__aligned__(16))); int __lock; unsigned int __nr_readers; unsigned int __readers_wakeup;