[Glibc-bsd-commits] r5786 - in trunk/glibc-ports: fbtl kfreebsd/i386 kfreebsd/x86_64

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2015-10-20 12:41:11 +0000 (Tue, 20 Oct 2015)
New Revision: 5786

Modified:
   trunk/glibc-ports/fbtl/pthreadP.h
   trunk/glibc-ports/kfreebsd/i386/sysdep.h
   trunk/glibc-ports/kfreebsd/x86_64/sysdep.h
Log:
Merge from upstream:

commit eb72478a286e0104f5636d21d86407b4c0e89fa1
Author: Siddhesh Poyarekar <siddhesh at redhat.com>
Date:   Thu Aug 21 10:26:46 2014 +0530

    Remove unnecessary uses of NOT_IN_libc
    
    If a IS_IN_* macro is defined, then NOT_IN_libc is always defined,
    except obviously for IS_IN_libc.  There's no need to check for both.
    Verified on x86_64 and i686 that the source is unchanged.



Modified: trunk/glibc-ports/fbtl/pthreadP.h
===================================================================
--- trunk/glibc-ports/fbtl/pthreadP.h	2015-10-20 11:18:20 UTC (rev 5785)
+++ trunk/glibc-ports/fbtl/pthreadP.h	2015-10-20 12:41:11 UTC (rev 5786)
@@ -241,7 +241,7 @@
      __cleanup_fct_attribute;
 extern void __pthread_unregister_cancel (__pthread_unwind_buf_t *__buf)
      __cleanup_fct_attribute;
-#if defined NOT_IN_libc && defined IS_IN_libpthread
+#ifdef IS_IN_libpthread
 hidden_proto (__pthread_unwind)
 hidden_proto (__pthread_unwind_next)
 hidden_proto (__pthread_register_cancel)
@@ -285,13 +285,13 @@
 # define LIBC_CANCEL_HANDLED() \
   __asm (".globl " __SYMBOL_PREFIX "__libc_enable_asynccancel"); \
   __asm (".globl " __SYMBOL_PREFIX "__libc_disable_asynccancel")
-#elif defined NOT_IN_libc && defined IS_IN_libpthread
+#elif defined IS_IN_libpthread
 # define LIBC_CANCEL_ASYNC() CANCEL_ASYNC ()
 # define LIBC_CANCEL_RESET(val) CANCEL_RESET (val)
 # define LIBC_CANCEL_HANDLED() \
   __asm (".globl " __SYMBOL_PREFIX "__pthread_enable_asynccancel"); \
   __asm (".globl " __SYMBOL_PREFIX "__pthread_disable_asynccancel")
-#elif defined NOT_IN_libc && defined IS_IN_librt
+#elif defined IS_IN_librt
 # define LIBC_CANCEL_ASYNC() \
   __librt_enable_asynccancel ()
 # define LIBC_CANCEL_RESET(val) \
@@ -350,7 +350,7 @@
 
 /* longjmp handling.  */
 extern void __pthread_cleanup_upto (__jmp_buf target, char *targetframe);
-#if defined NOT_IN_libc && defined IS_IN_libpthread
+#ifdef IS_IN_libpthread
 hidden_proto (__pthread_cleanup_upto)
 #endif
 
@@ -495,7 +495,7 @@
 extern void __pthread_disable_asynccancel (int oldtype)
      internal_function attribute_hidden;
 
-#if defined NOT_IN_libc && defined IS_IN_libpthread
+#ifdef IS_IN_libpthread
 hidden_proto (__pthread_mutex_init)
 hidden_proto (__pthread_mutex_destroy)
 hidden_proto (__pthread_mutex_lock)

Modified: trunk/glibc-ports/kfreebsd/i386/sysdep.h
===================================================================
--- trunk/glibc-ports/kfreebsd/i386/sysdep.h	2015-10-20 11:18:20 UTC (rev 5785)
+++ trunk/glibc-ports/kfreebsd/i386/sysdep.h	2015-10-20 12:41:11 UTC (rev 5786)
@@ -171,7 +171,7 @@
 
 
 /* Pointer mangling support.  */
-#if defined NOT_IN_libc && defined IS_IN_rtld
+#if defined IS_IN_rtld
 /* We cannot use the thread descriptor because in ld.so we use setjmp
    earlier than the descriptor is initialized.  Using a global variable
    is too complicated here since we have no PC-relative addressing mode.  */

Modified: trunk/glibc-ports/kfreebsd/x86_64/sysdep.h
===================================================================
--- trunk/glibc-ports/kfreebsd/x86_64/sysdep.h	2015-10-20 11:18:20 UTC (rev 5785)
+++ trunk/glibc-ports/kfreebsd/x86_64/sysdep.h	2015-10-20 12:41:11 UTC (rev 5786)
@@ -166,7 +166,7 @@
 
 
 /* Pointer mangling support.  */
-#if defined NOT_IN_libc && defined IS_IN_rtld
+#if defined IS_IN_rtld
 /* We cannot use the thread descriptor because in ld.so we use setjmp
    earlier than the descriptor is initialized.  */
 # ifdef __ASSEMBLER__