[4/4] Remove single-thread.h
Checks
| Context |
Check |
Description |
| dj/TryBot-apply_patch |
success
|
Patch applied to master at the time it was sent
|
| dj/TryBot-32bit |
success
|
Build for i686
|
Commit Message
And move SINGLE_THREAD_P macro to sys/single_threaded.h.
---
include/sys/single_threaded.h | 15 +++++++---
sysdeps/generic/single-thread.h | 25 ----------------
sysdeps/mach/hurd/sysdep-cancel.h | 5 ----
sysdeps/unix/sysdep.h | 2 +-
.../unix/sysv/linux/aarch64/single-thread.h | 2 --
sysdeps/unix/sysv/linux/arc/single-thread.h | 2 --
sysdeps/unix/sysv/linux/arm/single-thread.h | 2 --
sysdeps/unix/sysv/linux/hppa/single-thread.h | 2 --
.../sysv/linux/microblaze/single-thread.h | 2 --
sysdeps/unix/sysv/linux/s390/single-thread.h | 2 --
sysdeps/unix/sysv/linux/single-thread.h | 30 -------------------
.../unix/sysv/linux/x86_64/single-thread.h | 2 --
12 files changed, 12 insertions(+), 79 deletions(-)
delete mode 100644 sysdeps/generic/single-thread.h
delete mode 100644 sysdeps/unix/sysv/linux/aarch64/single-thread.h
delete mode 100644 sysdeps/unix/sysv/linux/arc/single-thread.h
delete mode 100644 sysdeps/unix/sysv/linux/arm/single-thread.h
delete mode 100644 sysdeps/unix/sysv/linux/hppa/single-thread.h
delete mode 100644 sysdeps/unix/sysv/linux/microblaze/single-thread.h
delete mode 100644 sysdeps/unix/sysv/linux/s390/single-thread.h
delete mode 100644 sysdeps/unix/sysv/linux/single-thread.h
delete mode 100644 sysdeps/unix/sysv/linux/x86_64/single-thread.h
@@ -1,12 +1,19 @@
-#include <misc/sys/single_threaded.h>
+#ifndef __ASSEMBLER__
+# include <misc/sys/single_threaded.h>
-#ifndef _ISOMAC
+# ifndef _ISOMAC
libc_hidden_proto (__libc_single_threaded);
-# ifdef SHARED
+# ifdef SHARED
extern __typeof (__libc_single_threaded) *__libc_external_single_threaded
attribute_hidden;
+# endif
+
+# define SINGLE_THREAD_P (__libc_single_threaded != 0)
+
+# define RTLD_SINGLE_THREAD_P SINGLE_THREAD_P
+
# endif
-#endif
+#endif /* __ASSEMBLER__ */
deleted file mode 100644
@@ -1,25 +0,0 @@
-/* Single thread optimization, generic version.
- Copyright (C) 2019-2022 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/>. */
-
-#ifndef _SINGLE_THREAD_H
-#define _SINGLE_THREAD_H
-
-#define SINGLE_THREAD_P (0)
-#define RTLD_SINGLE_THREAD_P (0)
-
-#endif /* _SINGLE_THREAD_H */
@@ -6,11 +6,6 @@ void __pthread_disable_asynccancel (int oldtype);
#pragma weak __pthread_enable_asynccancel
#pragma weak __pthread_disable_asynccancel
-/* Always multi-thread (since there's at least the sig handler), but no
- handling enabled. */
-#define SINGLE_THREAD_P (0)
-#define RTLD_SINGLE_THREAD_P (0)
-
#define LIBC_CANCEL_ASYNC() ({ \
int __cancel_oldtype = 0; \
if (__pthread_enable_asynccancel) \
@@ -16,7 +16,7 @@
<https://www.gnu.org/licenses/>. */
#include <sysdeps/generic/sysdep.h>
-#include <single-thread.h>
+#include <sys/single_threaded.h>
#include <sys/syscall.h>
#define HAVE_SYSCALLS
deleted file mode 100644
@@ -1,2 +0,0 @@
-#define SINGLE_THREAD_BY_GLOBAL
-#include_next <single-thread.h>
deleted file mode 100644
@@ -1,2 +0,0 @@
-#define SINGLE_THREAD_BY_GLOBAL
-#include_next <single-thread.h>
deleted file mode 100644
@@ -1,2 +0,0 @@
-#define SINGLE_THREAD_BY_GLOBAL
-#include_next <single-thread.h>
deleted file mode 100644
@@ -1,2 +0,0 @@
-#define SINGLE_THREAD_BY_GLOBAL
-#include_next <single-thread.h>
deleted file mode 100644
@@ -1,2 +0,0 @@
-#define SINGLE_THREAD_BY_GLOBAL
-#include_next <single-thread.h>
deleted file mode 100644
@@ -1,2 +0,0 @@
-#define SINGLE_THREAD_BY_GLOBAL
-#include_next <single-thread.h>
deleted file mode 100644
@@ -1,30 +0,0 @@
-/* Single thread optimization, Linux version.
- Copyright (C) 2019-2022 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/>. */
-
-#ifndef _SINGLE_THREAD_H
-#define _SINGLE_THREAD_H
-
-#ifndef __ASSEMBLER__
-# include <sys/single_threaded.h>
-#endif
-
-#define SINGLE_THREAD_P (__libc_single_threaded != 0)
-
-#define RTLD_SINGLE_THREAD_P SINGLE_THREAD_P
-
-#endif /* _SINGLE_THREAD_H */
deleted file mode 100644
@@ -1,2 +0,0 @@
-#define SINGLE_THREAD_BY_GLOBAL
-#include_next <single-thread.h>