From patchwork Thu Dec 16 19:42:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 49022 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 501F4385842A for ; Thu, 16 Dec 2021 19:44:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 501F4385842A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1639683852; bh=Z2WBNoGpnd+FTR2YpEhXOnj/e5JqGAULbl2qUxcCs/4=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=w11jyM2cwzHkYJ8zvIn4DpcdAzmKSn6kQdCIX6lnfgfXb296EYNu7LvfAcmUdSzOo M/lui+02Bn4CskHK+xAaV98YLgOPeYiCKhmZe7x2jo8aAsDI8sWV+JkcZ8PXUnLZI7 TISB42DXuJInaeXBgzfKYPNV2Nv5ukoWMTzMMgDg= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qv1-xf30.google.com (mail-qv1-xf30.google.com [IPv6:2607:f8b0:4864:20::f30]) by sourceware.org (Postfix) with ESMTPS id B31163858D35 for ; Thu, 16 Dec 2021 19:42:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B31163858D35 Received: by mail-qv1-xf30.google.com with SMTP id kj6so308293qvb.2 for ; Thu, 16 Dec 2021 11:42:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Z2WBNoGpnd+FTR2YpEhXOnj/e5JqGAULbl2qUxcCs/4=; b=p9iC7wmZ9e+AR73zq2L2JaVZgnh+QBM4TvKl8gsU9kpBl09m7ikbcuVu6ICCwZ+uke zh/+ny3w77hm/RQNNjF0ANvIE/FdML3YfRRKs82dZmNgV+nLX6Hh71DXGDE7nelPqQsH RYAUin6TGIpVy1g5enMCZhoH4kAJCKt1L7vDCncq9d7nyegxL4saWEFmWtrHBi92Laf7 9qOMcLqOTA/8WMY/SRGPC7/wOD8ozEVWXeFFHwevTblRvxk/fJqiVs+uzsIsgg2jY2ZH LBC+tHluFyZv1jgz9fpIgeGt1vFzXixmNwjfKm12c61DPrNV60+0zxnlIOPlrjJbFHzS zOCA== X-Gm-Message-State: AOAM533RYsB6/ov5RLpeArn5fAf5Fcz1VU+zyhMwAbabYW4+gaAcPVbL jFy0NJB/FcKCfuyGEwXAAWJJpFBuOxL0yA== X-Google-Smtp-Source: ABdhPJxNkqmvp6G6y5Bn5IoPcxq0XMDpcthMguRQ/2s3ESN+K686FkH14Pmf5u1XlN7dG2p40Yz73w== X-Received: by 2002:ad4:5911:: with SMTP id ez17mr12814258qvb.96.1639683747709; Thu, 16 Dec 2021 11:42:27 -0800 (PST) Received: from birita.. ([2804:431:c7ca:103f:96e9:fe91:2aff:a44d]) by smtp.gmail.com with ESMTPSA id br13sm3503836qkb.10.2021.12.16.11.42.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 11:42:27 -0800 (PST) To: libc-alpha@sourceware.org, Stafford Horne Subject: [PATCH 1/5] Remove ununsed tcb-offset Date: Thu, 16 Dec 2021 16:42:18 -0300 Message-Id: <20211216194222.186992-2-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211216194222.186992-1-adhemerval.zanella@linaro.org> References: <20211216194222.186992-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_ASCII_DIVIDERS, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org 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: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Some architectures do not use the auto-generated tcb-offsets.h. --- sysdeps/aarch64/nptl/Makefile | 21 --------------------- sysdeps/aarch64/nptl/tcb-offsets.sym | 6 ------ sysdeps/aarch64/nptl/tls.h | 3 --- sysdeps/alpha/nptl/Makefile | 20 -------------------- sysdeps/alpha/nptl/tcb-offsets.sym | 13 ------------- sysdeps/alpha/nptl/tls.h | 2 -- sysdeps/arc/nptl/Makefile | 22 ---------------------- sysdeps/arc/nptl/tcb-offsets.sym | 11 ----------- sysdeps/arm/nptl/Makefile | 4 ---- sysdeps/arm/nptl/tcb-offsets.sym | 10 ---------- sysdeps/arm/nptl/tls.h | 3 --- sysdeps/csky/Makefile | 4 ---- sysdeps/csky/nptl/Makefile | 20 -------------------- sysdeps/csky/nptl/tcb-offsets.sym | 10 ---------- sysdeps/csky/nptl/tls.h | 1 - sysdeps/hppa/nptl/Makefile | 20 -------------------- sysdeps/hppa/nptl/tcb-offsets.sym | 17 ----------------- sysdeps/hppa/nptl/tls.h | 3 --- sysdeps/m68k/nptl/Makefile | 20 -------------------- sysdeps/m68k/nptl/tcb-offsets.sym | 10 ---------- sysdeps/m68k/nptl/tls.h | 3 --- sysdeps/microblaze/nptl/Makefile | 21 --------------------- sysdeps/microblaze/nptl/tcb-offsets.sym | 10 ---------- sysdeps/microblaze/nptl/tls.h | 3 --- sysdeps/mips/nptl/Makefile | 20 -------------------- sysdeps/mips/nptl/tcb-offsets.sym | 10 ---------- sysdeps/mips/nptl/tls.h | 2 -- sysdeps/nios2/Makefile | 4 ---- sysdeps/riscv/nptl/Makefile | 21 --------------------- sysdeps/riscv/nptl/tcb-offsets.sym | 6 ------ 30 files changed, 320 deletions(-) delete mode 100644 sysdeps/aarch64/nptl/Makefile delete mode 100644 sysdeps/aarch64/nptl/tcb-offsets.sym delete mode 100644 sysdeps/alpha/nptl/Makefile delete mode 100644 sysdeps/alpha/nptl/tcb-offsets.sym delete mode 100644 sysdeps/arc/nptl/Makefile delete mode 100644 sysdeps/arc/nptl/tcb-offsets.sym delete mode 100644 sysdeps/arm/nptl/tcb-offsets.sym delete mode 100644 sysdeps/csky/nptl/Makefile delete mode 100644 sysdeps/csky/nptl/tcb-offsets.sym delete mode 100644 sysdeps/hppa/nptl/Makefile delete mode 100644 sysdeps/hppa/nptl/tcb-offsets.sym delete mode 100644 sysdeps/m68k/nptl/Makefile delete mode 100644 sysdeps/m68k/nptl/tcb-offsets.sym delete mode 100644 sysdeps/microblaze/nptl/Makefile delete mode 100644 sysdeps/microblaze/nptl/tcb-offsets.sym delete mode 100644 sysdeps/mips/nptl/Makefile delete mode 100644 sysdeps/mips/nptl/tcb-offsets.sym delete mode 100644 sysdeps/riscv/nptl/Makefile delete mode 100644 sysdeps/riscv/nptl/tcb-offsets.sym diff --git a/sysdeps/aarch64/nptl/Makefile b/sysdeps/aarch64/nptl/Makefile deleted file mode 100644 index 6d23959e30..0000000000 --- a/sysdeps/aarch64/nptl/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (C) 2005-2021 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 -# . - -ifeq ($(subdir),csu) -gen-as-const-headers += tcb-offsets.sym -endif diff --git a/sysdeps/aarch64/nptl/tcb-offsets.sym b/sysdeps/aarch64/nptl/tcb-offsets.sym deleted file mode 100644 index 238647dd47..0000000000 --- a/sysdeps/aarch64/nptl/tcb-offsets.sym +++ /dev/null @@ -1,6 +0,0 @@ -#include -#include - -PTHREAD_MULTIPLE_THREADS_OFFSET offsetof (struct pthread, header.multiple_threads) -PTHREAD_TID_OFFSET offsetof (struct pthread, tid) -PTHREAD_SIZEOF sizeof (struct pthread) diff --git a/sysdeps/aarch64/nptl/tls.h b/sysdeps/aarch64/nptl/tls.h index 860776bb4b..84916f36b7 100644 --- a/sysdeps/aarch64/nptl/tls.h +++ b/sysdeps/aarch64/nptl/tls.h @@ -26,9 +26,6 @@ # include # include # include - -#else /* __ASSEMBLER__ */ -# include #endif /* __ASSEMBLER__ */ #ifndef __ASSEMBLER__ diff --git a/sysdeps/alpha/nptl/Makefile b/sysdeps/alpha/nptl/Makefile deleted file mode 100644 index fc5567ee55..0000000000 --- a/sysdeps/alpha/nptl/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (C) 2003-2021 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 -# . - -ifeq ($(subdir),csu) -gen-as-const-headers += tcb-offsets.sym -endif diff --git a/sysdeps/alpha/nptl/tcb-offsets.sym b/sysdeps/alpha/nptl/tcb-offsets.sym deleted file mode 100644 index 1005621b37..0000000000 --- a/sysdeps/alpha/nptl/tcb-offsets.sym +++ /dev/null @@ -1,13 +0,0 @@ -#include -#include - --- - --- Abuse tls.h macros to derive offsets relative to the thread register. --- # define __builtin_thread_pointer() ((void *) 0) --- # define thread_offsetof(mem) ((void *) &THREAD_SELF->mem - (void *) 0) --- Ho hum, this doesn't work in gcc4, so Know Things about THREAD_SELF -#define thread_offsetof(mem) (long)(offsetof(struct pthread, mem) - sizeof(struct pthread)) - -MULTIPLE_THREADS_OFFSET thread_offsetof (header.multiple_threads) -TID_OFFSET thread_offsetof (tid) diff --git a/sysdeps/alpha/nptl/tls.h b/sysdeps/alpha/nptl/tls.h index 860cc46d88..c260078c86 100644 --- a/sysdeps/alpha/nptl/tls.h +++ b/sysdeps/alpha/nptl/tls.h @@ -109,8 +109,6 @@ typedef struct } \ while (0) -#else /* __ASSEMBLER__ */ -# include #endif /* __ASSEMBLER__ */ #endif /* tls.h */ diff --git a/sysdeps/arc/nptl/Makefile b/sysdeps/arc/nptl/Makefile deleted file mode 100644 index d85b47416a..0000000000 --- a/sysdeps/arc/nptl/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# NPTL makefile fragment for ARC. -# Copyright (C) 2020-2021 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 -# . - -ifeq ($(subdir),csu) -gen-as-const-headers += tcb-offsets.sym -endif diff --git a/sysdeps/arc/nptl/tcb-offsets.sym b/sysdeps/arc/nptl/tcb-offsets.sym deleted file mode 100644 index 64c432c22e..0000000000 --- a/sysdeps/arc/nptl/tcb-offsets.sym +++ /dev/null @@ -1,11 +0,0 @@ -#include -#include - --- Derive offsets relative to the thread register. -#define thread_offsetof(mem) (long)(offsetof (struct pthread, mem) - sizeof (struct pthread)) - -MULTIPLE_THREADS_OFFSET offsetof (struct pthread, header.multiple_threads) -TLS_PRE_TCB_SIZE sizeof (struct pthread) -TLS_TCB_SIZE sizeof (tcbhead_t) - -PTHREAD_TID offsetof (struct pthread, tid) diff --git a/sysdeps/arm/nptl/Makefile b/sysdeps/arm/nptl/Makefile index 44154bff37..2e8efe7170 100644 --- a/sysdeps/arm/nptl/Makefile +++ b/sysdeps/arm/nptl/Makefile @@ -15,10 +15,6 @@ # License along with the GNU C Library. If not, see # . -ifeq ($(subdir),csu) -gen-as-const-headers += tcb-offsets.sym -endif - ifeq ($(subdir),nptl) # This test relies on compiling part of the binary with EH information, # part without, and unwinding through. The .ARM.exidx tables have diff --git a/sysdeps/arm/nptl/tcb-offsets.sym b/sysdeps/arm/nptl/tcb-offsets.sym deleted file mode 100644 index bf9c0a1c17..0000000000 --- a/sysdeps/arm/nptl/tcb-offsets.sym +++ /dev/null @@ -1,10 +0,0 @@ -#include -#include - --- - --- Derive offsets relative to the thread register. -#define thread_offsetof(mem) (long)(offsetof(struct pthread, mem) - sizeof(struct pthread)) - -MULTIPLE_THREADS_OFFSET thread_offsetof (header.multiple_threads) -TID_OFFSET thread_offsetof (tid) diff --git a/sysdeps/arm/nptl/tls.h b/sysdeps/arm/nptl/tls.h index 57e039fc0f..9662da39ab 100644 --- a/sysdeps/arm/nptl/tls.h +++ b/sysdeps/arm/nptl/tls.h @@ -26,9 +26,6 @@ # include # include # include - -#else /* __ASSEMBLER__ */ -# include #endif /* __ASSEMBLER__ */ diff --git a/sysdeps/csky/Makefile b/sysdeps/csky/Makefile index 0db09dccce..1ced510c2d 100644 --- a/sysdeps/csky/Makefile +++ b/sysdeps/csky/Makefile @@ -1,7 +1,3 @@ -ifeq ($(subdir),csu) -gen-as-const-headers += tcb-offsets.sym -endif - ASFLAGS-.os += $(pic-ccflag) ifeq ($(subdir),gmon) diff --git a/sysdeps/csky/nptl/Makefile b/sysdeps/csky/nptl/Makefile deleted file mode 100644 index a16a8b63ca..0000000000 --- a/sysdeps/csky/nptl/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (C) 2018-2021 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 -# . - -ifeq ($(subdir),csu) -gen-as-const-headers += tcb-offsets.sym -endif diff --git a/sysdeps/csky/nptl/tcb-offsets.sym b/sysdeps/csky/nptl/tcb-offsets.sym deleted file mode 100644 index f1105205c0..0000000000 --- a/sysdeps/csky/nptl/tcb-offsets.sym +++ /dev/null @@ -1,10 +0,0 @@ -#include -#include - --- - --- Derive offsets relative to the thread register. -#define thread_offsetof(mem) (long)(offsetof (struct pthread, mem) - sizeof (struct pthread)) - -MULTIPLE_THREADS_OFFSET thread_offsetof (header.multiple_threads) -TID_OFFSET thread_offsetof (tid) diff --git a/sysdeps/csky/nptl/tls.h b/sysdeps/csky/nptl/tls.h index 64dcaec279..afd1b3bbb7 100644 --- a/sysdeps/csky/nptl/tls.h +++ b/sysdeps/csky/nptl/tls.h @@ -34,7 +34,6 @@ __result; }) #else -# include /* Define r31 as thread pointer register. */ # define READ_THREAD_POINTER() \ mov r0, r31; diff --git a/sysdeps/hppa/nptl/Makefile b/sysdeps/hppa/nptl/Makefile deleted file mode 100644 index 329a57a473..0000000000 --- a/sysdeps/hppa/nptl/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (C) 2005-2021 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 -# . - -ifeq ($(subdir),csu) -gen-as-const-headers += tcb-offsets.sym -endif diff --git a/sysdeps/hppa/nptl/tcb-offsets.sym b/sysdeps/hppa/nptl/tcb-offsets.sym deleted file mode 100644 index 6e852f35b1..0000000000 --- a/sysdeps/hppa/nptl/tcb-offsets.sym +++ /dev/null @@ -1,17 +0,0 @@ -#include -#include - -RESULT offsetof (struct pthread, result) -TID offsetof (struct pthread, tid) -CANCELHANDLING offsetof (struct pthread, cancelhandling) -CLEANUP_JMP_BUF offsetof (struct pthread, cleanup_jmp_buf) -MULTIPLE_THREADS_OFFSET offsetof (struct pthread, header.multiple_threads) -TLS_PRE_TCB_SIZE sizeof (struct pthread) -MUTEX_FUTEX offsetof (pthread_mutex_t, __data.__lock) - --- Use a thread_offset when working with asm to make things simpler --- This way we get the offset of a member in the struct pthread that --- preceeds the thread pointer (which points to the dtv). -#define thread_offsetof(mem) (unsigned int)(offsetof(struct pthread, mem) - sizeof(struct pthread)) -TID_THREAD_OFFSET thread_offsetof (tid) -MULTIPLE_THREADS_THREAD_OFFSET thread_offsetof (header.multiple_threads) diff --git a/sysdeps/hppa/nptl/tls.h b/sysdeps/hppa/nptl/tls.h index 62bfb96548..c4039038d3 100644 --- a/sysdeps/hppa/nptl/tls.h +++ b/sysdeps/hppa/nptl/tls.h @@ -26,9 +26,6 @@ # include # include # include - -#else /* __ASSEMBLER__ */ -# include #endif /* __ASSEMBLER__ */ #ifndef __ASSEMBLER__ diff --git a/sysdeps/m68k/nptl/Makefile b/sysdeps/m68k/nptl/Makefile deleted file mode 100644 index ed9ddd1648..0000000000 --- a/sysdeps/m68k/nptl/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (C) 2010-2021 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 -# . - -ifeq ($(subdir),csu) -gen-as-const-headers += tcb-offsets.sym -endif diff --git a/sysdeps/m68k/nptl/tcb-offsets.sym b/sysdeps/m68k/nptl/tcb-offsets.sym deleted file mode 100644 index 241fb8b47c..0000000000 --- a/sysdeps/m68k/nptl/tcb-offsets.sym +++ /dev/null @@ -1,10 +0,0 @@ -#include -#include - --- - --- Derive offsets relative to the thread register. -#define thread_offsetof(mem) (long)(offsetof(struct pthread, mem) - TLS_TCB_OFFSET - TLS_PRE_TCB_SIZE) - -MULTIPLE_THREADS_OFFSET thread_offsetof (header.multiple_threads) -TID_OFFSET thread_offsetof (tid) diff --git a/sysdeps/m68k/nptl/tls.h b/sysdeps/m68k/nptl/tls.h index 3acedc8465..ab2a1d54bd 100644 --- a/sysdeps/m68k/nptl/tls.h +++ b/sysdeps/m68k/nptl/tls.h @@ -26,9 +26,6 @@ # include # include # include - -#else /* __ASSEMBLER__ */ -# include #endif /* __ASSEMBLER__ */ #ifndef __ASSEMBLER__ diff --git a/sysdeps/microblaze/nptl/Makefile b/sysdeps/microblaze/nptl/Makefile deleted file mode 100644 index 6d23959e30..0000000000 --- a/sysdeps/microblaze/nptl/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (C) 2005-2021 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 -# . - -ifeq ($(subdir),csu) -gen-as-const-headers += tcb-offsets.sym -endif diff --git a/sysdeps/microblaze/nptl/tcb-offsets.sym b/sysdeps/microblaze/nptl/tcb-offsets.sym deleted file mode 100644 index 614f0dfed6..0000000000 --- a/sysdeps/microblaze/nptl/tcb-offsets.sym +++ /dev/null @@ -1,10 +0,0 @@ -#include -#include - --- - --- Abuse tls.h macros to derive offsets relative to the thread register. -#define thread_offsetof(mem) (long)(offsetof (struct pthread, mem) - sizeof (struct pthread)) - -MULTIPLE_THREADS_OFFSET thread_offsetof (header.multiple_threads) -TID_OFFSET thread_offsetof (tid) diff --git a/sysdeps/microblaze/nptl/tls.h b/sysdeps/microblaze/nptl/tls.h index de9d2b693b..2ad2219fe5 100644 --- a/sysdeps/microblaze/nptl/tls.h +++ b/sysdeps/microblaze/nptl/tls.h @@ -26,9 +26,6 @@ # include # include # include - -#else /* __ASSEMBLER__ */ -# include #endif /* __ASSEMBLER__ */ #ifndef __ASSEMBLER__ diff --git a/sysdeps/mips/nptl/Makefile b/sysdeps/mips/nptl/Makefile deleted file mode 100644 index 329a57a473..0000000000 --- a/sysdeps/mips/nptl/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (C) 2005-2021 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 -# . - -ifeq ($(subdir),csu) -gen-as-const-headers += tcb-offsets.sym -endif diff --git a/sysdeps/mips/nptl/tcb-offsets.sym b/sysdeps/mips/nptl/tcb-offsets.sym deleted file mode 100644 index 9ea25b94a8..0000000000 --- a/sysdeps/mips/nptl/tcb-offsets.sym +++ /dev/null @@ -1,10 +0,0 @@ -#include -#include - --- - --- Abuse tls.h macros to derive offsets relative to the thread register. -#define thread_offsetof(mem) (long)(offsetof(struct pthread, mem) - TLS_TCB_OFFSET - TLS_PRE_TCB_SIZE) - -MULTIPLE_THREADS_OFFSET thread_offsetof (header.multiple_threads) -TID_OFFSET thread_offsetof (tid) diff --git a/sysdeps/mips/nptl/tls.h b/sysdeps/mips/nptl/tls.h index 797e661dc1..ce7c6606be 100644 --- a/sysdeps/mips/nptl/tls.h +++ b/sysdeps/mips/nptl/tls.h @@ -50,8 +50,6 @@ #endif #else /* __ASSEMBLER__ */ -# include - # if __mips_isa_rev >= 2 # define READ_THREAD_POINTER(rd) rdhwr rd, $29 # else diff --git a/sysdeps/nios2/Makefile b/sysdeps/nios2/Makefile index f368a12b2d..825ed1357e 100644 --- a/sysdeps/nios2/Makefile +++ b/sysdeps/nios2/Makefile @@ -24,7 +24,3 @@ long-double-fcts = no ifeq ($(subdir),soft-fp) sysdep_routines += $(gcc-single-routines) $(gcc-double-routines) endif - -ifeq ($(subdir),csu) -gen-as-const-headers += tcb-offsets.sym -endif diff --git a/sysdeps/riscv/nptl/Makefile b/sysdeps/riscv/nptl/Makefile deleted file mode 100644 index cca67db324..0000000000 --- a/sysdeps/riscv/nptl/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for sysdeps/riscv/nptl. -# Copyright (C) 2005-2021 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 -# . - -ifeq ($(subdir),csu) -gen-as-const-headers += tcb-offsets.sym -endif diff --git a/sysdeps/riscv/nptl/tcb-offsets.sym b/sysdeps/riscv/nptl/tcb-offsets.sym deleted file mode 100644 index ab4981f2e2..0000000000 --- a/sysdeps/riscv/nptl/tcb-offsets.sym +++ /dev/null @@ -1,6 +0,0 @@ -#include -#include - -#define thread_offsetof(mem) (long)(offsetof (struct pthread, mem) - TLS_TCB_OFFSET - TLS_PRE_TCB_SIZE) - -MULTIPLE_THREADS_OFFSET thread_offsetof (header.multiple_threads)