From eaa53d0f77691e37aa6f22e18205a2ba019e1a1c Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Thu, 27 May 2021 09:11:10 -0300 Subject: [PATCH] nptl: Remove exit-thread.h No function change. The code is used only for Linux, besides being included in generic code. --- csu/libc-start.c | 1 - nptl/pthread_create.c | 4 ++-- sysdeps/generic/exit-thread.h | 28 -------------------------- sysdeps/nptl/libc_start_call_main.h | 3 ++- sysdeps/unix/sysv/linux/exit-thread.h | 37 ----------------------------------- 5 files changed, 4 insertions(+), 69 deletions(-) delete mode 100644 sysdeps/generic/exit-thread.h delete mode 100644 sysdeps/unix/sysv/linux/exit-thread.h diff --git a/csu/libc-start.c b/csu/libc-start.c index 8688cba..5b5913e 100644 --- a/csu/libc-start.c +++ b/csu/libc-start.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c index 2d2535b..52d6738 100644 --- a/nptl/pthread_create.c +++ b/nptl/pthread_create.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include @@ -575,7 +574,8 @@ start_thread (void *arg) The exit code is zero since in case all threads exit by calling 'pthread_exit' the exit status must be 0 (zero). */ - __exit_thread (); + while (1) + INTERNAL_SYSCALL_CALL (exit, 0); /* NOTREACHED */ } diff --git a/sysdeps/generic/exit-thread.h b/sysdeps/generic/exit-thread.h deleted file mode 100644 index 676ef55..0000000 --- a/sysdeps/generic/exit-thread.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Call to terminate the current thread. Stub version. - Copyright (C) 2014-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 - . */ - -/* This causes the current thread to exit, without affecting other - threads in the process if there are any. If there are no other - threads left, then this has the effect of _exit (0). */ - -static inline void __attribute__ ((noreturn, always_inline, unused)) -__exit_thread (void) -{ - while (1) - asm ("write me!"); -} diff --git a/sysdeps/nptl/libc_start_call_main.h b/sysdeps/nptl/libc_start_call_main.h index c579c65..b56bf34 100644 --- a/sysdeps/nptl/libc_start_call_main.h +++ b/sysdeps/nptl/libc_start_call_main.h @@ -67,7 +67,8 @@ __libc_start_call_main (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL), result = 0; if (! atomic_decrement_and_test (&__nptl_nthreads)) /* Not much left to do but to exit the thread, not the process. */ - __exit_thread (); + while (1) + INTERNAL_SYSCALL_CALL (exit, 0); } exit (result); diff --git a/sysdeps/unix/sysv/linux/exit-thread.h b/sysdeps/unix/sysv/linux/exit-thread.h deleted file mode 100644 index 9e1b7f3..0000000 --- a/sysdeps/unix/sysv/linux/exit-thread.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Call to terminate the current thread. Linux version. - Copyright (C) 2014-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 - . */ - -#include - -/* This causes the current thread to exit, without affecting other - threads in the process if there are any. If there are no other - threads left, then this has the effect of _exit (0). */ - -static inline void __attribute__ ((noreturn, always_inline, unused)) -__exit_thread (void) -{ - /* Doing this in a loop is mostly just to satisfy the compiler that the - function really qualifies as noreturn. It also means that in some - pathological situation where the system call does not get made or does - not work, the thread will simply spin rather than running off the end - of the caller and doing unexpectedly strange things. */ - while (1) - { - INTERNAL_SYSCALL_CALL (exit, 0); - } -} -- 2.7.4