diff options
author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-05-27 09:11:10 -0300 |
---|---|---|
committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-06-04 09:52:28 -0300 |
commit | eaa53d0f77691e37aa6f22e18205a2ba019e1a1c (patch) | |
tree | 7f9445d151b654a571af34c638564875030faf85 /sysdeps | |
parent | 642213e043040b2e3b5aad936986195491107e34 (diff) | |
download | glibc-eaa53d0f77691e37aa6f22e18205a2ba019e1a1c.zip glibc-eaa53d0f77691e37aa6f22e18205a2ba019e1a1c.tar.gz glibc-eaa53d0f77691e37aa6f22e18205a2ba019e1a1c.tar.bz2 |
nptl: Remove exit-thread.h
No function change. The code is used only for Linux, besides
being included in generic code.
Diffstat (limited to 'sysdeps')
-rw-r--r-- | sysdeps/generic/exit-thread.h | 28 | ||||
-rw-r--r-- | sysdeps/nptl/libc_start_call_main.h | 3 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/exit-thread.h | 37 |
3 files changed, 2 insertions, 66 deletions
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 - <https://www.gnu.org/licenses/>. */ - -/* 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 - <https://www.gnu.org/licenses/>. */ - -#include <sysdep.h> - -/* 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); - } -} |