[Glibc-bsd-commits] r5790 - in trunk/glibc-ports: fbtl fbtl/sysdeps/pthread/bits fbtl_db kfreebsd kfreebsd/fbtl kfreebsd/i386/fbtl kfreebsd/x86_64/fbtl
aurel32 at alioth.debian.org
aurel32 at alioth.debian.org
Tue Oct 20 12:59:36 UTC 2015
Author: aurel32
Date: 2015-10-20 12:59:36 +0000 (Tue, 20 Oct 2015)
New Revision: 5790
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_db/structs.def
trunk/glibc-ports/kfreebsd/fbtl/lowlevellock.c
trunk/glibc-ports/kfreebsd/i386/fbtl/sysdep-cancel.h
trunk/glibc-ports/kfreebsd/not-cancel.h
trunk/glibc-ports/kfreebsd/x86_64/fbtl/cancellation.S
trunk/glibc-ports/kfreebsd/x86_64/fbtl/sysdep-cancel.h
Log:
Merge from upstream:
commit ce9f10f7f0cc83df3e307a18e480587c3b404321
Author: Siddhesh Poyarekar <siddhesh at redhat.com>
Date: Thu Nov 20 14:22:40 2014 +0530
Remove IS_IN_libpthread
Replace with IS_IN (libpthread). Generated code unchanged on
x86_64.
Modified: trunk/glibc-ports/fbtl/pthreadP.h
===================================================================
--- trunk/glibc-ports/fbtl/pthreadP.h 2015-10-20 12:53:24 UTC (rev 5789)
+++ trunk/glibc-ports/fbtl/pthreadP.h 2015-10-20 12:59:36 UTC (rev 5790)
@@ -227,7 +227,7 @@
extern void __pthread_unwind (__pthread_unwind_buf_t *__buf)
__cleanup_fct_attribute __attribute ((__noreturn__))
-#if !defined SHARED && !defined IS_IN_libpthread
+#if !defined SHARED && !IS_IN (libpthread)
weak_function
#endif
;
@@ -241,7 +241,7 @@
__cleanup_fct_attribute;
extern void __pthread_unregister_cancel (__pthread_unwind_buf_t *__buf)
__cleanup_fct_attribute;
-#ifdef IS_IN_libpthread
+#if IS_IN (libpthread)
hidden_proto (__pthread_unwind)
hidden_proto (__pthread_unwind_next)
hidden_proto (__pthread_register_cancel)
@@ -285,7 +285,7 @@
# define LIBC_CANCEL_HANDLED() \
__asm (".globl " __SYMBOL_PREFIX "__libc_enable_asynccancel"); \
__asm (".globl " __SYMBOL_PREFIX "__libc_disable_asynccancel")
-#elif defined IS_IN_libpthread
+#elif IS_IN (libpthread)
# define LIBC_CANCEL_ASYNC() CANCEL_ASYNC ()
# define LIBC_CANCEL_RESET(val) CANCEL_RESET (val)
# define LIBC_CANCEL_HANDLED() \
@@ -350,7 +350,7 @@
/* longjmp handling. */
extern void __pthread_cleanup_upto (__jmp_buf target, char *targetframe);
-#ifdef IS_IN_libpthread
+#if IS_IN (libpthread)
hidden_proto (__pthread_cleanup_upto)
#endif
@@ -495,7 +495,7 @@
extern void __pthread_disable_asynccancel (int oldtype)
internal_function attribute_hidden;
-#ifdef IS_IN_libpthread
+#if IS_IN (libpthread)
hidden_proto (__pthread_mutex_init)
hidden_proto (__pthread_mutex_destroy)
hidden_proto (__pthread_mutex_lock)
@@ -534,7 +534,7 @@
extern void __librt_disable_asynccancel (int oldtype)
internal_function attribute_hidden;
-#ifdef IS_IN_libpthread
+#if IS_IN (libpthread)
/* Special versions which use non-exported functions. */
extern void __pthread_cleanup_push (struct _pthread_cleanup_buffer *buffer,
void (*routine) (void *), void *arg)
Modified: trunk/glibc-ports/fbtl/sysdeps/pthread/bits/libc-lock.h
===================================================================
--- trunk/glibc-ports/fbtl/sysdeps/pthread/bits/libc-lock.h 2015-10-20 12:53:24 UTC (rev 5789)
+++ trunk/glibc-ports/fbtl/sysdeps/pthread/bits/libc-lock.h 2015-10-20 12:59:36 UTC (rev 5790)
@@ -26,7 +26,7 @@
/* Mutex type. */
#if defined _LIBC || defined _IO_MTSAFE_IO
-# if (defined NOT_IN_libc && !defined IS_IN_libpthread) || !defined _LIBC
+# if (defined NOT_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 || defined IS_IN_libpthread)
+#if defined _LIBC && (!defined NOT_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 || defined IS_IN_libpthread)
+#if defined _LIBC && (!defined NOT_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 || defined IS_IN_libpthread)
+#if defined _LIBC && (!defined NOT_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 || defined IS_IN_libpthread)
+#if defined _LIBC && (!defined NOT_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 || defined IS_IN_libpthread)
+#if defined _LIBC && (!defined NOT_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 || defined IS_IN_libpthread)
+#if defined _LIBC && (!defined NOT_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 12:53:24 UTC (rev 5789)
+++ trunk/glibc-ports/fbtl/sysdeps/pthread/bits/libc-lockP.h 2015-10-20 12:59:36 UTC (rev 5790)
@@ -35,7 +35,7 @@
#include <pthread-functions.h>
/* Mutex type. */
-#if defined NOT_IN_libc && !defined IS_IN_libpthread
+#if defined NOT_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 || defined IS_IN_libpthread
+#if !defined NOT_IN_libc || IS_IN (libpthread)
# if LLL_LOCK_INITIALIZER == 0
# define __libc_lock_define_initialized(CLASS,NAME) \
CLASS __libc_lock_t NAME;
@@ -130,7 +130,7 @@
/* Initialize the named lock variable, leaving it in a consistent, unlocked
state. */
-#if !defined NOT_IN_libc || defined IS_IN_libpthread
+#if !defined NOT_IN_libc || IS_IN (libpthread)
# define __libc_lock_init(NAME) ((NAME) = LLL_LOCK_INITIALIZER, 0)
#else
# define __libc_lock_init(NAME) \
@@ -149,7 +149,7 @@
/* 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 || defined IS_IN_libpthread
+#if !defined NOT_IN_libc || IS_IN (libpthread)
# define __libc_lock_fini(NAME) ((void) 0)
#else
# define __libc_lock_fini(NAME) \
@@ -163,7 +163,7 @@
#endif
/* Lock the named lock variable. */
-#if !defined NOT_IN_libc || defined IS_IN_libpthread
+#if !defined NOT_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 || defined IS_IN_libpthread
+#if !defined NOT_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 || defined IS_IN_libpthread
+#if !defined NOT_IN_libc || IS_IN (libpthread)
# define __libc_lock_unlock(NAME) \
lll_unlock (NAME, LLL_PRIVATE)
#else
Modified: trunk/glibc-ports/fbtl_db/structs.def
===================================================================
--- trunk/glibc-ports/fbtl_db/structs.def 2015-10-20 12:53:24 UTC (rev 5789)
+++ trunk/glibc-ports/fbtl_db/structs.def 2015-10-20 12:59:36 UTC (rev 5790)
@@ -74,7 +74,7 @@
DB_STRUCT_ARRAY_FIELD (dtv, dtv)
#define pointer_val pointer.val /* Field of anonymous struct in dtv_t. */
DB_STRUCT_FIELD (dtv_t, pointer_val)
-#if !defined IS_IN_libpthread || TLS_TCB_AT_TP
+#if !IS_IN (libpthread) || TLS_TCB_AT_TP
DB_STRUCT_FIELD (pthread, dtvp)
#endif
Modified: trunk/glibc-ports/kfreebsd/fbtl/lowlevellock.c
===================================================================
--- trunk/glibc-ports/kfreebsd/fbtl/lowlevellock.c 2015-10-20 12:53:24 UTC (rev 5789)
+++ trunk/glibc-ports/kfreebsd/fbtl/lowlevellock.c 2015-10-20 12:59:36 UTC (rev 5790)
@@ -35,7 +35,7 @@
/* These functions don't get included in libc.so */
-#ifdef IS_IN_libpthread
+#ifdef IS_IN (libpthread)
void
__lll_lock_wait_shared (int *futex)
{
Modified: trunk/glibc-ports/kfreebsd/i386/fbtl/sysdep-cancel.h
===================================================================
--- trunk/glibc-ports/kfreebsd/i386/fbtl/sysdep-cancel.h 2015-10-20 12:53:24 UTC (rev 5789)
+++ trunk/glibc-ports/kfreebsd/i386/fbtl/sysdep-cancel.h 2015-10-20 12:59:36 UTC (rev 5790)
@@ -24,7 +24,7 @@
# include <fbtl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN (librt)
+#if !defined NOT_IN_libc || IS_IN (libpthread) || defined IS_IN (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -72,7 +72,7 @@
# define PUSHRESULT pushl %eax; cfi_adjust_cfa_offset (4); pushfl; cfi_adjust_cfa_offset (4)
# define POPRESULT popfl; cfi_adjust_cfa_offset (-4); popl %eax; cfi_adjust_cfa_offset (-4)
-# ifdef IS_IN_libpthread
+# if IS_IN (libpthread)
# define CENABLE call __pthread_enable_asynccancel;
# define CDISABLE call __pthread_disable_asynccancel
# elif !defined NOT_IN_libc
Modified: trunk/glibc-ports/kfreebsd/not-cancel.h
===================================================================
--- trunk/glibc-ports/kfreebsd/not-cancel.h 2015-10-20 12:53:24 UTC (rev 5789)
+++ trunk/glibc-ports/kfreebsd/not-cancel.h 2015-10-20 12:59:36 UTC (rev 5790)
@@ -28,7 +28,7 @@
INLINE_SYSCALL (open, 2, (const char *) (name), (flags))
/* Uncancelable openat. */
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN (librt)
+#if !defined NOT_IN_libc || IS_IN (libpthread) || defined 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/cancellation.S
===================================================================
--- trunk/glibc-ports/kfreebsd/x86_64/fbtl/cancellation.S 2015-10-20 12:53:24 UTC (rev 5789)
+++ trunk/glibc-ports/kfreebsd/x86_64/fbtl/cancellation.S 2015-10-20 12:59:36 UTC (rev 5790)
@@ -21,7 +21,7 @@
#include <kernel-features.h>
#include "lowlevellock.h"
-#ifdef IS_IN_libpthread
+#if IS_IN (libpthread)
# ifdef SHARED
# define __pthread_unwind __GI___pthread_unwind
# endif
Modified: trunk/glibc-ports/kfreebsd/x86_64/fbtl/sysdep-cancel.h
===================================================================
--- trunk/glibc-ports/kfreebsd/x86_64/fbtl/sysdep-cancel.h 2015-10-20 12:53:24 UTC (rev 5789)
+++ trunk/glibc-ports/kfreebsd/x86_64/fbtl/sysdep-cancel.h 2015-10-20 12:59:36 UTC (rev 5790)
@@ -24,7 +24,7 @@
/* Syscalls with more than 6 arguments are not supported here. */
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN (librt)
+#if !defined NOT_IN_libc || IS_IN (libpthread) || defined 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
@@ -61,7 +61,7 @@
jb SYSCALL_ERROR_LABEL; \
L(pseudo_end): \
-# ifdef IS_IN_libpthread
+# if IS_IN (libpthread)
# define CENABLE call __pthread_enable_asynccancel;
# define CDISABLE call __pthread_disable_asynccancel;
# define __local_multiple_threads __pthread_multiple_threads
@@ -76,7 +76,7 @@
# error Unsupported library
# endif
-# if defined IS_IN_libpthread || !defined NOT_IN_libc
+# if IS_IN (libpthread) || !defined NOT_IN_libc
# ifndef __ASSEMBLER__
extern int __local_multiple_threads attribute_hidden;
# define SINGLE_THREAD_P \
More information about the Glibc-bsd-commits
mailing list