From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS17314 8.43.84.0/22 X-Spam-Status: No, score=-4.1 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 800851F8C1 for ; Tue, 5 May 2020 19:05:57 +0000 (UTC) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 672E3389001F; Tue, 5 May 2020 19:05:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 672E3389001F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1588705556; bh=YDJXjXQSnGOOMzRQNulcGkSpNGXQh6EeP6MdoHzwg/M=; h=Subject:To:References:Date:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=ZWwV+lOrnNisUxMuQtHrQUr8vAfwYhB+I/VwLUJjEVvzUhhm1OXYUoaMqDnN/F4Jr NLKOnbm1U8unlOpUgWDEX93ECZ/h7+KRIBIrBrGJj1IOFzEc60XgKxko7QRTOcRnAi xCBg9WxruvMYP9w9hxmK/jZ7Ioqr4P3AQ6lKIsf8= Received: from mail-qt1-x842.google.com (mail-qt1-x842.google.com [IPv6:2607:f8b0:4864:20::842]) by sourceware.org (Postfix) with ESMTPS id 42087388F400 for ; Tue, 5 May 2020 19:05:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 42087388F400 Received: by mail-qt1-x842.google.com with SMTP id h26so2952169qtu.8 for ; Tue, 05 May 2020 12:05:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:autocrypt:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=YDJXjXQSnGOOMzRQNulcGkSpNGXQh6EeP6MdoHzwg/M=; b=iHzCkW8WRuWuRRnuLVSZcYqclDV2X6HLD+EWAuuaGdFdcakVlUsVQln7gQC+64ZOht tsPKlrLJeUfVgg3NK/2q68+Nni8gur/aMZxY0izTtswoN7FrNvGOpTpW2/G+fww2Lq9B aKaW0/HZ10EloUjBHuyhHg5p13EVOn+6Oark+WCJlwRPX1Sr4CpXCUFG32pWB7U8rAEI Q7rblrlnn6wQhQrwJS1fGkQh4iPA3R/8GnmwanPsn/G+c36GokX96K84+tJpRl6xdBA7 ueXl2JXLlIlXsZT92onHFvDJ1CgpfZKq5kZwr5W1iW/nYSorlILJnAtl9qEevlDp/061 eyoA== X-Gm-Message-State: AGi0Puaiboytg4+quB+4hifbTHJPSmmt2TuCSxVUWyRhfSgpf80O/cdU kOxkT80pJ6m4ndujztVIKCWcH5kMnXU= X-Google-Smtp-Source: APiQypJn2UO9wn8YqGhNHD/MenZyXh+GhmYaEi3M/yUcy3jmCn6YX37mCtoNQ0cRLpUh3fA9OKrzQA== X-Received: by 2002:ac8:4e8d:: with SMTP id 13mr4253605qtp.293.1588705543039; Tue, 05 May 2020 12:05:43 -0700 (PDT) Received: from [192.168.1.4] ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id o12sm2365656qki.103.2020.05.05.12.05.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 05 May 2020 12:05:42 -0700 (PDT) Subject: Re: [PATCH] semaphore: consolidate arch headers into a generic one To: Vineet Gupta , libc-alpha@sourceware.org References: <03f4a9b3-b1ca-90fa-0b6a-609a3135267d@linaro.org> <20200427215938.14136-1-vgupta@synopsys.com> Autocrypt: addr=adhemerval.zanella@linaro.org; prefer-encrypt=mutual; keydata= mQINBFcVGkoBEADiQU2x/cBBmAVf5C2d1xgz6zCnlCefbqaflUBw4hB/bEME40QsrVzWZ5Nq 8kxkEczZzAOKkkvv4pRVLlLn/zDtFXhlcvQRJ3yFMGqzBjofucOrmdYkOGo0uCaoJKPT186L NWp53SACXguFJpnw4ODI64ziInzXQs/rUJqrFoVIlrPDmNv/LUv1OVPKz20ETjgfpg8MNwG6 iMizMefCl+RbtXbIEZ3TE/IaDT/jcOirjv96lBKrc/pAL0h/O71Kwbbp43fimW80GhjiaN2y WGByepnkAVP7FyNarhdDpJhoDmUk9yfwNuIuESaCQtfd3vgKKuo6grcKZ8bHy7IXX1XJj2X/ BgRVhVgMHAnDPFIkXtP+SiarkUaLjGzCz7XkUn4XAGDskBNfbizFqYUQCaL2FdbW3DeZqNIa nSzKAZK7Dm9+0VVSRZXP89w71Y7JUV56xL/PlOE+YKKFdEw+gQjQi0e+DZILAtFjJLoCrkEX w4LluMhYX/X8XP6/C3xW0yOZhvHYyn72sV4yJ1uyc/qz3OY32CRy+bwPzAMAkhdwcORA3JPb kPTlimhQqVgvca8m+MQ/JFZ6D+K7QPyvEv7bQ7M+IzFmTkOCwCJ3xqOD6GjX3aphk8Sr0dq3 4Awlf5xFDAG8dn8Uuutb7naGBd/fEv6t8dfkNyzj6yvc4jpVxwARAQABtElBZGhlbWVydmFs IFphbmVsbGEgTmV0dG8gKExpbmFybyBWUE4gS2V5KSA8YWRoZW1lcnZhbC56YW5lbGxhQGxp bmFyby5vcmc+iQI3BBMBCAAhBQJXFRpKAhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJ EKqx7BSnlIjv0e8P/1YOYoNkvJ+AJcNUaM5a2SA9oAKjSJ/M/EN4Id5Ow41ZJS4lUA0apSXW NjQg3VeVc2RiHab2LIB4MxdJhaWTuzfLkYnBeoy4u6njYcaoSwf3g9dSsvsl3mhtuzm6aXFH /Qsauav77enJh99tI4T+58rp0EuLhDsQbnBic/ukYNv7sQV8dy9KxA54yLnYUFqH6pfH8Lly sTVAMyi5Fg5O5/hVV+Z0Kpr+ZocC1YFJkTsNLAW5EIYSP9ftniqaVsim7MNmodv/zqK0IyDB GLLH1kjhvb5+6ySGlWbMTomt/or/uvMgulz0bRS+LUyOmlfXDdT+t38VPKBBVwFMarNuREU2 69M3a3jdTfScboDd2ck1u7l+QbaGoHZQ8ZNUrzgObltjohiIsazqkgYDQzXIMrD9H19E+8fw kCNUlXxjEgH/Kg8DlpoYJXSJCX0fjMWfXywL6ZXc2xyG/hbl5hvsLNmqDpLpc1CfKcA0BkK+ k8R57fr91mTCppSwwKJYO9T+8J+o4ho/CJnK/jBy1pWKMYJPvvrpdBCWq3MfzVpXYdahRKHI ypk8m4QlRlbOXWJ3TDd/SKNfSSrWgwRSg7XCjSlR7PNzNFXTULLB34sZhjrN6Q8NQZsZnMNs TX8nlGOVrKolnQPjKCLwCyu8PhllU8OwbSMKskcD1PSkG6h3r0AquQINBFcVGkoBEACgAdbR Ck+fsfOVwT8zowMiL3l9a2DP3Eeak23ifdZG+8Avb/SImpv0UMSbRfnw/N81IWwlbjkjbGTu oT37iZHLRwYUFmA8fZX0wNDNKQUUTjN6XalJmvhdz9l71H3WnE0wneEM5ahu5V1L1utUWTyh VUwzX1lwJeV3vyrNgI1kYOaeuNVvq7npNR6t6XxEpqPsNc6O77I12XELic2+36YibyqlTJIQ V1SZEbIy26AbC2zH9WqaKyGyQnr/IPbTJ2Lv0dM3RaXoVf+CeK7gB2B+w1hZummD21c1Laua +VIMPCUQ+EM8W9EtX+0iJXxI+wsztLT6vltQcm+5Q7tY+HFUucizJkAOAz98YFucwKefbkTp eKvCfCwiM1bGatZEFFKIlvJ2QNMQNiUrqJBlW9nZp/k7pbG3oStOjvawD9ZbP9e0fnlWJIsj 6c7pX354Yi7kxIk/6gREidHLLqEb/otuwt1aoMPg97iUgDV5mlNef77lWE8vxmlY0FBWIXuZ yv0XYxf1WF6dRizwFFbxvUZzIJp3spAao7jLsQj1DbD2s5+S1BW09A0mI/1DjB6EhNN+4bDB SJCOv/ReK3tFJXuj/HbyDrOdoMt8aIFbe7YFLEExHpSk+HgN05Lg5TyTro8oW7TSMTk+8a5M kzaH4UGXTTBDP/g5cfL3RFPl79ubXwARAQABiQIfBBgBCAAJBQJXFRpKAhsMAAoJEKqx7BSn lIjvI/8P/jg0jl4Tbvg3B5kT6PxJOXHYu9OoyaHLcay6Cd+ZrOd1VQQCbOcgLFbf4Yr+rE9l mYsY67AUgq2QKmVVbn9pjvGsEaz8UmfDnz5epUhDxC6yRRvY4hreMXZhPZ1pbMa6A0a/WOSt AgFj5V6Z4dXGTM/lNManr0HjXxbUYv2WfbNt3/07Db9T+GZkpUotC6iknsTA4rJi6u2ls0W9 1UIvW4o01vb4nZRCj4rni0g6eWoQCGoVDk/xFfy7ZliR5B+3Z3EWRJcQskip/QAHjbLa3pml xAZ484fVxgeESOoaeC9TiBIp0NfH8akWOI0HpBCiBD5xaCTvR7ujUWMvhsX2n881r/hNlR9g fcE6q00qHSPAEgGr1bnFv74/1vbKtjeXLCcRKk3Ulw0bY1OoDxWQr86T2fZGJ/HIZuVVBf3+ gaYJF92GXFynHnea14nFFuFgOni0Mi1zDxYH/8yGGBXvo14KWd8JOW0NJPaCDFJkdS5hu0VY 7vJwKcyHJGxsCLU+Et0mryX8qZwqibJIzu7kUJQdQDljbRPDFd/xmGUFCQiQAncSilYOcxNU EMVCXPAQTteqkvA+gNqSaK1NM9tY0eQ4iJpo+aoX8HAcn4sZzt2pfUB9vQMTBJ2d4+m/qO6+ cFTAceXmIoFsN8+gFN3i8Is3u12u8xGudcBPvpoy4OoG Message-ID: Date: Tue, 5 May 2020 16:05:40 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <20200427215938.14136-1-vgupta@synopsys.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Adhemerval Zanella via Libc-alpha Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" On 27/04/2020 18:59, Vineet Gupta wrote: > This consolidates the copy-pasted arch specific semaphore header into > single version (based on s390) which suffices 32-bit and and 64-bit > arch/ABI based on the canonical WORDSIZE. > > For now I've left out arches which use alternate defines to choose for > 32 vs 64-bit builds (aarch64, mips) which in theory can also use the same > header. > > Passes build-many for > aarch64-linux-gnu arm-linux-gnueabi arm-linux-gnueabihf > riscv64-linux-gnu-rv64imac-lp64 riscv64-linux-gnu-rv64imafdc-lp64 > x86_64-linux-gnu microblaze-linux-gnu nios2-linux-gnu > > Suggested-by: Adhemerval Zanella LGTM with a remark below. Reviewed-by: Adhemerval Zanella > --- > sysdeps/arm/nptl/bits/semaphore.h | 34 ---------------- > sysdeps/csky/nptl/bits/semaphore.h | 35 ---------------- > sysdeps/hppa/nptl/bits/semaphore.h | 31 -------------- > sysdeps/ia64/nptl/bits/semaphore.h | 35 ---------------- > sysdeps/microblaze/nptl/bits/semaphore.h | 32 --------------- > sysdeps/nios2/nptl/bits/semaphore.h | 32 --------------- > sysdeps/riscv/nptl/bits/semaphore.h | 33 --------------- > sysdeps/sh/nptl/bits/semaphore.h | 35 ---------------- > sysdeps/sparc/nptl/bits/semaphore.h | 40 ------------------- > .../unix/sysv/linux/alpha/bits/semaphore.h | 33 --------------- > .../nptl => unix/sysv/linux}/bits/semaphore.h | 0 > .../unix/sysv/linux/powerpc/bits/semaphore.h | 40 ------------------- > sysdeps/x86/bits/semaphore.h | 40 ------------------- > 13 files changed, 420 deletions(-) > delete mode 100644 sysdeps/arm/nptl/bits/semaphore.h > delete mode 100644 sysdeps/csky/nptl/bits/semaphore.h > delete mode 100644 sysdeps/hppa/nptl/bits/semaphore.h > delete mode 100644 sysdeps/ia64/nptl/bits/semaphore.h > delete mode 100644 sysdeps/microblaze/nptl/bits/semaphore.h > delete mode 100644 sysdeps/nios2/nptl/bits/semaphore.h > delete mode 100644 sysdeps/riscv/nptl/bits/semaphore.h > delete mode 100644 sysdeps/sh/nptl/bits/semaphore.h > delete mode 100644 sysdeps/sparc/nptl/bits/semaphore.h > delete mode 100644 sysdeps/unix/sysv/linux/alpha/bits/semaphore.h > rename sysdeps/{s390/nptl => unix/sysv/linux}/bits/semaphore.h (100%) > delete mode 100644 sysdeps/unix/sysv/linux/powerpc/bits/semaphore.h > delete mode 100644 sysdeps/x86/bits/semaphore.h > > diff --git a/sysdeps/arm/nptl/bits/semaphore.h b/sysdeps/arm/nptl/bits/semaphore.h > deleted file mode 100644 > index c93179e64a2e..000000000000 > --- a/sysdeps/arm/nptl/bits/semaphore.h > +++ /dev/null > @@ -1,34 +0,0 @@ > -/* Copyright (C) 2002-2020 Free Software Foundation, Inc. > - This file is part of the GNU C Library. > - > - The GNU C Library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - The GNU C Library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with the GNU C Library. If not, see > - . */ > - > -#ifndef _SEMAPHORE_H > -# error "Never use directly; include instead." > -#endif > - > - > -#define __SIZEOF_SEM_T 16 > - > - > -/* Value returned if `sem_open' failed. */ > -#define SEM_FAILED ((sem_t *) 0) > - > - > -typedef union > -{ > - char __size[__SIZEOF_SEM_T]; > - long int __align; > -} sem_t; Ok. > diff --git a/sysdeps/csky/nptl/bits/semaphore.h b/sysdeps/csky/nptl/bits/semaphore.h > deleted file mode 100644 > index 69b37249f5e3..000000000000 > --- a/sysdeps/csky/nptl/bits/semaphore.h > +++ /dev/null > @@ -1,35 +0,0 @@ > -/* Machine-specific POSIX semaphore type layouts. C-SKY version. > - Copyright (C) 2018-2020 Free Software Foundation, Inc. > - This file is part of the GNU C Library. > - > - The GNU C Library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - The GNU C Library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with the GNU C Library. If not, see > - . */ > - > -#ifndef _SEMAPHORE_H > -# error "Never use directly; include instead." > -#endif > - > - > -#define __SIZEOF_SEM_T 16 > - > - > -/* Value returned if `sem_open' failed. */ > -#define SEM_FAILED ((sem_t *) 0) > - > - > -typedef union > -{ > - char __size[__SIZEOF_SEM_T]; > - long int __align; > -} sem_t; Ok. > diff --git a/sysdeps/hppa/nptl/bits/semaphore.h b/sysdeps/hppa/nptl/bits/semaphore.h > deleted file mode 100644 > index 3864e6e16ee2..000000000000 > --- a/sysdeps/hppa/nptl/bits/semaphore.h > +++ /dev/null > @@ -1,31 +0,0 @@ > -/* Copyright (C) 2002-2020 Free Software Foundation, Inc. > - This file is part of the GNU C Library. > - > - The GNU C Library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - The GNU C Library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with the GNU C Library. If not, see > - . */ > - > -#ifndef _SEMAPHORE_H > -# error "Never use directly; include instead." > -#endif > - > -#define __SIZEOF_SEM_T 16 > - > -/* Value returned if `sem_open' failed. */ > -#define SEM_FAILED ((sem_t *) 0) > - > -typedef union > -{ > - char __size[__SIZEOF_SEM_T]; > - long int __align; > -} sem_t; Ok. > diff --git a/sysdeps/ia64/nptl/bits/semaphore.h b/sysdeps/ia64/nptl/bits/semaphore.h > deleted file mode 100644 > index 1c52ff27ceee..000000000000 > --- a/sysdeps/ia64/nptl/bits/semaphore.h > +++ /dev/null > @@ -1,35 +0,0 @@ > -/* Copyright (C) 2002-2020 Free Software Foundation, Inc. > - This file is part of the GNU C Library. > - Contributed by Ulrich Drepper , 2002. > - > - The GNU C Library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - The GNU C Library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with the GNU C Library; if not, see > - . */ > - > -#ifndef _SEMAPHORE_H > -# error "Never use directly; include instead." > -#endif > - > - > -#define __SIZEOF_SEM_T 32 > - > - > -/* Value returned if `sem_open' failed. */ > -#define SEM_FAILED ((sem_t *) 0) > - > - > -typedef union > -{ > - char __size[__SIZEOF_SEM_T]; > - long int __align; > -} sem_t; Ok. > diff --git a/sysdeps/microblaze/nptl/bits/semaphore.h b/sysdeps/microblaze/nptl/bits/semaphore.h > deleted file mode 100644 > index d5107b55330c..000000000000 > --- a/sysdeps/microblaze/nptl/bits/semaphore.h > +++ /dev/null > @@ -1,32 +0,0 @@ > -/* Copyright (C) 2002-2020 Free Software Foundation, Inc. > - > - This file is part of the GNU C Library. > - > - The GNU C Library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - The GNU C Library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with the GNU C Library; if not, see > - . */ > - > -#ifndef _SEMAPHORE_H > -# error "Never use directly; include instead." > -#endif > - > -#define __SIZEOF_SEM_T 16 > - > -/* Value returned if `sem_open' failed. */ > -#define SEM_FAILED ((sem_t *) 0) > - > -typedef union > -{ > - char __size[__SIZEOF_SEM_T]; > - long int __align; > -} sem_t; Ok. > diff --git a/sysdeps/nios2/nptl/bits/semaphore.h b/sysdeps/nios2/nptl/bits/semaphore.h > deleted file mode 100644 > index 7fa2521587c8..000000000000 > --- a/sysdeps/nios2/nptl/bits/semaphore.h > +++ /dev/null > @@ -1,32 +0,0 @@ > -/* Machine-specific POSIX semaphore type layouts. Nios II version. > - Copyright (C) 2002-2020 Free Software Foundation, Inc. > - This file is part of the GNU C Library. > - > - The GNU C Library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - The GNU C Library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with the GNU C Library; if not, see > - . */ > - > -#ifndef _SEMAPHORE_H > -# error "Never use directly; include instead." > -#endif > - > -#define __SIZEOF_SEM_T 16 > - > -/* Value returned if `sem_open' failed. */ > -#define SEM_FAILED ((sem_t *) 0) > - > -typedef union > -{ > - char __size[__SIZEOF_SEM_T]; > - long int __align; > -} sem_t; Ok. > diff --git a/sysdeps/riscv/nptl/bits/semaphore.h b/sysdeps/riscv/nptl/bits/semaphore.h > deleted file mode 100644 > index 09cfdebd0d24..000000000000 > --- a/sysdeps/riscv/nptl/bits/semaphore.h > +++ /dev/null > @@ -1,33 +0,0 @@ > -/* Machine-specific POSIX semaphore type layouts. RISC-V version. > - Copyright (C) 2002-2020 Free Software Foundation, Inc. > - This file is part of the GNU C Library. > - > - The GNU C Library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - The GNU C Library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with the GNU C Library. If not, see > - . */ > - > -#ifndef _SEMAPHORE_H > -# error "Never use directly; include instead." > -#endif > - > -#define __SIZEOF_SEM_T (4 * __SIZEOF_POINTER__) > - > -/* Value returned if `sem_open' failed. */ > -#define SEM_FAILED ((sem_t *) 0) > - > - > -typedef union > -{ > - char __size[__SIZEOF_SEM_T]; > - long int __align; > -} sem_t; Ok. > diff --git a/sysdeps/sh/nptl/bits/semaphore.h b/sysdeps/sh/nptl/bits/semaphore.h > deleted file mode 100644 > index e7f48eb32b8e..000000000000 > --- a/sysdeps/sh/nptl/bits/semaphore.h > +++ /dev/null > @@ -1,35 +0,0 @@ > -/* Copyright (C) 2002-2020 Free Software Foundation, Inc. > - This file is part of the GNU C Library. > - Contributed by Ulrich Drepper , 2002. > - > - The GNU C Library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - The GNU C Library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with the GNU C Library; if not, see > - . */ > - > -#ifndef _SEMAPHORE_H > -# error "Never use directly; include instead." > -#endif > - > - > -#define __SIZEOF_SEM_T 16 > - > - > -/* Value returned if `sem_open' failed. */ > -#define SEM_FAILED ((sem_t *) 0) > - > - > -typedef union > -{ > - char __size[__SIZEOF_SEM_T]; > - long int __align; > -} sem_t; Ok. > diff --git a/sysdeps/sparc/nptl/bits/semaphore.h b/sysdeps/sparc/nptl/bits/semaphore.h > deleted file mode 100644 > index 020fd757d5ad..000000000000 > --- a/sysdeps/sparc/nptl/bits/semaphore.h > +++ /dev/null > @@ -1,40 +0,0 @@ > -/* Machine-specific POSIX semaphore type layouts. SPARC version. > - Copyright (C) 2003-2020 Free Software Foundation, Inc. > - This file is part of the GNU C Library. > - Contributed by Jakub Jelinek , 2003. > - > - The GNU C Library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - The GNU C Library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with the GNU C Library; if not, see > - . */ > - > -#ifndef _SEMAPHORE_H > -# error "Never use directly; include instead." > -#endif > - > -#include > - > -#if __WORDSIZE == 64 > -# define __SIZEOF_SEM_T 32 > -#else > -# define __SIZEOF_SEM_T 16 > -#endif > - > -/* Value returned if `sem_open' failed. */ > -#define SEM_FAILED ((sem_t *) 0) > - > - > -typedef union > -{ > - char __size[__SIZEOF_SEM_T]; > - long int __align; > -} sem_t; Ok. > diff --git a/sysdeps/unix/sysv/linux/alpha/bits/semaphore.h b/sysdeps/unix/sysv/linux/alpha/bits/semaphore.h > deleted file mode 100644 > index ffd8d4a350a7..000000000000 > --- a/sysdeps/unix/sysv/linux/alpha/bits/semaphore.h > +++ /dev/null > @@ -1,33 +0,0 @@ > -/* Machine-specific POSIX semaphore type layouts. Alpha version. > - Copyright (C) 2003-2020 Free Software Foundation, Inc. > - This file is part of the GNU C Library. > - > - The GNU C Library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - The GNU C Library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with the GNU C Library. If not, see > - . */ > - > -#ifndef _SEMAPHORE_H > -# error "Never use directly; include instead." > -#endif > - > -# define __SIZEOF_SEM_T 32 > - > -/* Value returned if `sem_open' failed. */ > -#define SEM_FAILED ((sem_t *) 0) > - > - > -typedef union > -{ > - char __size[__SIZEOF_SEM_T]; > - long int __align; > -} sem_t; Ok. > diff --git a/sysdeps/s390/nptl/bits/semaphore.h b/sysdeps/unix/sysv/linux/bits/semaphore.h > similarity index 100% > rename from sysdeps/s390/nptl/bits/semaphore.h > rename to sysdeps/unix/sysv/linux/bits/semaphore.h Ok, although I think we should handle as a new file: add a online description and remove any 'Contributed by' line. > diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/semaphore.h b/sysdeps/unix/sysv/linux/powerpc/bits/semaphore.h > deleted file mode 100644 > index 717e6f82dad9..000000000000 > --- a/sysdeps/unix/sysv/linux/powerpc/bits/semaphore.h > +++ /dev/null > @@ -1,40 +0,0 @@ > -/* Machine-specific POSIX semaphore type layouts. PowerPC version. > - Copyright (C) 2003-2020 Free Software Foundation, Inc. > - This file is part of the GNU C Library. > - Contributed by Paul Mackerras , 2003. > - > - The GNU C Library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - The GNU C Library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with the GNU C Library; if not, see > - . */ > - > -#ifndef _SEMAPHORE_H > -# error "Never use directly; include instead." > -#endif > - > -#include > - > -#if __WORDSIZE == 64 > -# define __SIZEOF_SEM_T 32 > -#else > -# define __SIZEOF_SEM_T 16 > -#endif > - > -/* Value returned if `sem_open' failed. */ > -#define SEM_FAILED ((sem_t *) 0) > - > - > -typedef union > -{ > - char __size[__SIZEOF_SEM_T]; > - long int __align; > -} sem_t;. Ok. > diff --git a/sysdeps/x86/bits/semaphore.h b/sysdeps/x86/bits/semaphore.h > deleted file mode 100644 > index 299de51fa82b..000000000000 > --- a/sysdeps/x86/bits/semaphore.h > +++ /dev/null > @@ -1,40 +0,0 @@ > -/* Copyright (C) 2002-2020 Free Software Foundation, Inc. > - This file is part of the GNU C Library. > - Contributed by Ulrich Drepper , 2002. > - > - The GNU C Library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - The GNU C Library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with the GNU C Library; if not, see > - . */ > - > -#ifndef _SEMAPHORE_H > -# error "Never use directly; include instead." > -#endif > - > -#include > - > -#if __WORDSIZE == 64 > -# define __SIZEOF_SEM_T 32 > -#else > -# define __SIZEOF_SEM_T 16 > -#endif > - > - > -/* Value returned if `sem_open' failed. */ > -#define SEM_FAILED ((sem_t *) 0) > - > - > -typedef union > -{ > - char __size[__SIZEOF_SEM_T]; > - long int __align; > -} sem_t; > Ok.