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

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2015-10-20 12:53:24 +0000 (Tue, 20 Oct 2015)
New Revision: 5789

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

commit 016afc75cd45dfaf49c0aa7a9befda77ab933846
Author: Siddhesh Poyarekar <siddhesh at redhat.com>
Date:   Thu Nov 20 13:26:25 2014 +0530

    Remove IS_IN_librt
    
    Replace with IS_IN (librt).  Generated code unchanged on x86_64



Modified: trunk/glibc-ports/fbtl/pthreadP.h
===================================================================
--- trunk/glibc-ports/fbtl/pthreadP.h	2015-10-20 12:50:05 UTC (rev 5788)
+++ trunk/glibc-ports/fbtl/pthreadP.h	2015-10-20 12:53:24 UTC (rev 5789)
@@ -291,7 +291,7 @@
 # define LIBC_CANCEL_HANDLED() \
   __asm (".globl " __SYMBOL_PREFIX "__pthread_enable_asynccancel"); \
   __asm (".globl " __SYMBOL_PREFIX "__pthread_disable_asynccancel")
-#elif defined IS_IN_librt
+#elif defined IS_IN (librt)
 # define LIBC_CANCEL_ASYNC() \
   __librt_enable_asynccancel ()
 # define LIBC_CANCEL_RESET(val) \

Modified: trunk/glibc-ports/kfreebsd/i386/fbtl/sysdep-cancel.h
===================================================================
--- trunk/glibc-ports/kfreebsd/i386/fbtl/sysdep-cancel.h	2015-10-20 12:50:05 UTC (rev 5788)
+++ trunk/glibc-ports/kfreebsd/i386/fbtl/sysdep-cancel.h	2015-10-20 12:53:24 UTC (rev 5789)
@@ -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 || defined IS_IN_libpthread || defined IS_IN (librt)
 
 # undef PSEUDO
 # define PSEUDO(name, syscall_name, args)				      \
@@ -78,7 +78,7 @@
 # elif !defined NOT_IN_libc
 #  define CENABLE	call __libc_enable_asynccancel;
 #  define CDISABLE	call __libc_disable_asynccancel
-# elif defined IS_IN_librt
+# elif defined IS_IN (librt)
 #  define CENABLE	call __librt_enable_asynccancel;
 #  define CDISABLE	call __librt_disable_asynccancel
 # else

Modified: trunk/glibc-ports/kfreebsd/not-cancel.h
===================================================================
--- trunk/glibc-ports/kfreebsd/not-cancel.h	2015-10-20 12:50:05 UTC (rev 5788)
+++ trunk/glibc-ports/kfreebsd/not-cancel.h	2015-10-20 12:53:24 UTC (rev 5789)
@@ -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 || defined 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/sysdep-cancel.h
===================================================================
--- trunk/glibc-ports/kfreebsd/x86_64/fbtl/sysdep-cancel.h	2015-10-20 12:50:05 UTC (rev 5788)
+++ trunk/glibc-ports/kfreebsd/x86_64/fbtl/sysdep-cancel.h	2015-10-20 12:53:24 UTC (rev 5789)
@@ -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 || defined 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
@@ -69,7 +69,7 @@
 #  define CENABLE	call __libc_enable_asynccancel;
 #  define CDISABLE	call __libc_disable_asynccancel;
 #  define __local_multiple_threads __libc_multiple_threads
-# elif defined IS_IN_librt
+# elif defined IS_IN (librt)
 #  define CENABLE	call __librt_enable_asynccancel;
 #  define CDISABLE	call __librt_disable_asynccancel;
 # else