[Glibc-bsd-commits] r5791 - in trunk/glibc-ports: fbtl 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:06:28 UTC 2015 

Author: aurel32
Date: 2015-10-20 13:06:28 +0000 (Tue, 20 Oct 2015)
New Revision: 5791

Modified:
   trunk/glibc-ports/fbtl/pthreadP.h
   trunk/glibc-ports/kfreebsd/fbtl/lowlevellock.c
   trunk/glibc-ports/kfreebsd/getcwd.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/dl-procinfo.h
   trunk/glibc-ports/kfreebsd/x86_64/fbtl/sysdep-cancel.h
   trunk/glibc-ports/kfreebsd/x86_64/sysdep.h
Log:
Merge from upstream:

commit a38484851aa244e1d5c48405f0e26fe93fa8d3b5
Author: Siddhesh Poyarekar <siddhesh at redhat.com>
Date:   Thu Nov 20 21:09:43 2014 +0530

    Remove IS_IN_rtld
    
    Replace with IS_IN (rtld).  Generated code is unchanged on
    x86_64.




Modified: trunk/glibc-ports/fbtl/pthreadP.h
===================================================================
--- trunk/glibc-ports/fbtl/pthreadP.h	2015-10-20 12:59:36 UTC (rev 5790)
+++ trunk/glibc-ports/fbtl/pthreadP.h	2015-10-20 13:06:28 UTC (rev 5791)
@@ -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 IS_IN (librt)
 # define LIBC_CANCEL_ASYNC() \
   __librt_enable_asynccancel ()
 # define LIBC_CANCEL_RESET(val) \

Modified: trunk/glibc-ports/kfreebsd/fbtl/lowlevellock.c
===================================================================
--- trunk/glibc-ports/kfreebsd/fbtl/lowlevellock.c	2015-10-20 12:59:36 UTC (rev 5790)
+++ trunk/glibc-ports/kfreebsd/fbtl/lowlevellock.c	2015-10-20 13:06:28 UTC (rev 5791)
@@ -35,7 +35,7 @@
 
 
 /* These functions don't get included in libc.so  */
-#ifdef IS_IN (libpthread)
+#if IS_IN (libpthread)
 void
 __lll_lock_wait_shared (int *futex)
 {

Modified: trunk/glibc-ports/kfreebsd/getcwd.c
===================================================================
--- trunk/glibc-ports/kfreebsd/getcwd.c	2015-10-20 12:59:36 UTC (rev 5790)
+++ trunk/glibc-ports/kfreebsd/getcwd.c	2015-10-20 13:06:28 UTC (rev 5791)
@@ -28,7 +28,7 @@
 
 /* If we compile the file for use in ld.so we don't need the feature
    that getcwd() allocates the buffers itself.  */
-#ifdef IS_IN_rtld
+#if IS_IN (rtld)
 # define NO_ALLOCATION  1
 #endif
 

Modified: trunk/glibc-ports/kfreebsd/i386/fbtl/sysdep-cancel.h
===================================================================
--- trunk/glibc-ports/kfreebsd/i386/fbtl/sysdep-cancel.h	2015-10-20 12:59:36 UTC (rev 5790)
+++ trunk/glibc-ports/kfreebsd/i386/fbtl/sysdep-cancel.h	2015-10-20 13:06:28 UTC (rev 5791)
@@ -24,7 +24,7 @@
 # include <fbtl/pthreadP.h>
 #endif
 
-#if !defined NOT_IN_libc || IS_IN (libpthread) || defined IS_IN (librt)
+#if !defined NOT_IN_libc || IS_IN (libpthread) || 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 IS_IN (librt)
 #  define CENABLE	call __librt_enable_asynccancel;
 #  define CDISABLE	call __librt_disable_asynccancel
 # else

Modified: trunk/glibc-ports/kfreebsd/i386/sysdep.h
===================================================================
--- trunk/glibc-ports/kfreebsd/i386/sysdep.h	2015-10-20 12:59:36 UTC (rev 5790)
+++ trunk/glibc-ports/kfreebsd/i386/sysdep.h	2015-10-20 13:06:28 UTC (rev 5791)
@@ -171,7 +171,7 @@
 
 
 /* Pointer mangling support.  */
-#if defined IS_IN_rtld
+#if 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/not-cancel.h
===================================================================
--- trunk/glibc-ports/kfreebsd/not-cancel.h	2015-10-20 12:59:36 UTC (rev 5790)
+++ trunk/glibc-ports/kfreebsd/not-cancel.h	2015-10-20 13:06:28 UTC (rev 5791)
@@ -28,7 +28,7 @@
    INLINE_SYSCALL (open, 2, (const char *) (name), (flags))
 
 /* Uncancelable openat.  */
-#if !defined NOT_IN_libc || IS_IN (libpthread) || defined IS_IN (librt)
+#if !defined NOT_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/dl-procinfo.h
===================================================================
--- trunk/glibc-ports/kfreebsd/x86_64/dl-procinfo.h	2015-10-20 12:59:36 UTC (rev 5790)
+++ trunk/glibc-ports/kfreebsd/x86_64/dl-procinfo.h	2015-10-20 13:06:28 UTC (rev 5791)
@@ -1,4 +1,4 @@
-#ifdef IS_IN (ldconfig)
+#if IS_IN (ldconfig)
 # include <sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/dl-procinfo.h>
 #else
 # include <sysdeps/generic/dl-procinfo.h>

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:59:36 UTC (rev 5790)
+++ trunk/glibc-ports/kfreebsd/x86_64/fbtl/sysdep-cancel.h	2015-10-20 13:06:28 UTC (rev 5791)
@@ -24,7 +24,7 @@
 
 /* Syscalls with more than 6 arguments are not supported here.  */
 
-#if !defined NOT_IN_libc || IS_IN (libpthread) || defined IS_IN (librt)
+#if !defined NOT_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
@@ -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 IS_IN (librt)
 #  define CENABLE	call __librt_enable_asynccancel;
 #  define CDISABLE	call __librt_disable_asynccancel;
 # else

Modified: trunk/glibc-ports/kfreebsd/x86_64/sysdep.h
===================================================================
--- trunk/glibc-ports/kfreebsd/x86_64/sysdep.h	2015-10-20 12:59:36 UTC (rev 5790)
+++ trunk/glibc-ports/kfreebsd/x86_64/sysdep.h	2015-10-20 13:06:28 UTC (rev 5791)
@@ -24,7 +24,7 @@
 #include <sysdeps/unix/x86_64/sysdep.h>
 #include <tls.h>
 
-#ifdef IS_IN_rtld
+#if IS_IN (rtld)
 # include <dl-sysdep.h>		/* Defines RTLD_PRIVATE_ERRNO.  */
 #endif
 
@@ -166,7 +166,7 @@
 
 
 /* Pointer mangling support.  */
-#if defined IS_IN_rtld
+#if IS_IN (rtld)
 /* We cannot use the thread descriptor because in ld.so we use setjmp
    earlier than the descriptor is initialized.  */
 # ifdef __ASSEMBLER__

More information about the Glibc-bsd-commits mailing list