From patchwork Tue Mar 18 12:47:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Liebler X-Patchwork-Id: 142 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx20.g.dreamhost.com (caibbdcaaahc.dreamhost.com [208.113.200.72]) by wilcox.dreamhost.com (Postfix) with ESMTP id 1E5EF360089 for ; Tue, 18 Mar 2014 05:50:15 -0700 (PDT) Received: by homiemail-mx20.g.dreamhost.com (Postfix, from userid 14307373) id ADE684088D08B; Tue, 18 Mar 2014 05:50:14 -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 5F4FF40DDDAE5 for ; Tue, 18 Mar 2014 05:50:14 -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:to:from:subject:date:message-id:references :mime-version:content-type:in-reply-to; q=dns; s=default; b=M/AC 9iNII6ZO3UBTHKwijS5VxFsMXpTusx9h2VTbDPafZCxhQOeD/Sui0V//aGXCNX86 flcQ9oqPdnc/nAXaoUvQNUEin9/AiY03cGMFzg5CAk0/Ns9twN6yk8/029d7hH9+ PLpWMrjMYQCkV6i7qIFhA1H6eDJ0cfKRtRJEyd4= 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:to:from:subject:date:message-id:references :mime-version:content-type:in-reply-to; s=default; bh=x55NquIbKy IEyk1UUwq4ibnyuks=; b=NtTYhHBwSRWxulIMp9RsTBsQ8AO9gDzMEWLwFF6YDg W4KAdXvp2HNf2Y+el4bk27zCsu5EtRiEbN/0pzIfDD2SFBhsinNoprjstoKZcF7o tSMAL6Zans7uLj9OW7S2ssdrbktIeZxzMq91sXWjmPkTpvxpxYXDyXmB7ssAWDzG Y= Received: (qmail 19524 invoked by alias); 18 Mar 2014 12:50:12 -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 19511 invoked by uid 89); 18 Mar 2014 12:50:11 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: plane.gmane.org To: libc-alpha@sourceware.org From: Stefan Liebler Subject: Re: [PATCH] S/390: Fix namespace violation Date: Tue, 18 Mar 2014 13:47:54 +0100 Lines: 77 Message-ID: References: <20140314170224.7B1CF74495@topped-with-meat.com> <53237841.3000303@redhat.com> Mime-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 In-Reply-To: <53237841.3000303@redhat.com> X-DH-Original-To: glibc@patchwork.siddhesh.in On 03/14/2014 10:44 PM, Carlos O'Donell wrote: > On 03/14/2014 01:02 PM, Roland McGrath wrote: >> If you're going to touch it at all , you should make it follow the new >> convention and be __glibc_reserved* instead. > > Agreed. > > See: > https://sourceware.org/glibc/wiki/Consensus > ~~~ > Anyone can commit a change to any header to rename __block to > __glibc_block or __unused to __glibc_reserved. Multiple versions > of the same symbol can be created by appending a number e.g. > __glibc_reserved1. Consenus was reached that glibc would use > the internal prefix __glibc to avoid name collisions with > other tools that comprise the implementation from a standard > perspective. > See https://sourceware.org/ml/libc-alpha/2012-02/msg00047.html. > Note that __unused is used by source from BSD that defines it as > the unused attribute for the compiler, while __block is used by > Clang's -fblocks extension. > ~~~ > > Cheers, > Carlos. > > Okay. Member pad0 is now renamed to __glibc_reserved0. Tested on s390/s390x. Bye --- 2014-03-18 Stefan Liebler [BZ #16714] * sysdeps/unix/sysv/linux/s390/bits/stat.h (struct stat): Rename member pad0 to __glibc_reserved0. --- diff --git a/sysdeps/unix/sysv/linux/s390/bits/stat.h b/sysdeps/unix/sysv/linux/s390/bits/stat.h index c154fe9..47db2d8 100644 --- a/sysdeps/unix/sysv/linux/s390/bits/stat.h +++ b/sysdeps/unix/sysv/linux/s390/bits/stat.h @@ -55,7 +55,7 @@ struct stat __mode_t st_mode; /* File mode. */ __uid_t st_uid; /* User ID of the file's owner. */ __gid_t st_gid; /* Group ID of the file's group.*/ - int pad0; + int __glibc_reserved0; __dev_t st_rdev; /* Device number, if device. */ __off_t st_size; /* Size of file, in bytes. */ #ifdef __USE_XOPEN2K8 @@ -152,7 +152,7 @@ struct stat64 __mode_t st_mode; /* File mode. */ __uid_t st_uid; /* User ID of the file's owner. */ __gid_t st_gid; /* Group ID of the file's group.*/ - int pad0; + int __glibc_reserved0; __dev_t st_rdev; /* Device number, if device. */ __off_t st_size; /* Size of file, in bytes. */ # ifdef __USE_XOPEN2K8