From patchwork Mon May 1 13:06:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 68594 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 235733857011 for ; Mon, 1 May 2023 13:06:48 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from sonata.ens-lyon.org (domu-toccata.ens-lyon.fr [140.77.166.138]) by sourceware.org (Postfix) with ESMTPS id 0925A3857342 for ; Mon, 1 May 2023 13:06:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0925A3857342 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=bounce.ens-lyon.org Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 3D2642018A; Mon, 1 May 2023 15:06:28 +0200 (CEST) Received: from sonata.ens-lyon.org ([127.0.0.1]) by localhost (sonata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4tKeuPhCea07; Mon, 1 May 2023 15:06:27 +0200 (CEST) Received: from begin (lfbn-bor-1-1163-184.w92-158.abo.wanadoo.fr [92.158.138.184]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by sonata.ens-lyon.org (Postfix) with ESMTPSA id 41D3A20184; Mon, 1 May 2023 15:06:27 +0200 (CEST) Received: from samy by begin with local (Exim 4.96) (envelope-from ) id 1ptTEY-00G8iR-2u; Mon, 01 May 2023 15:06:26 +0200 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault , commit-hurd@gnu.org Subject: [hurd,commited] hurd 64bit: Fix pthread_t/thread_t type to long Date: Mon, 1 May 2023 15:06:26 +0200 Message-Id: <20230501130626.3846744-1-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-13.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_DNSWL_LOW, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" So that they can be trivially cast to pointer type, like with nptl. --- htl/Makefile | 2 ++ sysdeps/htl/bits/pthread.h | 2 +- sysdeps/htl/bits/thread-shared-types.h | 2 +- sysdeps/htl/bits/types/__pthread_t.h | 24 +++++++++++++++++++ sysdeps/htl/bits/types/__thrd_t.h | 24 +++++++++++++++++++ .../hurd/i386/htl/bits/types/__pthread_t.h | 24 +++++++++++++++++++ .../mach/hurd/i386/htl/bits/types/__thrd_t.h | 24 +++++++++++++++++++ 7 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 sysdeps/htl/bits/types/__pthread_t.h create mode 100644 sysdeps/htl/bits/types/__thrd_t.h create mode 100644 sysdeps/mach/hurd/i386/htl/bits/types/__pthread_t.h create mode 100644 sysdeps/mach/hurd/i386/htl/bits/types/__thrd_t.h diff --git a/htl/Makefile b/htl/Makefile index 0587fd164c..67a2f7fe72 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -159,6 +159,8 @@ headers := \ bits/types/struct___pthread_mutexattr.h \ bits/types/struct___pthread_rwlock.h \ bits/types/struct___pthread_rwlockattr.h \ + bits/types/__pthread_t.h \ + bits/types/__thrd_t.h \ bits/semaphore.h distribute := diff --git a/sysdeps/htl/bits/pthread.h b/sysdeps/htl/bits/pthread.h index b966fc8824..57589a191c 100644 --- a/sysdeps/htl/bits/pthread.h +++ b/sysdeps/htl/bits/pthread.h @@ -19,7 +19,7 @@ #ifndef _BITS_PTHREAD_H #define _BITS_PTHREAD_H 1 -typedef int __pthread_t; +#include /* Return true if __T1 and __T2 both name the same thread. Otherwise, false. */ diff --git a/sysdeps/htl/bits/thread-shared-types.h b/sysdeps/htl/bits/thread-shared-types.h index e7135aaf49..50c9bd4724 100644 --- a/sysdeps/htl/bits/thread-shared-types.h +++ b/sysdeps/htl/bits/thread-shared-types.h @@ -21,9 +21,9 @@ #include #include +#include typedef int __tss_t; -typedef int __thrd_t; typedef union { diff --git a/sysdeps/htl/bits/types/__pthread_t.h b/sysdeps/htl/bits/types/__pthread_t.h new file mode 100644 index 0000000000..9e48351958 --- /dev/null +++ b/sysdeps/htl/bits/types/__pthread_t.h @@ -0,0 +1,24 @@ +/* Thread type. Generic version. + Copyright (C) 2002-2023 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 _BITS_TYPES___PTHREAD_T_H +#define _BITS_TYPES___PTHREAD_T_H 1 + +typedef long int __pthread_t; + +#endif /* bits/types/__pthread_t.h */ diff --git a/sysdeps/htl/bits/types/__thrd_t.h b/sysdeps/htl/bits/types/__thrd_t.h new file mode 100644 index 0000000000..8b3aa5c805 --- /dev/null +++ b/sysdeps/htl/bits/types/__thrd_t.h @@ -0,0 +1,24 @@ +/* Thread type. Generic version. + Copyright (C) 2002-2023 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 _BITS_TYPES___THRD_T_H +#define _BITS_TYPES___THRD_T_H 1 + +typedef long int __thrd_t; + +#endif /* bits/types/__thrd_t.h */ diff --git a/sysdeps/mach/hurd/i386/htl/bits/types/__pthread_t.h b/sysdeps/mach/hurd/i386/htl/bits/types/__pthread_t.h new file mode 100644 index 0000000000..b1af0f3793 --- /dev/null +++ b/sysdeps/mach/hurd/i386/htl/bits/types/__pthread_t.h @@ -0,0 +1,24 @@ +/* Thread type. i386 version. + Copyright (C) 2002-2023 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 _BITS_TYPES___PTHREAD_T_H +#define _BITS_TYPES___PTHREAD_T_H 1 + +typedef int __pthread_t; + +#endif /* bits/types/__pthread_t.h */ diff --git a/sysdeps/mach/hurd/i386/htl/bits/types/__thrd_t.h b/sysdeps/mach/hurd/i386/htl/bits/types/__thrd_t.h new file mode 100644 index 0000000000..2e20c292b3 --- /dev/null +++ b/sysdeps/mach/hurd/i386/htl/bits/types/__thrd_t.h @@ -0,0 +1,24 @@ +/* Thread type. i386 version. + Copyright (C) 2002-2023 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 _BITS_TYPES___THRD_T_H +#define _BITS_TYPES___THRD_T_H 1 + +typedef int __thrd_t; + +#endif /* bits/types/__thrd_t.h */