From e0db65176fa88b9497cbd6362b24e3225382bfb6 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 13 May 2014 09:49:20 -0700 Subject: Clean up __exit_thread. --- sysdeps/unix/sysv/linux/Makefile | 2 +- sysdeps/unix/sysv/linux/exit-thread.S | 22 -------------------- sysdeps/unix/sysv/linux/exit-thread.h | 38 +++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 23 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/exit-thread.S create mode 100644 sysdeps/unix/sysv/linux/exit-thread.h (limited to 'sysdeps/unix/sysv') diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 692487fc7b..02eda45067 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -141,7 +141,7 @@ endif ifeq ($(subdir),posix) sysdep_headers += bits/initspin.h -sysdep_routines += exit-thread sched_getcpu +sysdep_routines += sched_getcpu tests += tst-getcpu endif diff --git a/sysdeps/unix/sysv/linux/exit-thread.S b/sysdeps/unix/sysv/linux/exit-thread.S deleted file mode 100644 index 741cea4c58..0000000000 --- a/sysdeps/unix/sysv/linux/exit-thread.S +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright (C) 1991-2014 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 - -PSEUDO (__exit_thread, exit, 1) - /* Shouldn't get here. */ -PSEUDO_END(__exit_thread) diff --git a/sysdeps/unix/sysv/linux/exit-thread.h b/sysdeps/unix/sysv/linux/exit-thread.h new file mode 100644 index 0000000000..52891dd22f --- /dev/null +++ b/sysdeps/unix/sysv/linux/exit-thread.h @@ -0,0 +1,38 @@ +/* Call to terminate the current thread. Linux version. + Copyright (C) 2014 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_DECL (err); + INTERNAL_SYSCALL (exit, err, 1, 0); + } +} -- cgit 1.4.1