[Glibc-bsd-commits] r5792 - in trunk/glibc-ports: fbtl fbtl/sysdeps/pthread/bits kfreebsd kfreebsd/fbtl kfreebsd/i386 kfreebsd/i386/fbtl kfreebsd/x86_64 kfreebsd/x86_64/fbtl
aurel32 at alioth.debian.org
aurel32 at alioth.debian.org
Tue Oct 20 13:15:35 UTC 2015
Author: aurel32
Date: 2015-10-20 13:15:35 +0000 (Tue, 20 Oct 2015)
New Revision: 5792
Modified:
trunk/glibc-ports/fbtl/pthreadP.h
trunk/glibc-ports/fbtl/sysdeps/pthread/bits/libc-lock.h
trunk/glibc-ports/fbtl/sysdeps/pthread/bits/libc-lockP.h
trunk/glibc-ports/fbtl/sysdeps/pthread/bits/stdio-lock.h
trunk/glibc-ports/kfreebsd/aio_sigqueue.c
trunk/glibc-ports/kfreebsd/fbtl/libc_multiple_threads.c
trunk/glibc-ports/kfreebsd/gai_sigqueue.c
trunk/glibc-ports/kfreebsd/i386/fbtl/sysdep-cancel.h
trunk/glibc-ports/kfreebsd/i386/sysdep.h
trunk/glibc-ports/kfreebsd/not-cancel.h
trunk/glibc-ports/kfreebsd/x86_64/fbtl/sysdep-cancel.h
trunk/glibc-ports/kfreebsd/x86_64/sysdep.h
Log:
Merge from upstream:
commit 4f41c682f3f0a0ad69eeac38a6b270f4362c3a02
Author: Siddhesh Poyarekar <siddhesh at redhat.com>
Date: Mon Nov 24 15:03:45 2014 +0530
Remove NOT_IN_libc
Replace with !IS_IN (libc). This completes the transition from
the IS_IN/NOT_IN macros to the IN_MODULE macro set.
The generated code is unchanged on x86_64.
Modified: trunk/glibc-ports/fbtl/pthreadP.h
===================================================================
--- trunk/glibc-ports/fbtl/pthreadP.h 2015-10-20 13:06:28 UTC (rev 5791)
+++ trunk/glibc-ports/fbtl/pthreadP.h 2015-10-20 13:15:35 UTC (rev 5792)
@@ -275,7 +275,7 @@
#define CANCEL_RESET(oldtype) \
__pthread_disable_asynccancel (oldtype)
-#if !defined NOT_IN_libc
+#if IS_IN (libc)
/* Same as CANCEL_ASYNC, but for use in libc.so. */
# define LIBC_CANCEL_ASYNC() \
__libc_enable_asynccancel ()
Modified: trunk/glibc-ports/fbtl/sysdeps/pthread/bits/libc-lock.h
===================================================================
--- trunk/glibc-ports/fbtl/sysdeps/pthread/bits/libc-lock.h 2015-10-20 13:06:28 UTC (rev 5791)
+++ trunk/glibc-ports/fbtl/sysdeps/pthread/bits/libc-lock.h 2015-10-20 13:15:35 UTC (rev 5792)
@@ -26,7 +26,7 @@
/* Mutex type. */
#if defined _LIBC || defined _IO_MTSAFE_IO
-# if (defined NOT_IN_libc && !IS_IN (libpthread)) || !defined _LIBC
+# if (!IS_IN (libc) && !IS_IN (libpthread)) || !defined _LIBC
typedef struct { pthread_mutex_t mutex; } __libc_lock_recursive_t;
# else
typedef struct { int lock; int cnt; void *owner; } __libc_lock_recursive_t;
@@ -47,7 +47,7 @@
/* Define an initialized recursive lock variable NAME with storage
class CLASS. */
-#if defined _LIBC && (!defined NOT_IN_libc || IS_IN (libpthread))
+#if defined _LIBC && (IS_IN (libc) || IS_IN (libpthread))
# if LLL_LOCK_INITIALIZER == 0
# define __libc_lock_define_initialized_recursive(CLASS,NAME) \
CLASS __libc_lock_recursive_t NAME;
@@ -65,7 +65,7 @@
#endif
/* Initialize a recursive mutex. */
-#if defined _LIBC && (!defined NOT_IN_libc || IS_IN (libpthread))
+#if defined _LIBC && (IS_IN (libc) || IS_IN (libpthread))
# define __libc_lock_init_recursive(NAME) \
((NAME) = (__libc_lock_recursive_t) _LIBC_LOCK_RECURSIVE_INITIALIZER, 0)
#else
@@ -83,7 +83,7 @@
#endif
/* Finalize recursive named lock. */
-#if defined _LIBC && (!defined NOT_IN_libc || IS_IN (libpthread))
+#if defined _LIBC && (IS_IN (libc) || IS_IN (libpthread))
# define __libc_lock_fini_recursive(NAME) ((void) 0)
#else
# define __libc_lock_fini_recursive(NAME) \
@@ -91,7 +91,7 @@
#endif
/* Lock the recursive named lock variable. */
-#if defined _LIBC && (!defined NOT_IN_libc || IS_IN (libpthread))
+#if defined _LIBC && (IS_IN (libc) || IS_IN (libpthread))
# define __libc_lock_lock_recursive(NAME) \
do { \
void *self = THREAD_SELF; \
@@ -108,7 +108,7 @@
#endif
/* Try to lock the recursive named lock variable. */
-#if defined _LIBC && (!defined NOT_IN_libc || IS_IN (libpthread))
+#if defined _LIBC && (IS_IN (libc) || IS_IN (libpthread))
# define __libc_lock_trylock_recursive(NAME) \
({ \
int result = 0; \
@@ -133,7 +133,7 @@
#endif
/* Unlock the recursive named lock variable. */
-#if defined _LIBC && (!defined NOT_IN_libc || IS_IN (libpthread))
+#if defined _LIBC && (IS_IN (libc) || IS_IN (libpthread))
/* We do no error checking here. */
# define __libc_lock_unlock_recursive(NAME) \
do { \
Modified: trunk/glibc-ports/fbtl/sysdeps/pthread/bits/libc-lockP.h
===================================================================
--- trunk/glibc-ports/fbtl/sysdeps/pthread/bits/libc-lockP.h 2015-10-20 13:06:28 UTC (rev 5791)
+++ trunk/glibc-ports/fbtl/sysdeps/pthread/bits/libc-lockP.h 2015-10-20 13:15:35 UTC (rev 5792)
@@ -35,7 +35,7 @@
#include <pthread-functions.h>
/* Mutex type. */
-#if defined NOT_IN_libc && !IS_IN (libpthread)
+#if !IS_IN (libc) && !IS_IN (libpthread)
typedef pthread_mutex_t __libc_lock_t;
#else
typedef int __libc_lock_t;
@@ -69,7 +69,7 @@
initialized locks must be set to one due to the lack of normal
atomic operations.) */
-#if !defined NOT_IN_libc || IS_IN (libpthread)
+#if IS_IN (libc) || IS_IN (libpthread)
# if LLL_LOCK_INITIALIZER == 0
# define __libc_lock_define_initialized(CLASS,NAME) \
CLASS __libc_lock_t NAME;
@@ -113,7 +113,7 @@
#endif
/* Call thread functions through the function pointer table. */
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN (libc)
# define PTFAVAIL(NAME) __libc_pthread_functions_init
# define __libc_ptf_call(FUNC, ARGS, ELSE) \
(__libc_pthread_functions_init ? PTHFCT_CALL (ptr_##FUNC, ARGS) : ELSE)
@@ -130,13 +130,13 @@
/* Initialize the named lock variable, leaving it in a consistent, unlocked
state. */
-#if !defined NOT_IN_libc || IS_IN (libpthread)
+#if IS_IN (libc) || IS_IN (libpthread)
# define __libc_lock_init(NAME) ((NAME) = LLL_LOCK_INITIALIZER, 0)
#else
# define __libc_lock_init(NAME) \
__libc_maybe_call (__pthread_mutex_init, (&(NAME), NULL), 0)
#endif
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN (libc)
/* ((NAME) = (__libc_rwlock_t) PTHREAD_RWLOCK_INITIALIZER, 0) is
inefficient. */
# define __libc_rwlock_init(NAME) \
@@ -149,13 +149,13 @@
/* Finalize the named lock variable, which must be locked. It cannot be
used again until __libc_lock_init is called again on it. This must be
called on a lock variable before the containing storage is reused. */
-#if !defined NOT_IN_libc || IS_IN (libpthread)
+#if IS_IN (libc) || IS_IN (libpthread)
# define __libc_lock_fini(NAME) ((void) 0)
#else
# define __libc_lock_fini(NAME) \
__libc_maybe_call (__pthread_mutex_destroy, (&(NAME)), 0)
#endif
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN (libc)
# define __libc_rwlock_fini(NAME) ((void) 0)
#else
# define __libc_rwlock_fini(NAME) \
@@ -163,7 +163,7 @@
#endif
/* Lock the named lock variable. */
-#if !defined NOT_IN_libc || IS_IN (libpthread)
+#if IS_IN (libc) || IS_IN (libpthread)
# ifndef __libc_lock_lock
# define __libc_lock_lock(NAME) \
({ lll_lock (NAME, LLL_PRIVATE); 0; })
@@ -179,7 +179,7 @@
__libc_ptf_call (__pthread_rwlock_wrlock, (&(NAME)), 0)
/* Try to lock the named lock variable. */
-#if !defined NOT_IN_libc || IS_IN (libpthread)
+#if IS_IN (libc) || IS_IN (libpthread)
# ifndef __libc_lock_trylock
# define __libc_lock_trylock(NAME) \
lll_trylock (NAME)
@@ -198,7 +198,7 @@
__libc_maybe_call (__pthread_mutex_trylock, (&(NAME).mutex), 0)
/* Unlock the named lock variable. */
-#if !defined NOT_IN_libc || IS_IN (libpthread)
+#if IS_IN (libc) || IS_IN (libpthread)
# define __libc_lock_unlock(NAME) \
lll_unlock (NAME, LLL_PRIVATE)
#else
Modified: trunk/glibc-ports/fbtl/sysdeps/pthread/bits/stdio-lock.h
===================================================================
--- trunk/glibc-ports/fbtl/sysdeps/pthread/bits/stdio-lock.h 2015-10-20 13:06:28 UTC (rev 5791)
+++ trunk/glibc-ports/fbtl/sysdeps/pthread/bits/stdio-lock.h 2015-10-20 13:15:35 UTC (rev 5792)
@@ -84,7 +84,7 @@
#define _IO_cleanup_region_end(_doit) \
__libc_cleanup_region_end (_doit)
-#if defined _LIBC && !defined NOT_IN_libc
+#if defined _LIBC && IS_IN (libc)
# ifdef __EXCEPTIONS
# define _IO_acquire_lock(_fp) \
Modified: trunk/glibc-ports/kfreebsd/aio_sigqueue.c
===================================================================
--- trunk/glibc-ports/kfreebsd/aio_sigqueue.c 2015-10-20 13:06:28 UTC (rev 5791)
+++ trunk/glibc-ports/kfreebsd/aio_sigqueue.c 2015-10-20 13:15:35 UTC (rev 5792)
@@ -32,7 +32,7 @@
const union sigval val;
pid_t caller_pid;
{
-#ifdef NOT_IN_libc
+#if !IS_IN (libc)
return sigqueue(caller_pid, sig, val);
#else
return __sigqueue(caller_pid, sig, val);
Modified: trunk/glibc-ports/kfreebsd/fbtl/libc_multiple_threads.c
===================================================================
--- trunk/glibc-ports/kfreebsd/fbtl/libc_multiple_threads.c 2015-10-20 13:06:28 UTC (rev 5791)
+++ trunk/glibc-ports/kfreebsd/fbtl/libc_multiple_threads.c 2015-10-20 13:15:35 UTC (rev 5792)
@@ -18,7 +18,7 @@
#include <pthreadP.h>
-#ifndef NOT_IN_libc
+#if IS_IN (libc)
# ifndef TLS_MULTIPLE_THREADS_IN_TCB
/* Variable set to a nonzero value either if more than one thread runs or ran,
or if a single-threaded process is trying to cancel itself. See
Modified: trunk/glibc-ports/kfreebsd/gai_sigqueue.c
===================================================================
--- trunk/glibc-ports/kfreebsd/gai_sigqueue.c 2015-10-20 13:06:28 UTC (rev 5791)
+++ trunk/glibc-ports/kfreebsd/gai_sigqueue.c 2015-10-20 13:15:35 UTC (rev 5792)
@@ -32,7 +32,7 @@
const union sigval val;
pid_t caller_pid;
{
-#ifdef NOT_IN_libc
+#if !IS_IN(libc)
return sigqueue(caller_pid, sig, val);
#else
return __sigqueue(caller_pid, sig, val);
Modified: trunk/glibc-ports/kfreebsd/i386/fbtl/sysdep-cancel.h
===================================================================
--- trunk/glibc-ports/kfreebsd/i386/fbtl/sysdep-cancel.h 2015-10-20 13:06:28 UTC (rev 5791)
+++ trunk/glibc-ports/kfreebsd/i386/fbtl/sysdep-cancel.h 2015-10-20 13:15:35 UTC (rev 5792)
@@ -24,7 +24,7 @@
# include <fbtl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
+#if IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -75,7 +75,7 @@
# if IS_IN (libpthread)
# define CENABLE call __pthread_enable_asynccancel;
# define CDISABLE call __pthread_disable_asynccancel
-# elif !defined NOT_IN_libc
+# elif IS_IN (libc)
# define CENABLE call __libc_enable_asynccancel;
# define CDISABLE call __libc_disable_asynccancel
# elif IS_IN (librt)
Modified: trunk/glibc-ports/kfreebsd/i386/sysdep.h
===================================================================
--- trunk/glibc-ports/kfreebsd/i386/sysdep.h 2015-10-20 13:06:28 UTC (rev 5791)
+++ trunk/glibc-ports/kfreebsd/i386/sysdep.h 2015-10-20 13:15:35 UTC (rev 5792)
@@ -89,7 +89,7 @@
# elif defined _LIBC_REENTRANT
-# ifndef NOT_IN_libc
+# if IS_IN (libc)
# define SYSCALL_ERROR_ERRNO __libc_errno
# else
# define SYSCALL_ERROR_ERRNO errno
Modified: trunk/glibc-ports/kfreebsd/not-cancel.h
===================================================================
--- trunk/glibc-ports/kfreebsd/not-cancel.h 2015-10-20 13:06:28 UTC (rev 5791)
+++ trunk/glibc-ports/kfreebsd/not-cancel.h 2015-10-20 13:15:35 UTC (rev 5792)
@@ -28,7 +28,7 @@
INLINE_SYSCALL (open, 2, (const char *) (name), (flags))
/* Uncancelable openat. */
-#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
+#if IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt)
extern int __openat_nocancel (int fd, const char *fname, int oflag,
mode_t mode) attribute_hidden;
extern int __openat64_nocancel (int fd, const char *fname, int oflag,
Modified: trunk/glibc-ports/kfreebsd/x86_64/fbtl/sysdep-cancel.h
===================================================================
--- trunk/glibc-ports/kfreebsd/x86_64/fbtl/sysdep-cancel.h 2015-10-20 13:06:28 UTC (rev 5791)
+++ trunk/glibc-ports/kfreebsd/x86_64/fbtl/sysdep-cancel.h 2015-10-20 13:15:35 UTC (rev 5792)
@@ -24,7 +24,7 @@
/* Syscalls with more than 6 arguments are not supported here. */
-#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
+#if IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt)
/* The code to disable cancellation depends on the fact that the called
functions are special. They don't modify registers other than %rax
@@ -65,7 +65,7 @@
# define CENABLE call __pthread_enable_asynccancel;
# define CDISABLE call __pthread_disable_asynccancel;
# define __local_multiple_threads __pthread_multiple_threads
-# elif !defined NOT_IN_libc
+# elif IS_IN (libc)
# define CENABLE call __libc_enable_asynccancel;
# define CDISABLE call __libc_disable_asynccancel;
# define __local_multiple_threads __libc_multiple_threads
@@ -76,7 +76,7 @@
# error Unsupported library
# endif
-# if IS_IN (libpthread) || !defined NOT_IN_libc
+# if IS_IN (libpthread) || IS_IN (libc)
# ifndef __ASSEMBLER__
extern int __local_multiple_threads attribute_hidden;
# define SINGLE_THREAD_P \
Modified: trunk/glibc-ports/kfreebsd/x86_64/sysdep.h
===================================================================
--- trunk/glibc-ports/kfreebsd/x86_64/sysdep.h 2015-10-20 13:06:28 UTC (rev 5791)
+++ trunk/glibc-ports/kfreebsd/x86_64/sysdep.h 2015-10-20 13:15:35 UTC (rev 5792)
@@ -86,7 +86,7 @@
orq $-1, %rax; \
jmp L(pseudo_end);
#else
-# ifndef NOT_IN_libc
+# if IS_IN (libc)
# define SYSCALL_ERROR_ERRNO __libc_errno
# else
# define SYSCALL_ERROR_ERRNO errno
More information about the Glibc-bsd-commits
mailing list