GNU C Library master sources branch master updated. glibc-2.27.9000-480-gf96a85e

[sthibaul at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  f96a85e0fe83abdc30c73e6f01b995baf733e97b (commit)
      from  8c9d53428e463da0ab99ff5162d94c3a043b3a2d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f96a85e0fe83abdc30c73e6f01b995baf733e97b

commit f96a85e0fe83abdc30c73e6f01b995baf733e97b
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Sat Jun 16 10:52:04 2018 +0200

    hurd: Fix missing __pthread_get_cleanup_stack symbol
    
    Rework 57e1651557e8 ("hurd: Avoid PLT ref for __pthread_get_cleanup_stack")
    to keep the __pthread_get_cleanup_stack symbol.
    
            * htl/pt-cleanup.c (__pthread_get_cleanup_stack): Rename to
            ___pthread_get_cleanup_stack.
            (__pthread_get_cleanup_stack): Remove hidden def, add alias.
            * htl/pt-exit.c (__pthread_exit): Use ___pthread_get_cleanup_stack
            instead of __pthread_get_cleanup_stack.
            * sysdeps/htl/pthread-functions.h [libpthread]
            (__pthread_get_cleanup_stack): Remove hidden proto.
            * sysdeps/htl/pthreadP.h (___pthread_get_cleanup_stack): Add
            prototype.
    	* sysdeps/htl/pthreadP.h (___pthread_get_cleanup_stack): Add hidden
    	attribute.
    	* htl/pt-join.c (__pthread_get_cleanup_stack): Define to
    	___pthread_get_cleanup_stack.

diff --git a/ChangeLog b/ChangeLog
index 2fc3a71..363ae5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,15 +8,10 @@
 	* sysdeps/mach/hurd/lseek.c: Include <errno.h>.
 	* sysdeps/mach/hurd/lseek.c (__libc_lseek): Check that the value
 	returned by __lseek64 can fit off_t, return EOVERFLOW otherwise.
-	* htl/pt-cleanup.c (___pthread_get_cleanup_stack): Rename to
-	__pthread_get_cleanup_stack.
-	(__pthread_get_cleanup_stack): Remove alias, add hidden def.
-	* htl/pt-exit.c (__pthread_exit): Use __pthread_get_cleanup_stack
-	instead of ___pthread_get_cleanup_stack.
-	* sysdeps/htl/pthread-functions.h [libpthread]
-	(__pthread_get_cleanup_stack): Add hidden proto.
-	* sysdeps/htl/pthreadP.h (___pthread_get_cleanup_stack): Remove
-	prototype.
+	* sysdeps/htl/pthreadP.h (___pthread_get_cleanup_stack): Add hidden
+	attribute.
+	* htl/pt-join.c (__pthread_get_cleanup_stack): Define to
+	___pthread_get_cleanup_stack.
 	* sysdeps/mach/hurd/localplt.data (ld.so): Make ref to __open optional.
 	* sysdeps/mach/include/mach-shortcuts-hidden.h: New file.
 	* mach/shortcut.awk: Make syscall stubs include
diff --git a/htl/pt-cleanup.c b/htl/pt-cleanup.c
index b4a9834..1b860c7 100644
--- a/htl/pt-cleanup.c
+++ b/htl/pt-cleanup.c
@@ -21,8 +21,8 @@
 #include <pt-internal.h>
 
 struct __pthread_cancelation_handler **
-__pthread_get_cleanup_stack (void)
+___pthread_get_cleanup_stack (void)
 {
   return &_pthread_self ()->cancelation_handlers;
 }
-libc_hidden_def (__pthread_get_cleanup_stack)
+strong_alias (___pthread_get_cleanup_stack, __pthread_get_cleanup_stack)
diff --git a/htl/pt-exit.c b/htl/pt-exit.c
index 823e09e..cb62f47 100644
--- a/htl/pt-exit.c
+++ b/htl/pt-exit.c
@@ -41,7 +41,7 @@ __pthread_exit (void *status)
      disabled.  */
   __pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &oldstate);
 
-  for (handlers = __pthread_get_cleanup_stack ();
+  for (handlers = ___pthread_get_cleanup_stack ();
        *handlers != NULL;
        *handlers = (*handlers)->__next)
     (*handlers)->__handler ((*handlers)->__arg);
diff --git a/htl/pt-join.c b/htl/pt-join.c
index 061f421..befa0da 100644
--- a/htl/pt-join.c
+++ b/htl/pt-join.c
@@ -22,6 +22,8 @@
 
 #include <pt-internal.h>
 
+#define __pthread_get_cleanup_stack ___pthread_get_cleanup_stack
+
 /* Make calling thread wait for termination of thread THREAD.  Return
    the exit status of the thread in *STATUS.  */
 int
diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h
index bb901e3..a0d06cc 100644
--- a/sysdeps/htl/pthread-functions.h
+++ b/sysdeps/htl/pthread-functions.h
@@ -60,9 +60,6 @@ pthread_t __pthread_self (void);
 int __pthread_setcancelstate (int, int *);
 int __pthread_setcanceltype (int, int *);
 struct __pthread_cancelation_handler **__pthread_get_cleanup_stack (void);
-#if IS_IN (libpthread)
-hidden_proto (__pthread_get_cleanup_stack)
-#endif
 int __pthread_once (pthread_once_t *, void (*) (void));
 int __pthread_rwlock_rdlock (pthread_rwlock_t *);
 int __pthread_rwlock_wrlock (pthread_rwlock_t *);
diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
index 3fcb811..132ac17 100644
--- a/sysdeps/htl/pthreadP.h
+++ b/sysdeps/htl/pthreadP.h
@@ -64,6 +64,7 @@ int __pthread_attr_setstacksize (pthread_attr_t *__attr, size_t __stacksize);
 int __pthread_attr_setstack (pthread_attr_t *__attr, void *__stackaddr,
 			     size_t __stacksize);
 int __pthread_attr_getstack (const pthread_attr_t *, void **, size_t *);
+struct __pthread_cancelation_handler **___pthread_get_cleanup_stack (void) attribute_hidden;
 
 #if IS_IN (libpthread)
 hidden_proto (__pthread_key_create)

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                       |   13 ++++---------
 htl/pt-cleanup.c                |    4 ++--
 htl/pt-exit.c                   |    2 +-
 htl/pt-join.c                   |    2 ++
 sysdeps/htl/pthread-functions.h |    3 ---
 sysdeps/htl/pthreadP.h          |    1 +
 6 files changed, 10 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources