[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[glibc] 01/01: patches/kfreebsd/local-fbtl.diff: update to revision 5969 (from glibc-bsd).



This is an automated email from the git hooks/post-receive script.

aurel32 pushed a commit to branch glibc-2.23
in repository glibc.

commit b983c548905df30de3ef10c646c7c9331a100872
Author: Aurelien Jarno <aurelien@aurel32.net>
Date:   Tue Mar 22 21:57:13 2016 +0100

    patches/kfreebsd/local-fbtl.diff: update to revision 5969 (from glibc-bsd).
---
 debian/changelog                           |   2 +-
 debian/patches/kfreebsd/local-fbtl.diff    | 810 ++++++++++-------------------
 debian/patches/kfreebsd/local-sysdeps.diff | 406 +++++----------
 3 files changed, 412 insertions(+), 806 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c7e57ef..14a144e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ glibc (2.23-0experimental1) UNRELEASED; urgency=medium
     tst-malloc-thread-exit as xfail.
   * debian/testsuite-xfail-debian.mk (ppc64) mark tst-malloc-thread-exit
     test as xfail, it is a known issue and not a regression.
-  * patches/kfreebsd/local-fbtl.diff: update to revision 5958 (from
+  * patches/kfreebsd/local-fbtl.diff: update to revision 5969 (from
     glibc-bsd).
   * debian/patches/kfreebsd/local-tst-malloc-fbtl.diff: drop, obsoleted by
     hurd-i386/cvs-libpthread.so.diff.
diff --git a/debian/patches/kfreebsd/local-fbtl.diff b/debian/patches/kfreebsd/local-fbtl.diff
index ff6387c..173c3ac 100644
--- a/debian/patches/kfreebsd/local-fbtl.diff
+++ b/debian/patches/kfreebsd/local-fbtl.diff
@@ -13481,7 +13481,7 @@
 +sysd-rules-patterns += ptw-%:%
 --- /dev/null
 +++ b/fbtl/Makefile
-@@ -0,0 +1,644 @@
+@@ -0,0 +1,642 @@
 +# Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +# This file is part of the GNU C Library.
 +
@@ -13776,14 +13776,12 @@
 +
 +include ../Makeconfig
 +
-+ifeq ($(have-forced-unwind),yes)
 +tests += tst-cancelx2 tst-cancelx3 tst-cancelx4 tst-cancelx5 \
 +	 tst-cancelx6 tst-cancelx7 tst-cancelx8 tst-cancelx9 tst-cancelx10 \
 +	 tst-cancelx11 tst-cancelx12 tst-cancelx13 tst-cancelx14 tst-cancelx15 \
 +	 tst-cancelx16 tst-cancelx17 tst-cancelx18 tst-cancelx20 tst-cancelx21 \
 +	 tst-cleanupx0 tst-cleanupx1 tst-cleanupx2 tst-cleanupx3 tst-cleanupx4 \
 +	 tst-oncex3 tst-oncex4
-+endif
 +ifeq ($(build-shared),yes)
 +tests += tst-atfork2 tst-tls3 tst-tls4 tst-tls5 tst-_res1 tst-fini1 \
 +	 tst-stackguard1
@@ -15935,7 +15933,7 @@
 +hidden_def (__pthread_unregister_cancel)
 --- /dev/null
 +++ b/fbtl/cleanup_compat.c
-@@ -0,0 +1,54 @@
+@@ -0,0 +1,50 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -15959,10 +15957,8 @@
 +
 +
 +void
-+_pthread_cleanup_push (buffer, routine, arg)
-+     struct _pthread_cleanup_buffer *buffer;
-+     void (*routine) (void *);
-+     void *arg;
++_pthread_cleanup_push (struct _pthread_cleanup_buffer *buffer,
++		       void (*routine) (void *), void *arg)
 +{
 +  struct pthread *self = THREAD_SELF;
 +
@@ -15976,9 +15972,7 @@
 +
 +
 +void
-+_pthread_cleanup_pop (buffer, execute)
-+     struct _pthread_cleanup_buffer *buffer;
-+     int execute;
++_pthread_cleanup_pop (struct _pthread_cleanup_buffer *buffer, int execute)
 +{
 +  struct pthread *self __attribute ((unused)) = THREAD_SELF;
 +
@@ -16086,7 +16080,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/cleanup_defer_compat.c
-@@ -0,0 +1,97 @@
+@@ -0,0 +1,94 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -16109,10 +16103,8 @@
 +
 +
 +void
-+_pthread_cleanup_push_defer (buffer, routine, arg)
-+     struct _pthread_cleanup_buffer *buffer;
-+     void (*routine) (void *);
-+     void *arg;
++_pthread_cleanup_push_defer (struct _pthread_cleanup_buffer *buffer,
++			     void (*routine) (void *), void *arg)
 +{
 +  struct pthread *self = THREAD_SELF;
 +
@@ -16148,9 +16140,8 @@
 +
 +
 +void
-+_pthread_cleanup_pop_restore (buffer, execute)
-+     struct _pthread_cleanup_buffer *buffer;
-+     int execute;
++_pthread_cleanup_pop_restore (struct _pthread_cleanup_buffer *buffer,
++			      int execute)
 +{
 +  struct pthread *self = THREAD_SELF;
 +
@@ -16338,7 +16329,7 @@
 +fi
 --- /dev/null
 +++ b/fbtl/descr.h
-@@ -0,0 +1,410 @@
+@@ -0,0 +1,406 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -16373,9 +16364,7 @@
 +#include <dl-sysdep.h>
 +#include "../fbtl_db/thread_db.h"
 +#include <tls.h>
-+#ifdef HAVE_FORCED_UNWIND
-+# include <unwind.h>
-+#endif
++#include <unwind.h>
 +#define __need_res_state
 +#include <resolv.h>
 +#include <kernel-features.h>
@@ -16717,10 +16706,8 @@
 +  /* Next descriptor with a pending event.  */
 +  struct pthread *nextevent;
 +
-+#ifdef HAVE_FORCED_UNWIND
 +  /* Machine-specific unwind info.  */
 +  struct _Unwind_Exception exc;
-+#endif
 +
 +  /* If nonzero pointer to area allocated for the stack and its
 +     size.  */
@@ -17809,7 +17796,7 @@
 +#endif
 --- /dev/null
 +++ b/fbtl/old_pthread_cond_broadcast.c
-@@ -0,0 +1,57 @@
+@@ -0,0 +1,56 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -17837,8 +17824,7 @@
 +
 +#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
 +int
-+__pthread_cond_broadcast_2_0 (cond)
-+     pthread_cond_2_0_t *cond;
++__pthread_cond_broadcast_2_0 (pthread_cond_2_0_t *cond)
 +{
 +  if (cond->cond == NULL)
 +    {
@@ -17869,7 +17855,7 @@
 +#endif
 --- /dev/null
 +++ b/fbtl/old_pthread_cond_destroy.c
-@@ -0,0 +1,36 @@
+@@ -0,0 +1,35 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -17895,8 +17881,7 @@
 +
 +#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
 +int
-+__pthread_cond_destroy_2_0 (cond)
-+     pthread_cond_2_0_t *cond;
++__pthread_cond_destroy_2_0 (pthread_cond_2_0_t *cond)
 +{
 +  /* Free the memory which was eventually allocated.  */
 +  free (cond->cond);
@@ -17908,7 +17893,7 @@
 +#endif
 --- /dev/null
 +++ b/fbtl/old_pthread_cond_init.c
-@@ -0,0 +1,46 @@
+@@ -0,0 +1,45 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -17934,9 +17919,8 @@
 +
 +#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
 +int
-+__pthread_cond_init_2_0 (cond, cond_attr)
-+     pthread_cond_2_0_t *cond;
-+     const pthread_condattr_t *cond_attr;
++__pthread_cond_init_2_0 (pthread_cond_2_0_t *cond,
++			 const pthread_condattr_t *cond_attr)
 +{
 +  struct pthread_condattr *icond_attr = (struct pthread_condattr *) cond_attr;
 +
@@ -17957,7 +17941,7 @@
 +#endif
 --- /dev/null
 +++ b/fbtl/old_pthread_cond_signal.c
-@@ -0,0 +1,57 @@
+@@ -0,0 +1,56 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -17985,8 +17969,7 @@
 +
 +#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
 +int
-+__pthread_cond_signal_2_0 (cond)
-+     pthread_cond_2_0_t *cond;
++__pthread_cond_signal_2_0 (pthread_cond_2_0_t *cond)
 +{
 +  if (cond->cond == NULL)
 +    {
@@ -18017,7 +18000,7 @@
 +#endif
 --- /dev/null
 +++ b/fbtl/old_pthread_cond_timedwait.c
-@@ -0,0 +1,59 @@
+@@ -0,0 +1,57 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -18045,10 +18028,8 @@
 +
 +#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
 +int
-+__pthread_cond_timedwait_2_0 (cond, mutex, abstime)
-+     pthread_cond_2_0_t *cond;
-+     pthread_mutex_t *mutex;
-+     const struct timespec *abstime;
++__pthread_cond_timedwait_2_0 (pthread_cond_2_0_t *cond, pthread_mutex_t *mutex,
++			      const struct timespec *abstime)
 +{
 +  if (cond->cond == NULL)
 +    {
@@ -18079,7 +18060,7 @@
 +#endif
 --- /dev/null
 +++ b/fbtl/old_pthread_cond_wait.c
-@@ -0,0 +1,58 @@
+@@ -0,0 +1,56 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -18107,9 +18088,7 @@
 +
 +#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
 +int
-+__pthread_cond_wait_2_0 (cond, mutex)
-+     pthread_cond_2_0_t *cond;
-+     pthread_mutex_t *mutex;
++__pthread_cond_wait_2_0 (pthread_cond_2_0_t *cond, pthread_mutex_t *mutex)
 +{
 +  if (cond->cond == NULL)
 +    {
@@ -19066,7 +19045,7 @@
 +#include <crti.S>
 --- /dev/null
 +++ b/fbtl/pt-raise.c
-@@ -0,0 +1,30 @@
+@@ -0,0 +1,29 @@
 +/* ISO C raise function for libpthread.
 +   Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -19091,8 +19070,7 @@
 +
 +
 +int
-+raise (sig)
-+     int sig;
++raise (int sig)
 +{
 +  /* This is what POSIX says must happen.  */
 +  return pthread_kill (pthread_self (), sig);
@@ -19814,7 +19792,7 @@
 +#endif	/* pthreadP.h */
 --- /dev/null
 +++ b/fbtl/pthread_atfork.c
-@@ -0,0 +1,63 @@
+@@ -0,0 +1,61 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -19865,10 +19843,8 @@
 +/* Don't mark the compatibility function as hidden.  */
 +attribute_hidden
 +#endif
-+__pthread_atfork (prepare, parent, child)
-+     void (*prepare) (void);
-+     void (*parent) (void);
-+     void (*child) (void);
++__pthread_atfork (void (*prepare) (void), void (*parent) (void),
++		  void (*child) (void))
 +{
 +  return __register_atfork (prepare, parent, child,
 +			    &__dso_handle == NULL ? NULL : __dso_handle);
@@ -19880,7 +19856,7 @@
 +#endif
 --- /dev/null
 +++ b/fbtl/pthread_attr_destroy.c
-@@ -0,0 +1,45 @@
+@@ -0,0 +1,44 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -19907,8 +19883,7 @@
 +#include <shlib-compat.h>
 +
 +int
-+__pthread_attr_destroy (attr)
-+     pthread_attr_t *attr;
++__pthread_attr_destroy (pthread_attr_t *attr)
 +{
 +  struct pthread_attr *iattr;
 +
@@ -19928,7 +19903,7 @@
 +strong_alias (__pthread_attr_destroy, pthread_attr_destroy)
 --- /dev/null
 +++ b/fbtl/pthread_attr_getdetachstate.c
-@@ -0,0 +1,38 @@
+@@ -0,0 +1,36 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -19952,9 +19927,7 @@
 +
 +
 +int
-+__pthread_attr_getdetachstate (attr, detachstate)
-+     const pthread_attr_t *attr;
-+     int *detachstate;
++__pthread_attr_getdetachstate (const pthread_attr_t *attr, int *detachstate)
 +{
 +  struct pthread_attr *iattr;
 +
@@ -19969,7 +19942,7 @@
 +strong_alias (__pthread_attr_getdetachstate, pthread_attr_getdetachstate)
 --- /dev/null
 +++ b/fbtl/pthread_attr_getguardsize.c
-@@ -0,0 +1,36 @@
+@@ -0,0 +1,34 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -19993,9 +19966,7 @@
 +
 +
 +int
-+pthread_attr_getguardsize (attr, guardsize)
-+     const pthread_attr_t *attr;
-+     size_t *guardsize;
++pthread_attr_getguardsize (const pthread_attr_t *attr, size_t *guardsize)
 +{
 +  struct pthread_attr *iattr;
 +
@@ -20008,7 +19979,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_attr_getinheritsched.c
-@@ -0,0 +1,39 @@
+@@ -0,0 +1,37 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -20032,9 +20003,7 @@
 +
 +
 +int
-+__pthread_attr_getinheritsched (attr, inherit)
-+     const pthread_attr_t *attr;
-+     int *inherit;
++__pthread_attr_getinheritsched (const pthread_attr_t *attr, int *inherit)
 +{
 +  struct pthread_attr *iattr;
 +
@@ -20050,7 +20019,7 @@
 +strong_alias (__pthread_attr_getinheritsched, pthread_attr_getinheritsched)
 --- /dev/null
 +++ b/fbtl/pthread_attr_getschedparam.c
-@@ -0,0 +1,39 @@
+@@ -0,0 +1,38 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -20075,9 +20044,8 @@
 +
 +
 +int
-+__pthread_attr_getschedparam (attr, param)
-+     const pthread_attr_t *attr;
-+     struct sched_param *param;
++__pthread_attr_getschedparam (const pthread_attr_t *attr,
++			      struct sched_param *param)
 +{
 +  struct pthread_attr *iattr;
 +
@@ -20092,7 +20060,7 @@
 +strong_alias (__pthread_attr_getschedparam, pthread_attr_getschedparam)
 --- /dev/null
 +++ b/fbtl/pthread_attr_getschedpolicy.c
-@@ -0,0 +1,38 @@
+@@ -0,0 +1,36 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -20116,9 +20084,7 @@
 +
 +
 +int
-+__pthread_attr_getschedpolicy (attr, policy)
-+     const pthread_attr_t *attr;
-+     int *policy;
++__pthread_attr_getschedpolicy (const pthread_attr_t *attr, int *policy)
 +{
 +  struct pthread_attr *iattr;
 +
@@ -20133,7 +20099,7 @@
 +strong_alias (__pthread_attr_getschedpolicy, pthread_attr_getschedpolicy)
 --- /dev/null
 +++ b/fbtl/pthread_attr_getscope.c
-@@ -0,0 +1,39 @@
+@@ -0,0 +1,37 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -20157,9 +20123,7 @@
 +
 +
 +int
-+__pthread_attr_getscope (attr, scope)
-+     const pthread_attr_t *attr;
-+     int *scope;
++__pthread_attr_getscope (const pthread_attr_t *attr, int *scope)
 +{
 +  struct pthread_attr *iattr;
 +
@@ -20175,7 +20139,7 @@
 +strong_alias (__pthread_attr_getscope, pthread_attr_getscope)
 --- /dev/null
 +++ b/fbtl/pthread_attr_getstack.c
-@@ -0,0 +1,40 @@
+@@ -0,0 +1,38 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -20199,10 +20163,8 @@
 +
 +
 +int
-+__pthread_attr_getstack (attr, stackaddr, stacksize)
-+     const pthread_attr_t *attr;
-+     void **stackaddr;
-+     size_t *stacksize;
++__pthread_attr_getstack (const pthread_attr_t *attr, void **stackaddr,
++			 size_t *stacksize)
 +{
 +  struct pthread_attr *iattr;
 +
@@ -20218,7 +20180,7 @@
 +strong_alias (__pthread_attr_getstack, pthread_attr_getstack)
 --- /dev/null
 +++ b/fbtl/pthread_attr_getstackaddr.c
-@@ -0,0 +1,44 @@
+@@ -0,0 +1,42 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -20243,9 +20205,7 @@
 +
 +
 +int
-+__pthread_attr_getstackaddr (attr, stackaddr)
-+     const pthread_attr_t *attr;
-+     void **stackaddr;
++__pthread_attr_getstackaddr (const pthread_attr_t *attr, void **stackaddr)
 +{
 +  struct pthread_attr *iattr;
 +
@@ -20265,7 +20225,7 @@
 +              "the use of `pthread_attr_getstackaddr' is deprecated, use `pthread_attr_getstack'")
 --- /dev/null
 +++ b/fbtl/pthread_attr_getstacksize.c
-@@ -0,0 +1,47 @@
+@@ -0,0 +1,45 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -20289,9 +20249,7 @@
 +
 +
 +int
-+__pthread_attr_getstacksize (attr, stacksize)
-+     const pthread_attr_t *attr;
-+     size_t *stacksize;
++__pthread_attr_getstacksize (const pthread_attr_t *attr, size_t *stacksize)
 +{
 +  struct pthread_attr *iattr;
 +
@@ -20315,7 +20273,7 @@
 +strong_alias (__pthread_attr_getstacksize, pthread_attr_getstacksize)
 --- /dev/null
 +++ b/fbtl/pthread_attr_init.c
-@@ -0,0 +1,87 @@
+@@ -0,0 +1,85 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -20348,8 +20306,7 @@
 +
 +
 +int
-+__pthread_attr_init_2_1 (attr)
-+     pthread_attr_t *attr;
++__pthread_attr_init_2_1 (pthread_attr_t *attr)
 +{
 +  struct pthread_attr *iattr;
 +
@@ -20372,8 +20329,7 @@
 +
 +#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)
 +int
-+__pthread_attr_init_2_0 (attr)
-+     pthread_attr_t *attr;
++__pthread_attr_init_2_0 (pthread_attr_t *attr)
 +{
 +  /* This code is specific to the old LinuxThread code which has a too
 +     small pthread_attr_t definition.  The struct looked like
@@ -20405,7 +20361,7 @@
 +#endif
 --- /dev/null
 +++ b/fbtl/pthread_attr_setdetachstate.c
-@@ -0,0 +1,47 @@
+@@ -0,0 +1,45 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -20430,9 +20386,7 @@
 +
 +
 +int
-+__pthread_attr_setdetachstate (attr, detachstate)
-+     pthread_attr_t *attr;
-+     int detachstate;
++__pthread_attr_setdetachstate (pthread_attr_t *attr, int detachstate)
 +{
 +  struct pthread_attr *iattr;
 +
@@ -20455,7 +20409,7 @@
 +strong_alias (__pthread_attr_setdetachstate, pthread_attr_setdetachstate)
 --- /dev/null
 +++ b/fbtl/pthread_attr_setguardsize.c
-@@ -0,0 +1,39 @@
+@@ -0,0 +1,37 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -20479,9 +20433,7 @@
 +
 +
 +int
-+pthread_attr_setguardsize (attr, guardsize)
-+     pthread_attr_t *attr;
-+     size_t guardsize;
++pthread_attr_setguardsize (pthread_attr_t *attr, size_t guardsize)
 +{
 +  struct pthread_attr *iattr;
 +
@@ -20497,7 +20449,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_attr_setinheritsched.c
-@@ -0,0 +1,46 @@
+@@ -0,0 +1,44 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -20522,9 +20474,7 @@
 +
 +
 +int
-+__pthread_attr_setinheritsched (attr, inherit)
-+     pthread_attr_t *attr;
-+     int inherit;
++__pthread_attr_setinheritsched (pthread_attr_t *attr, int inherit)
 +{
 +  struct pthread_attr *iattr;
 +
@@ -20546,7 +20496,7 @@
 +strong_alias (__pthread_attr_setinheritsched, pthread_attr_setinheritsched)
 --- /dev/null
 +++ b/fbtl/pthread_attr_setschedparam.c
-@@ -0,0 +1,46 @@
+@@ -0,0 +1,45 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -20572,9 +20522,8 @@
 +
 +
 +int
-+__pthread_attr_setschedparam (attr, param)
-+     pthread_attr_t *attr;
-+     const struct sched_param *param;
++__pthread_attr_setschedparam (pthread_attr_t *attr,
++			      const struct sched_param *param)
 +{
 +  assert (sizeof (*attr) >= sizeof (struct pthread_attr));
 +  struct pthread_attr *iattr = (struct pthread_attr *) attr;
@@ -20595,7 +20544,7 @@
 +strong_alias (__pthread_attr_setschedparam, pthread_attr_setschedparam)
 --- /dev/null
 +++ b/fbtl/pthread_attr_setschedpolicy.c
-@@ -0,0 +1,47 @@
+@@ -0,0 +1,45 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -20620,9 +20569,7 @@
 +
 +
 +int
-+__pthread_attr_setschedpolicy (attr, policy)
-+     pthread_attr_t *attr;
-+     int policy;
++__pthread_attr_setschedpolicy (pthread_attr_t *attr, int policy)
 +{
 +  struct pthread_attr *iattr;
 +
@@ -20645,7 +20592,7 @@
 +strong_alias (__pthread_attr_setschedpolicy, pthread_attr_setschedpolicy)
 --- /dev/null
 +++ b/fbtl/pthread_attr_setscope.c
-@@ -0,0 +1,50 @@
+@@ -0,0 +1,48 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -20670,9 +20617,7 @@
 +
 +
 +int
-+__pthread_attr_setscope (attr, scope)
-+     pthread_attr_t *attr;
-+     int scope;
++__pthread_attr_setscope (pthread_attr_t *attr, int scope)
 +{
 +  struct pthread_attr *iattr;
 +
@@ -20698,7 +20643,7 @@
 +strong_alias (__pthread_attr_setscope, pthread_attr_setscope)
 --- /dev/null
 +++ b/fbtl/pthread_attr_setstack.c
-@@ -0,0 +1,94 @@
+@@ -0,0 +1,92 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -20729,10 +20674,8 @@
 +
 +
 +int
-+__pthread_attr_setstack (attr, stackaddr, stacksize)
-+     pthread_attr_t *attr;
-+     void *stackaddr;
-+     size_t stacksize;
++__pthread_attr_setstack (pthread_attr_t *attr, void *stackaddr,
++			 size_t stacksize)
 +{
 +  struct pthread_attr *iattr;
 +
@@ -20795,7 +20738,7 @@
 +#endif
 --- /dev/null
 +++ b/fbtl/pthread_attr_setstackaddr.c
-@@ -0,0 +1,46 @@
+@@ -0,0 +1,44 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -20820,9 +20763,7 @@
 +
 +
 +int
-+__pthread_attr_setstackaddr (attr, stackaddr)
-+     pthread_attr_t *attr;
-+     void *stackaddr;
++__pthread_attr_setstackaddr (pthread_attr_t *attr, void *stackaddr)
 +{
 +  struct pthread_attr *iattr;
 +
@@ -20844,7 +20785,7 @@
 +              "the use of `pthread_attr_setstackaddr' is deprecated, use `pthread_attr_setstack'")
 --- /dev/null
 +++ b/fbtl/pthread_attr_setstacksize.c
-@@ -0,0 +1,83 @@
+@@ -0,0 +1,81 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -20874,9 +20815,7 @@
 +
 +
 +int
-+__pthread_attr_setstacksize (attr, stacksize)
-+     pthread_attr_t *attr;
-+     size_t stacksize;
++__pthread_attr_setstacksize (pthread_attr_t *attr, size_t stacksize)
 +{
 +  struct pthread_attr *iattr;
 +
@@ -20930,7 +20869,7 @@
 +#endif
 --- /dev/null
 +++ b/fbtl/pthread_barrier_destroy.c
-@@ -0,0 +1,43 @@
+@@ -0,0 +1,42 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -20955,8 +20894,7 @@
 +
 +
 +int
-+pthread_barrier_destroy (barrier)
-+     pthread_barrier_t *barrier;
++pthread_barrier_destroy (pthread_barrier_t *barrier)
 +{
 +  struct pthread_barrier *ibarrier;
 +  int result = EBUSY;
@@ -20976,7 +20914,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_barrier_init.c
-@@ -0,0 +1,70 @@
+@@ -0,0 +1,69 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -21008,10 +20946,9 @@
 +
 +
 +int
-+pthread_barrier_init (barrier, attr, count)
-+     pthread_barrier_t *barrier;
-+     const pthread_barrierattr_t *attr;
-+     unsigned int count;
++pthread_barrier_init (pthread_barrier_t *barrier,
++		      const pthread_barrierattr_t *attr,
++		      unsigned int count)
 +{
 +  struct pthread_barrier *ibarrier;
 +
@@ -21049,7 +20986,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_barrier_wait.c
-@@ -0,0 +1,78 @@
+@@ -0,0 +1,77 @@
 +/* Copyright (C) 2003-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003.
@@ -21076,8 +21013,7 @@
 +
 +/* Wait on barrier.  */
 +int
-+pthread_barrier_wait (barrier)
-+     pthread_barrier_t *barrier;
++pthread_barrier_wait (pthread_barrier_t *barrier)
 +{
 +  struct pthread_barrier *ibarrier = (struct pthread_barrier *) barrier;
 +  int result = 0;
@@ -21130,7 +21066,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_barrierattr_destroy.c
-@@ -0,0 +1,29 @@
+@@ -0,0 +1,28 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -21153,8 +21089,7 @@
 +
 +
 +int
-+pthread_barrierattr_destroy (attr)
-+     pthread_barrierattr_t *attr;
++pthread_barrierattr_destroy (pthread_barrierattr_t *attr)
 +{
 +  /* Nothing to do.  */
 +
@@ -21162,7 +21097,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_barrierattr_getpshared.c
-@@ -0,0 +1,30 @@
+@@ -0,0 +1,29 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -21185,9 +21120,8 @@
 +
 +
 +int
-+pthread_barrierattr_getpshared (attr, pshared)
-+     const pthread_barrierattr_t *attr;
-+     int *pshared;
++pthread_barrierattr_getpshared (const pthread_barrierattr_t *attr,
++				int *pshared)
 +{
 +  *pshared = ((const struct pthread_barrierattr *) attr)->pshared;
 +
@@ -21195,7 +21129,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_barrierattr_init.c
-@@ -0,0 +1,29 @@
+@@ -0,0 +1,28 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -21218,8 +21152,7 @@
 +
 +
 +int
-+pthread_barrierattr_init (attr)
-+     pthread_barrierattr_t *attr;
++pthread_barrierattr_init (pthread_barrierattr_t *attr)
 +{
 +  ((struct pthread_barrierattr *) attr)->pshared = PTHREAD_PROCESS_PRIVATE;
 +
@@ -21227,7 +21160,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_barrierattr_setpshared.c
-@@ -0,0 +1,39 @@
+@@ -0,0 +1,37 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -21251,9 +21184,7 @@
 +
 +
 +int
-+pthread_barrierattr_setpshared (attr, pshared)
-+     pthread_barrierattr_t *attr;
-+     int pshared;
++pthread_barrierattr_setpshared (pthread_barrierattr_t *attr, int pshared)
 +{
 +  struct pthread_barrierattr *iattr;
 +
@@ -21269,7 +21200,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_cancel.c
-@@ -0,0 +1,109 @@
+@@ -0,0 +1,108 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -21297,8 +21228,7 @@
 +
 +
 +int
-+pthread_cancel (th)
-+     pthread_t th;
++pthread_cancel (pthread_t th)
 +{
 +  volatile struct pthread *pd = (volatile struct pthread *) th;
 +
@@ -21510,7 +21440,7 @@
 +#endif
 --- /dev/null
 +++ b/fbtl/pthread_cond_broadcast.c
-@@ -0,0 +1,98 @@
+@@ -0,0 +1,97 @@
 +/* Copyright (C) 2003-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003.
@@ -21542,8 +21472,7 @@
 +
 +
 +int
-+__pthread_cond_broadcast (cond)
-+     pthread_cond_t *cond;
++__pthread_cond_broadcast (pthread_cond_t *cond)
 +{
 +  LIBC_PROBE (cond_broadcast, 1, cond);
 +
@@ -21611,7 +21540,7 @@
 +		  GLIBC_2_3_2);
 --- /dev/null
 +++ b/fbtl/pthread_cond_destroy.c
-@@ -0,0 +1,87 @@
+@@ -0,0 +1,86 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -21637,8 +21566,7 @@
 +
 +
 +int
-+__pthread_cond_destroy (cond)
-+     pthread_cond_t *cond;
++__pthread_cond_destroy (pthread_cond_t *cond)
 +{
 +  int pshared = (cond->__data.__mutex == (void *) ~0l)
 +		? LLL_SHARED : LLL_PRIVATE;
@@ -21701,7 +21629,7 @@
 +		  pthread_cond_destroy, GLIBC_2_3_2);
 --- /dev/null
 +++ b/fbtl/pthread_cond_init.c
-@@ -0,0 +1,49 @@
+@@ -0,0 +1,47 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -21726,9 +21654,7 @@
 +
 +
 +int
-+__pthread_cond_init (cond, cond_attr)
-+     pthread_cond_t *cond;
-+     const pthread_condattr_t *cond_attr;
++__pthread_cond_init (pthread_cond_t *cond, const pthread_condattr_t *cond_attr)
 +{
 +  struct pthread_condattr *icond_attr = (struct pthread_condattr *) cond_attr;
 +
@@ -21753,7 +21679,7 @@
 +		  pthread_cond_init, GLIBC_2_3_2);
 --- /dev/null
 +++ b/fbtl/pthread_cond_signal.c
-@@ -0,0 +1,91 @@
+@@ -0,0 +1,90 @@
 +/* Copyright (C) 2003-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003.
@@ -21785,8 +21711,7 @@
 +
 +
 +int
-+__pthread_cond_signal (cond)
-+     pthread_cond_t *cond;
++__pthread_cond_signal (pthread_cond_t *cond)
 +{
 +  int pshared = (cond->__data.__mutex == (void *) ~0l)
 +		? LLL_SHARED : LLL_PRIVATE;
@@ -21847,7 +21772,7 @@
 +		  GLIBC_2_3_2);
 --- /dev/null
 +++ b/fbtl/pthread_cond_timedwait.c
-@@ -0,0 +1,269 @@
+@@ -0,0 +1,267 @@
 +/* Copyright (C) 2003-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003.
@@ -21898,10 +21823,8 @@
 +};
 +
 +int
-+__pthread_cond_timedwait (cond, mutex, abstime)
-+     pthread_cond_t *cond;
-+     pthread_mutex_t *mutex;
-+     const struct timespec *abstime;
++__pthread_cond_timedwait (pthread_cond_t *cond, pthread_mutex_t *mutex,
++			  const struct timespec *abstime)
 +{
 +  struct _pthread_cleanup_buffer buffer;
 +  struct _condvar_cleanup_buffer cbuffer;
@@ -22119,7 +22042,7 @@
 +		  GLIBC_2_3_2);
 --- /dev/null
 +++ b/fbtl/pthread_cond_wait.c
-@@ -0,0 +1,238 @@
+@@ -0,0 +1,236 @@
 +/* Copyright (C) 2003-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003.
@@ -22219,9 +22142,7 @@
 +
 +
 +int
-+__pthread_cond_wait (cond, mutex)
-+     pthread_cond_t *cond;
-+     pthread_mutex_t *mutex;
++__pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex)
 +{
 +  struct _pthread_cleanup_buffer buffer;
 +  struct _condvar_cleanup_buffer cbuffer;
@@ -22360,7 +22281,7 @@
 +		  GLIBC_2_3_2);
 --- /dev/null
 +++ b/fbtl/pthread_condattr_destroy.c
-@@ -0,0 +1,29 @@
+@@ -0,0 +1,28 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -22383,8 +22304,7 @@
 +
 +
 +int
-+__pthread_condattr_destroy (attr)
-+     pthread_condattr_t *attr;
++__pthread_condattr_destroy (pthread_condattr_t *attr)
 +{
 +  /* Nothing to be done.  */
 +  return 0;
@@ -22392,7 +22312,7 @@
 +strong_alias (__pthread_condattr_destroy, pthread_condattr_destroy)
 --- /dev/null
 +++ b/fbtl/pthread_condattr_getclock.c
-@@ -0,0 +1,30 @@
+@@ -0,0 +1,28 @@
 +/* Copyright (C) 2003-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
@@ -22415,9 +22335,7 @@
 +
 +
 +int
-+pthread_condattr_getclock (attr, clock_id)
-+     const pthread_condattr_t *attr;
-+     clockid_t *clock_id;
++pthread_condattr_getclock (const pthread_condattr_t *attr, clockid_t *clock_id)
 +{
 +  *clock_id = (((((const struct pthread_condattr *) attr)->value) >> 1)
 +	       & ((1 << COND_NWAITERS_SHIFT) - 1));
@@ -22425,7 +22343,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_condattr_getpshared.c
-@@ -0,0 +1,30 @@
+@@ -0,0 +1,28 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -22448,9 +22366,7 @@
 +
 +
 +int
-+pthread_condattr_getpshared (attr, pshared)
-+     const pthread_condattr_t *attr;
-+     int *pshared;
++pthread_condattr_getpshared (const pthread_condattr_t *attr, int *pshared)
 +{
 +  *pshared = ((const struct pthread_condattr *) attr)->value & 1;
 +
@@ -22458,7 +22374,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_condattr_init.c
-@@ -0,0 +1,31 @@
+@@ -0,0 +1,30 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -22482,8 +22398,7 @@
 +
 +
 +int
-+__pthread_condattr_init (attr)
-+     pthread_condattr_t *attr;
++__pthread_condattr_init (pthread_condattr_t *attr)
 +{
 +  memset (attr, '\0', sizeof (*attr));
 +
@@ -22492,7 +22407,7 @@
 +strong_alias (__pthread_condattr_init, pthread_condattr_init)
 --- /dev/null
 +++ b/fbtl/pthread_condattr_setclock.c
-@@ -0,0 +1,48 @@
+@@ -0,0 +1,46 @@
 +/* Copyright (C) 2003-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
@@ -22521,9 +22436,7 @@
 +
 +
 +int
-+pthread_condattr_setclock (attr, clock_id)
-+     pthread_condattr_t *attr;
-+     clockid_t clock_id;
++pthread_condattr_setclock (pthread_condattr_t *attr, clockid_t clock_id)
 +{
 +  /* Only a few clocks are allowed.  */
 +  if (clock_id != CLOCK_MONOTONIC && clock_id != CLOCK_REALTIME)
@@ -22543,7 +22456,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_condattr_setpshared.c
-@@ -0,0 +1,36 @@
+@@ -0,0 +1,34 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -22566,9 +22479,7 @@
 +#include <pthreadP.h>
 +
 +int
-+pthread_condattr_setpshared (attr, pshared)
-+     pthread_condattr_t *attr;
-+     int pshared;
++pthread_condattr_setpshared (pthread_condattr_t *attr, int pshared)
 +{
 +  if (pshared != PTHREAD_PROCESS_PRIVATE
 +      && __builtin_expect (pshared != PTHREAD_PROCESS_SHARED, 0))
@@ -22582,7 +22493,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_create.c
-@@ -0,0 +1,673 @@
+@@ -0,0 +1,669 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -22647,8 +22558,7 @@
 +
 +struct pthread *
 +internal_function
-+__find_in_stack_list (pd)
-+     struct pthread *pd;
++__find_in_stack_list (struct pthread *pd)
 +{
 +  list_t *entry;
 +  struct pthread *result = NULL;
@@ -23031,11 +22941,8 @@
 +
 +
 +int
-+__pthread_create_2_1 (newthread, attr, start_routine, arg)
-+     pthread_t *newthread;
-+     const pthread_attr_t *attr;
-+     void *(*start_routine) (void *);
-+     void *arg;
++__pthread_create_2_1 (pthread_t *newthread, const pthread_attr_t *attr,
++		      void *(*start_routine) (void *), void *arg)
 +{
 +  STACK_VARIABLES;
 +
@@ -23258,7 +23165,7 @@
 +PTHREAD_STATIC_FN_REQUIRE (pthread_getspecific)
 --- /dev/null
 +++ b/fbtl/pthread_detach.c
-@@ -0,0 +1,56 @@
+@@ -0,0 +1,55 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -23283,8 +23190,7 @@
 +
 +
 +int
-+pthread_detach (th)
-+     pthread_t th;
++pthread_detach (pthread_t th)
 +{
 +  struct pthread *pd = (struct pthread *) th;
 +
@@ -23317,7 +23223,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_equal.c
-@@ -0,0 +1,29 @@
+@@ -0,0 +1,27 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -23340,16 +23246,14 @@
 +
 +
 +int
-+__pthread_equal (thread1, thread2)
-+     pthread_t thread1;
-+     pthread_t thread2;
++__pthread_equal (pthread_t thread1, pthread_t thread2)
 +{
 +  return thread1 == thread2;
 +}
 +strong_alias (__pthread_equal, pthread_equal)
 --- /dev/null
 +++ b/fbtl/pthread_exit.c
-@@ -0,0 +1,35 @@
+@@ -0,0 +1,34 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -23373,8 +23277,7 @@
 +
 +
 +void
-+__pthread_exit (value)
-+     void *value;
++__pthread_exit (void *value)
 +{
 +  THREAD_SETMEM (THREAD_SELF, result, value);
 +
@@ -23427,7 +23330,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_getattr_np.c
-@@ -0,0 +1,202 @@
+@@ -0,0 +1,200 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -23460,9 +23363,7 @@
 +
 +
 +int
-+pthread_getattr_np (thread_id, attr)
-+     pthread_t thread_id;
-+     pthread_attr_t *attr;
++pthread_getattr_np (pthread_t thread_id, pthread_attr_t *attr)
 +{
 +  struct pthread *thread = (struct pthread *) thread_id;
 +  struct pthread_attr *iattr = (struct pthread_attr *) attr;
@@ -23661,7 +23562,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_getcpuclockid.c
-@@ -0,0 +1,56 @@
+@@ -0,0 +1,54 @@
 +/* Copyright (C) 2000-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -23686,9 +23587,7 @@
 +
 +
 +int
-+pthread_getcpuclockid (threadid, clockid)
-+     pthread_t threadid;
-+     clockid_t *clockid;
++pthread_getcpuclockid (pthread_t threadid, clockid_t *clockid)
 +{
 +  struct pthread *pd = (struct pthread *) threadid;
 +
@@ -23720,7 +23619,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_getschedparam.c
-@@ -0,0 +1,74 @@
+@@ -0,0 +1,72 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -23746,10 +23645,8 @@
 +
 +
 +int
-+__pthread_getschedparam (threadid, policy, param)
-+     pthread_t threadid;
-+     int *policy;
-+     struct sched_param *param;
++__pthread_getschedparam (pthread_t threadid, int *policy,
++			 struct sched_param *param)
 +{
 +  struct pthread *pd = (struct pthread *) threadid;
 +
@@ -23797,7 +23694,7 @@
 +strong_alias (__pthread_getschedparam, pthread_getschedparam)
 --- /dev/null
 +++ b/fbtl/pthread_getspecific.c
-@@ -0,0 +1,68 @@
+@@ -0,0 +1,67 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -23821,8 +23718,7 @@
 +
 +
 +void *
-+__pthread_getspecific (key)
-+     pthread_key_t key;
++__pthread_getspecific (pthread_key_t key)
 +{
 +  struct pthread_key_data *data;
 +
@@ -23868,7 +23764,7 @@
 +hidden_def (__pthread_getspecific)
 --- /dev/null
 +++ b/fbtl/pthread_join.c
-@@ -0,0 +1,119 @@
+@@ -0,0 +1,117 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -23908,9 +23804,7 @@
 +
 +
 +int
-+pthread_join (threadid, thread_return)
-+     pthread_t threadid;
-+     void **thread_return;
++pthread_join (pthread_t threadid, void **thread_return)
 +{
 +  struct pthread *pd = (struct pthread *) threadid;
 +
@@ -23990,7 +23884,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_key_create.c
-@@ -0,0 +1,53 @@
+@@ -0,0 +1,51 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -24015,9 +23909,7 @@
 +
 +
 +int
-+__pthread_key_create (key, destr)
-+     pthread_key_t *key;
-+     void (*destr) (void *);
++__pthread_key_create (pthread_key_t *key, void (*destr) (void *))
 +{
 +  /* Find a slot in __pthread_kyes which is unused.  */
 +  for (size_t cnt = 0; cnt < PTHREAD_KEYS_MAX; ++cnt)
@@ -24046,7 +23938,7 @@
 +hidden_def (__pthread_key_create)
 --- /dev/null
 +++ b/fbtl/pthread_key_delete.c
-@@ -0,0 +1,42 @@
+@@ -0,0 +1,41 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -24071,8 +23963,7 @@
 +
 +
 +int
-+pthread_key_delete (key)
-+     pthread_key_t key;
++pthread_key_delete (pthread_key_t key)
 +{
 +  int result = EINVAL;
 +
@@ -24130,7 +24021,7 @@
 +#endif
 --- /dev/null
 +++ b/fbtl/pthread_mutex_consistent.c
-@@ -0,0 +1,36 @@
+@@ -0,0 +1,35 @@
 +/* Copyright (C) 2005-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2005.
@@ -24154,8 +24045,7 @@
 +
 +
 +int
-+pthread_mutex_consistent (mutex)
-+     pthread_mutex_t *mutex;
++pthread_mutex_consistent (pthread_mutex_t *mutex)
 +{
 +  /* Test whether this is a robust mutex with a dead owner.  */
 +  if ((mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_NORMAL_NP) == 0
@@ -24169,7 +24059,7 @@
 +weak_alias (pthread_mutex_consistent, pthread_mutex_consistent_np)
 --- /dev/null
 +++ b/fbtl/pthread_mutex_destroy.c
-@@ -0,0 +1,41 @@
+@@ -0,0 +1,40 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -24195,8 +24085,7 @@
 +
 +
 +int
-+__pthread_mutex_destroy (mutex)
-+     pthread_mutex_t *mutex;
++__pthread_mutex_destroy (pthread_mutex_t *mutex)
 +{
 +  LIBC_PROBE (mutex_destroy, 1, mutex);
 +
@@ -24213,7 +24102,7 @@
 +hidden_def (__pthread_mutex_destroy)
 --- /dev/null
 +++ b/fbtl/pthread_mutex_getprioceiling.c
-@@ -0,0 +1,37 @@
+@@ -0,0 +1,35 @@
 +/* Get current priority ceiling of pthread_mutex_t.
 +   Copyright (C) 2006-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -24238,9 +24127,7 @@
 +
 +
 +int
-+pthread_mutex_getprioceiling (mutex, prioceiling)
-+     const pthread_mutex_t *mutex;
-+     int *prioceiling;
++pthread_mutex_getprioceiling (const pthread_mutex_t *mutex, int *prioceiling)
 +{
 +  if (__builtin_expect ((mutex->__data.__kind
 +			 & PTHREAD_MUTEX_PRIO_PROTECT_NP) == 0, 0))
@@ -24253,7 +24140,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_mutex_init.c
-@@ -0,0 +1,150 @@
+@@ -0,0 +1,149 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -24293,9 +24180,8 @@
 +
 +
 +int
-+__pthread_mutex_init (mutex, mutexattr)
-+     pthread_mutex_t *mutex;
-+     const pthread_mutexattr_t *mutexattr;
++__pthread_mutex_init (pthread_mutex_t *mutex,
++		      const pthread_mutexattr_t *mutexattr)
 +{
 +  const struct pthread_mutexattr *imutexattr;
 +
@@ -24406,7 +24292,7 @@
 +hidden_def (__pthread_mutex_init)
 --- /dev/null
 +++ b/fbtl/pthread_mutex_lock.c
-@@ -0,0 +1,505 @@
+@@ -0,0 +1,504 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -24451,8 +24337,7 @@
 +
 +
 +int
-+__pthread_mutex_lock (mutex)
-+     pthread_mutex_t *mutex;
++__pthread_mutex_lock (pthread_mutex_t *mutex)
 +{
 +  assert (sizeof (mutex->__size) >= sizeof (mutex->__data));
 +
@@ -24897,8 +24782,8 @@
 +
 +#ifdef NO_INCR
 +void
-+__pthread_mutex_cond_lock_adjust (mutex)
-+     pthread_mutex_t *mutex;
++internal_function
++__pthread_mutex_cond_lock_adjust (pthread_mutex_t *mutex)
 +{
 +  assert ((mutex->__data.__kind & PTHREAD_MUTEX_PRIO_INHERIT_NP) != 0);
 +  assert ((mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_NORMAL_NP) == 0);
@@ -24914,7 +24799,7 @@
 +#endif
 --- /dev/null
 +++ b/fbtl/pthread_mutex_setprioceiling.c
-@@ -0,0 +1,118 @@
+@@ -0,0 +1,116 @@
 +/* Set current priority ceiling of pthread_mutex_t.
 +   Copyright (C) 2006-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -24940,10 +24825,8 @@
 +
 +
 +int
-+pthread_mutex_setprioceiling (mutex, prioceiling, old_ceiling)
-+     pthread_mutex_t *mutex;
-+     int prioceiling;
-+     int *old_ceiling;
++pthread_mutex_setprioceiling (pthread_mutex_t *mutex, int prioceiling,
++			      int *old_ceiling)
 +{
 +  /* The low bits of __kind aren't ever changed after pthread_mutex_init,
 +     so we don't need a lock yet.  */
@@ -25035,7 +24918,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_mutex_timedlock.c
-@@ -0,0 +1,496 @@
+@@ -0,0 +1,495 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -25065,9 +24948,8 @@
 +
 +
 +int
-+pthread_mutex_timedlock (mutex, abstime)
-+     pthread_mutex_t *mutex;
-+     const struct timespec *abstime;
++pthread_mutex_timedlock (pthread_mutex_t *mutex,
++			 const struct timespec *abstime)
 +{
 +  int oldval;
 +  pid_t id = THREAD_GETMEM (THREAD_SELF, tid);
@@ -25534,7 +25416,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_mutex_trylock.c
-@@ -0,0 +1,381 @@
+@@ -0,0 +1,380 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -25561,8 +25443,7 @@
 +
 +
 +int
-+__pthread_mutex_trylock (mutex)
-+     pthread_mutex_t *mutex;
++__pthread_mutex_trylock (pthread_mutex_t *mutex)
 +{
 +  int oldval;
 +  pid_t id = THREAD_GETMEM (THREAD_SELF, tid);
@@ -25918,7 +25799,7 @@
 +strong_alias (__pthread_mutex_trylock, pthread_mutex_trylock)
 --- /dev/null
 +++ b/fbtl/pthread_mutex_unlock.c
-@@ -0,0 +1,304 @@
+@@ -0,0 +1,301 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -25951,9 +25832,7 @@
 +
 +int
 +internal_function attribute_hidden
-+__pthread_mutex_unlock_usercnt (mutex, decr)
-+     pthread_mutex_t *mutex;
-+     int decr;
++__pthread_mutex_unlock_usercnt (pthread_mutex_t *mutex, int decr)
 +{
 +  int type = PTHREAD_MUTEX_TYPE (mutex);
 +  if (__builtin_expect (type & ~PTHREAD_MUTEX_KIND_MASK_NP, 0))
@@ -26216,8 +26095,7 @@
 +
 +
 +int
-+__pthread_mutex_unlock (mutex)
-+     pthread_mutex_t *mutex;
++__pthread_mutex_unlock (pthread_mutex_t *mutex)
 +{
 +  return __pthread_mutex_unlock_usercnt (mutex, 1);
 +}
@@ -26225,7 +26103,7 @@
 +hidden_def (__pthread_mutex_unlock)
 --- /dev/null
 +++ b/fbtl/pthread_mutexattr_destroy.c
-@@ -0,0 +1,28 @@
+@@ -0,0 +1,27 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -26248,15 +26126,14 @@
 +
 +
 +int
-+__pthread_mutexattr_destroy (attr)
-+     pthread_mutexattr_t *attr;
++__pthread_mutexattr_destroy (pthread_mutexattr_t *attr)
 +{
 +  return 0;
 +}
 +strong_alias (__pthread_mutexattr_destroy, pthread_mutexattr_destroy)
 --- /dev/null
 +++ b/fbtl/pthread_mutexattr_getprioceiling.c
-@@ -0,0 +1,47 @@
+@@ -0,0 +1,46 @@
 +/* Get priority ceiling setting from pthread_mutexattr_t.
 +   Copyright (C) 2006-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -26280,9 +26157,8 @@
 +
 +
 +int
-+pthread_mutexattr_getprioceiling (attr, prioceiling)
-+     const pthread_mutexattr_t *attr;
-+     int *prioceiling;
++pthread_mutexattr_getprioceiling (const pthread_mutexattr_t *attr,
++				  int *prioceiling)
 +{
 +  const struct pthread_mutexattr *iattr;
 +  int ceiling;
@@ -26306,7 +26182,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_mutexattr_getprotocol.c
-@@ -0,0 +1,36 @@
+@@ -0,0 +1,34 @@
 +/* Get priority protocol setting from pthread_mutexattr_t.
 +   Copyright (C) 2006-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -26330,9 +26206,7 @@
 +
 +
 +int
-+pthread_mutexattr_getprotocol (attr, protocol)
-+     const pthread_mutexattr_t *attr;
-+     int *protocol;
++pthread_mutexattr_getprotocol (const pthread_mutexattr_t *attr, int *protocol)
 +{
 +  const struct pthread_mutexattr *iattr;
 +
@@ -26345,7 +26219,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_mutexattr_getpshared.c
-@@ -0,0 +1,35 @@
+@@ -0,0 +1,33 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -26368,9 +26242,7 @@
 +
 +
 +int
-+pthread_mutexattr_getpshared (attr, pshared)
-+     const pthread_mutexattr_t *attr;
-+     int *pshared;
++pthread_mutexattr_getpshared (const pthread_mutexattr_t *attr, int *pshared)
 +{
 +  const struct pthread_mutexattr *iattr;
 +
@@ -26383,7 +26255,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_mutexattr_getrobust.c
-@@ -0,0 +1,36 @@
+@@ -0,0 +1,34 @@
 +/* Copyright (C) 2005-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2005.
@@ -26406,9 +26278,7 @@
 +
 +
 +int
-+pthread_mutexattr_getrobust (attr, robustness)
-+     const pthread_mutexattr_t *attr;
-+     int *robustness;
++pthread_mutexattr_getrobust (const pthread_mutexattr_t *attr, int *robustness)
 +{
 +  const struct pthread_mutexattr *iattr;
 +
@@ -26422,7 +26292,7 @@
 +weak_alias (pthread_mutexattr_getrobust, pthread_mutexattr_getrobust_np)
 --- /dev/null
 +++ b/fbtl/pthread_mutexattr_gettype.c
-@@ -0,0 +1,35 @@
+@@ -0,0 +1,33 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -26445,9 +26315,7 @@
 +
 +
 +int
-+pthread_mutexattr_gettype (attr, kind)
-+     const pthread_mutexattr_t *attr;
-+     int *kind;
++pthread_mutexattr_gettype (const pthread_mutexattr_t *attr, int *kind)
 +{
 +  const struct pthread_mutexattr *iattr;
 +
@@ -26460,7 +26328,7 @@
 +weak_alias (pthread_mutexattr_gettype, pthread_mutexattr_getkind_np)
 --- /dev/null
 +++ b/fbtl/pthread_mutexattr_init.c
-@@ -0,0 +1,37 @@
+@@ -0,0 +1,36 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -26484,8 +26352,7 @@
 +
 +
 +int
-+__pthread_mutexattr_init (attr)
-+     pthread_mutexattr_t *attr;
++__pthread_mutexattr_init (pthread_mutexattr_t *attr)
 +{
 +  if (sizeof (struct pthread_mutexattr) != sizeof (pthread_mutexattr_t))
 +    memset (attr, '\0', sizeof (*attr));
@@ -26500,7 +26367,7 @@
 +strong_alias (__pthread_mutexattr_init, pthread_mutexattr_init)
 --- /dev/null
 +++ b/fbtl/pthread_mutexattr_setprioceiling.c
-@@ -0,0 +1,46 @@
+@@ -0,0 +1,44 @@
 +/* Change priority ceiling setting in pthread_mutexattr_t.
 +   Copyright (C) 2006-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -26525,9 +26392,7 @@
 +
 +
 +int
-+pthread_mutexattr_setprioceiling (attr, prioceiling)
-+     pthread_mutexattr_t *attr;
-+     int prioceiling;
++pthread_mutexattr_setprioceiling (pthread_mutexattr_t *attr, int prioceiling)
 +{
 +  if (__sched_fifo_min_prio == -1)
 +    __init_sched_fifo_prio ();
@@ -26549,7 +26414,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_mutexattr_setprotocol.c
-@@ -0,0 +1,40 @@
+@@ -0,0 +1,38 @@
 +/* Change priority protocol setting in pthread_mutexattr_t.
 +   Copyright (C) 2006-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -26574,9 +26439,7 @@
 +
 +
 +int
-+pthread_mutexattr_setprotocol (attr, protocol)
-+     pthread_mutexattr_t *attr;
-+     int protocol;
++pthread_mutexattr_setprotocol (pthread_mutexattr_t *attr, int protocol)
 +{
 +  if (protocol != PTHREAD_PRIO_NONE
 +      && protocol != PTHREAD_PRIO_INHERIT
@@ -26592,7 +26455,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_mutexattr_setpshared.c
-@@ -0,0 +1,42 @@
+@@ -0,0 +1,40 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -26616,9 +26479,7 @@
 +
 +
 +int
-+pthread_mutexattr_setpshared (attr, pshared)
-+     pthread_mutexattr_t *attr;
-+     int pshared;
++pthread_mutexattr_setpshared (pthread_mutexattr_t *attr, int pshared)
 +{
 +  struct pthread_mutexattr *iattr;
 +
@@ -26637,7 +26498,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_mutexattr_setrobust.c
-@@ -0,0 +1,43 @@
+@@ -0,0 +1,41 @@
 +/* Copyright (C) 2005-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2005.
@@ -26661,9 +26522,7 @@
 +
 +
 +int
-+pthread_mutexattr_setrobust (attr, robustness)
-+     pthread_mutexattr_t *attr;
-+     int robustness;
++pthread_mutexattr_setrobust (pthread_mutexattr_t *attr, int robustness)
 +{
 +  if (robustness != PTHREAD_MUTEX_STALLED_NP
 +      && __builtin_expect (robustness != PTHREAD_MUTEX_ROBUST_NP, 0))
@@ -26683,7 +26542,7 @@
 +weak_alias (pthread_mutexattr_setrobust, pthread_mutexattr_setrobust_np)
 --- /dev/null
 +++ b/fbtl/pthread_mutexattr_settype.c
-@@ -0,0 +1,40 @@
+@@ -0,0 +1,38 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -26707,9 +26566,7 @@
 +
 +
 +int
-+__pthread_mutexattr_settype (attr, kind)
-+     pthread_mutexattr_t *attr;
-+     int kind;
++__pthread_mutexattr_settype (pthread_mutexattr_t *attr, int kind)
 +{
 +  struct pthread_mutexattr *iattr;
 +
@@ -26783,7 +26640,7 @@
 +hidden_def (__pthread_once)
 --- /dev/null
 +++ b/fbtl/pthread_rwlock_destroy.c
-@@ -0,0 +1,32 @@
+@@ -0,0 +1,31 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -26807,8 +26664,7 @@
 +
 +
 +int
-+__pthread_rwlock_destroy (rwlock)
-+     pthread_rwlock_t *rwlock;
++__pthread_rwlock_destroy (pthread_rwlock_t *rwlock)
 +{
 +  LIBC_PROBE (rwlock_destroy, 1, rwlock);
 +
@@ -26818,7 +26674,7 @@
 +strong_alias (__pthread_rwlock_destroy, pthread_rwlock_destroy)
 --- /dev/null
 +++ b/fbtl/pthread_rwlock_init.c
-@@ -0,0 +1,73 @@
+@@ -0,0 +1,72 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -26850,9 +26706,8 @@
 +
 +
 +int
-+__pthread_rwlock_init (rwlock, attr)
-+     pthread_rwlock_t *rwlock;
-+     const pthread_rwlockattr_t *attr;
++__pthread_rwlock_init (pthread_rwlock_t *rwlock,
++		       const pthread_rwlockattr_t *attr)
 +{
 +  const struct pthread_rwlockattr *iattr;
 +
@@ -26894,7 +26749,7 @@
 +strong_alias (__pthread_rwlock_init, pthread_rwlock_init)
 --- /dev/null
 +++ b/fbtl/pthread_rwlock_rdlock.c
-@@ -0,0 +1,100 @@
+@@ -0,0 +1,99 @@
 +/* Copyright (C) 2003-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003.
@@ -26923,8 +26778,7 @@
 +
 +/* Acquire read lock for RWLOCK.  */
 +int
-+__pthread_rwlock_rdlock (rwlock)
-+     pthread_rwlock_t *rwlock;
++__pthread_rwlock_rdlock (pthread_rwlock_t *rwlock)
 +{
 +  int result = 0;
 +
@@ -26997,7 +26851,7 @@
 +hidden_def (__pthread_rwlock_rdlock)
 --- /dev/null
 +++ b/fbtl/pthread_rwlock_timedrdlock.c
-@@ -0,0 +1,155 @@
+@@ -0,0 +1,154 @@
 +/* Copyright (C) 2003-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003.
@@ -27025,9 +26879,8 @@
 +
 +/* Try to acquire read lock for RWLOCK or return after specfied time.  */
 +int
-+pthread_rwlock_timedrdlock (rwlock, abstime)
-+     pthread_rwlock_t *rwlock;
-+     const struct timespec *abstime;
++pthread_rwlock_timedrdlock (pthread_rwlock_t *rwlock,
++			    const struct timespec *abstime)
 +{
 +  int result = 0;
 +
@@ -27155,7 +27008,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_rwlock_timedwrlock.c
-@@ -0,0 +1,146 @@
+@@ -0,0 +1,145 @@
 +/* Copyright (C) 2003-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003.
@@ -27184,9 +27037,8 @@
 +
 +/* Try to acquire write lock for RWLOCK or return after specfied time.	*/
 +int
-+pthread_rwlock_timedwrlock (rwlock, abstime)
-+     pthread_rwlock_t *rwlock;
-+     const struct timespec *abstime;
++pthread_rwlock_timedwrlock (pthread_rwlock_t *rwlock,
++			    const struct timespec *abstime)
 +{
 +  int result = 0;
 +
@@ -27463,7 +27315,7 @@
 +hidden_def (__pthread_rwlock_unlock)
 --- /dev/null
 +++ b/fbtl/pthread_rwlock_wrlock.c
-@@ -0,0 +1,92 @@
+@@ -0,0 +1,91 @@
 +/* Copyright (C) 2003-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003.
@@ -27492,8 +27344,7 @@
 +
 +/* Acquire write lock for RWLOCK.  */
 +int
-+__pthread_rwlock_wrlock (rwlock)
-+     pthread_rwlock_t *rwlock;
++__pthread_rwlock_wrlock (pthread_rwlock_t *rwlock)
 +{
 +  int result = 0;
 +
@@ -27558,7 +27409,7 @@
 +hidden_def (__pthread_rwlock_wrlock)
 --- /dev/null
 +++ b/fbtl/pthread_rwlockattr_destroy.c
-@@ -0,0 +1,29 @@
+@@ -0,0 +1,28 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -27581,8 +27432,7 @@
 +
 +
 +int
-+pthread_rwlockattr_destroy (attr)
-+     pthread_rwlockattr_t *attr;
++pthread_rwlockattr_destroy (pthread_rwlockattr_t *attr)
 +{
 +  /* Nothing to do.  For now.  */
 +
@@ -27590,7 +27440,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_rwlockattr_getkind_np.c
-@@ -0,0 +1,30 @@
+@@ -0,0 +1,28 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -27613,9 +27463,7 @@
 +
 +
 +int
-+pthread_rwlockattr_getkind_np (attr, pref)
-+     const pthread_rwlockattr_t *attr;
-+     int *pref;
++pthread_rwlockattr_getkind_np (const pthread_rwlockattr_t *attr, int *pref)
 +{
 +  *pref = ((const struct pthread_rwlockattr *) attr)->lockkind;
 +
@@ -27623,7 +27471,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_rwlockattr_getpshared.c
-@@ -0,0 +1,30 @@
+@@ -0,0 +1,28 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -27646,9 +27494,7 @@
 +
 +
 +int
-+pthread_rwlockattr_getpshared (attr, pshared)
-+     const pthread_rwlockattr_t *attr;
-+     int *pshared;
++pthread_rwlockattr_getpshared (const pthread_rwlockattr_t *attr, int *pshared)
 +{
 +  *pshared = ((const struct pthread_rwlockattr *) attr)->pshared;
 +
@@ -27656,7 +27502,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_rwlockattr_init.c
-@@ -0,0 +1,34 @@
+@@ -0,0 +1,33 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -27679,8 +27525,7 @@
 +
 +
 +int
-+pthread_rwlockattr_init (attr)
-+     pthread_rwlockattr_t *attr;
++pthread_rwlockattr_init (pthread_rwlockattr_t *attr)
 +{
 +  struct pthread_rwlockattr *iattr;
 +
@@ -27693,7 +27538,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_rwlockattr_setkind_np.c
-@@ -0,0 +1,40 @@
+@@ -0,0 +1,38 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -27717,9 +27562,7 @@
 +
 +
 +int
-+pthread_rwlockattr_setkind_np (attr, pref)
-+     pthread_rwlockattr_t *attr;
-+     int pref;
++pthread_rwlockattr_setkind_np (pthread_rwlockattr_t *attr, int pref)
 +{
 +  struct pthread_rwlockattr *iattr;
 +
@@ -27736,7 +27579,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_rwlockattr_setpshared.c
-@@ -0,0 +1,39 @@
+@@ -0,0 +1,37 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -27760,9 +27603,7 @@
 +
 +
 +int
-+pthread_rwlockattr_setpshared (attr, pshared)
-+     pthread_rwlockattr_t *attr;
-+     int pshared;
++pthread_rwlockattr_setpshared (pthread_rwlockattr_t *attr, int pshared)
 +{
 +  struct pthread_rwlockattr *iattr;
 +
@@ -27928,7 +27769,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_setcancelstate.c
-@@ -0,0 +1,73 @@
+@@ -0,0 +1,71 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -27953,9 +27794,7 @@
 +
 +
 +int
-+__pthread_setcancelstate (state, oldstate)
-+     int state;
-+     int *oldstate;
++__pthread_setcancelstate (int state, int *oldstate)
 +{
 +  volatile struct pthread *self;
 +
@@ -28004,7 +27843,7 @@
 +hidden_def (__pthread_setcancelstate)
 --- /dev/null
 +++ b/fbtl/pthread_setcanceltype.c
-@@ -0,0 +1,75 @@
+@@ -0,0 +1,73 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -28029,9 +27868,7 @@
 +
 +
 +int
-+__pthread_setcanceltype (type, oldtype)
-+     int type;
-+     int *oldtype;
++__pthread_setcanceltype (int type, int *oldtype)
 +{
 +  volatile struct pthread *self;
 +
@@ -28082,7 +27919,7 @@
 +strong_alias (__pthread_setcanceltype, pthread_setcanceltype)
 --- /dev/null
 +++ b/fbtl/pthread_setconcurrency.c
-@@ -0,0 +1,40 @@
+@@ -0,0 +1,39 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -28110,8 +27947,7 @@
 +
 +
 +int
-+pthread_setconcurrency (level)
-+     int level;
++pthread_setconcurrency (int level)
 +{
 +  if (level < 0)
 +    return EINVAL;
@@ -28167,7 +28003,7 @@
 +#include <setreuid.c>
 --- /dev/null
 +++ b/fbtl/pthread_setschedparam.c
-@@ -0,0 +1,73 @@
+@@ -0,0 +1,71 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -28194,10 +28030,8 @@
 +
 +
 +int
-+__pthread_setschedparam (threadid, policy, param)
-+     pthread_t threadid;
-+     int policy;
-+     const struct sched_param *param;
++__pthread_setschedparam (pthread_t threadid, int policy,
++			 const struct sched_param *param)
 +{
 +  struct pthread *pd = (struct pthread *) threadid;
 +
@@ -28243,7 +28077,7 @@
 +strong_alias (__pthread_setschedparam, pthread_setschedparam)
 --- /dev/null
 +++ b/fbtl/pthread_setschedprio.c
-@@ -0,0 +1,65 @@
+@@ -0,0 +1,63 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -28271,9 +28105,7 @@
 +
 +
 +int
-+pthread_setschedprio (threadid, prio)
-+     pthread_t threadid;
-+     int prio;
++pthread_setschedprio (pthread_t threadid, int prio)
 +{
 +  struct pthread *pd = (struct pthread *) threadid;
 +
@@ -28311,7 +28143,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_setspecific.c
-@@ -0,0 +1,95 @@
+@@ -0,0 +1,93 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -28336,9 +28168,7 @@
 +
 +
 +int
-+__pthread_setspecific (key, value)
-+     pthread_key_t key;
-+     const void *value;
++__pthread_setspecific (pthread_key_t key, const void *value)
 +{
 +  struct pthread *self;
 +  unsigned int idx1st;
@@ -28415,7 +28245,7 @@
 +#include <setuid.c>
 --- /dev/null
 +++ b/fbtl/pthread_spin_destroy.c
-@@ -0,0 +1,28 @@
+@@ -0,0 +1,27 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -28438,8 +28268,7 @@
 +
 +
 +int
-+pthread_spin_destroy (lock)
-+     pthread_spinlock_t *lock;
++pthread_spin_destroy (pthread_spinlock_t *lock)
 +{
 +  /* Nothing to do.  */
 +  return 0;
@@ -28640,7 +28469,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_timedjoin.c
-@@ -0,0 +1,106 @@
+@@ -0,0 +1,104 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -28673,10 +28502,8 @@
 +
 +
 +int
-+pthread_timedjoin_np (threadid, thread_return, abstime)
-+     pthread_t threadid;
-+     void **thread_return;
-+     const struct timespec *abstime;
++pthread_timedjoin_np (pthread_t threadid, void **thread_return,
++		      const struct timespec *abstime)
 +{
 +  struct pthread *self;
 +  struct pthread *pd = (struct pthread *) threadid;
@@ -28749,7 +28576,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/pthread_tryjoin.c
-@@ -0,0 +1,74 @@
+@@ -0,0 +1,72 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -28776,9 +28603,7 @@
 +
 +
 +int
-+pthread_tryjoin_np (threadid, thread_return)
-+     pthread_t threadid;
-+     void **thread_return;
++pthread_tryjoin_np (pthread_t threadid, void **thread_return)
 +{
 +  struct pthread *self;
 +  struct pthread *pd = (struct pthread *) threadid;
@@ -28855,7 +28680,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/sem_close.c
-@@ -0,0 +1,80 @@
+@@ -0,0 +1,79 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -28898,8 +28723,7 @@
 +
 +
 +int
-+sem_close (sem)
-+     sem_t *sem;
++sem_close (sem_t *sem)
 +{
 +  int result = 0;
 +
@@ -28938,7 +28762,7 @@
 +}
 --- /dev/null
 +++ b/fbtl/sem_destroy.c
-@@ -0,0 +1,37 @@
+@@ -0,0 +1,36 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -28963,8 +28787,7 @@
 +
 +
 +int
-+__new_sem_destroy (sem)
-+     sem_t *sem;
++__new_sem_destroy (sem_t *sem)
 +{
 +  /* XXX Check for valid parameter.  */
 +
@@ -28978,7 +28801,7 @@
 +#endif
 --- /dev/null
 +++ b/fbtl/sem_getvalue.c
-@@ -0,0 +1,41 @@
+@@ -0,0 +1,39 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -29003,9 +28826,7 @@
 +
 +
 +int
-+__new_sem_getvalue (sem, sval)
-+     sem_t *sem;
-+     int *sval;
++__new_sem_getvalue (sem_t *sem, int *sval)
 +{
 +  struct new_sem *isem = (struct new_sem *) sem;
 +
@@ -29022,7 +28843,7 @@
 +#endif
 --- /dev/null
 +++ b/fbtl/sem_init.c
-@@ -0,0 +1,87 @@
+@@ -0,0 +1,81 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -29050,10 +28871,7 @@
 +
 +
 +int
-+__new_sem_init (sem, pshared, value)
-+     sem_t *sem;
-+     int pshared;
-+     unsigned int value;
++__new_sem_init (sem_t *sem, int pshared, unsigned int value)
 +{
 +  /* Parameter sanity check.  */
 +  if (__builtin_expect (value > SEM_VALUE_MAX, 0))
@@ -29085,10 +28903,7 @@
 +#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)
 +int
 +attribute_compat_text_section
-+__old_sem_init (sem, pshared, value)
-+     sem_t *sem;
-+     int pshared;
-+     unsigned int value;
++__old_sem_init (sem_t *sem, int pshared, unsigned int value)
 +{
 +  /* Parameter sanity check.  */
 +  if (__builtin_expect (value > SEM_VALUE_MAX, 0))
@@ -29598,7 +29413,7 @@
 +libpthread=0		GLIBC_2.3
 --- /dev/null
 +++ b/fbtl/sigaction.c
-@@ -0,0 +1,46 @@
+@@ -0,0 +1,43 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -29630,10 +29445,7 @@
 +
 +
 +int
-+__sigaction (sig, act, oact)
-+     int sig;
-+     const struct sigaction *act;
-+     struct sigaction *oact;
++__sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
 +{
 +  if (__builtin_expect (sig == SIGCANCEL || sig == SIGSETXID, 0))
 +    {
@@ -31072,7 +30884,7 @@
 +#endif	/* tls.h */
 --- /dev/null
 +++ b/fbtl/sysdeps/pthread/Makefile
-@@ -0,0 +1,41 @@
+@@ -0,0 +1,39 @@
 +# Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +# This file is part of the GNU C Library.
 +# Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -31105,11 +30917,9 @@
 +$(objpfx)tst-timer: $(objpfx)librt.a $(static-thread-library)
 +endif
 +
-+ifeq ($(have-forced-unwind),yes)
 +tests += tst-mqueue8x
 +CFLAGS-tst-mqueue8x.c += -fexceptions
 +endif
-+endif
 +
 +ifeq ($(subdir),posix)
 +CFLAGS-confstr.c += -DLIBPTHREAD_VERSION='"FBTL $(version)"'
@@ -31825,8 +31635,8 @@
 +   License along with the GNU C Library; see the file COPYING.LIB.  If
 +   not, see <http://www.gnu.org/licenses/>.  */
 +
-+#ifndef _BITS_LIBC_LOCK_H
-+#define _BITS_LIBC_LOCK_H 1
++#ifndef _LIBC_LOCK_H
++#define _LIBC_LOCK_H 1
 +
 +#include <pthread.h>
 +#define __need_NULL
@@ -31857,7 +31667,7 @@
 +/* Define an initialized recursive lock variable NAME with storage
 +   class CLASS.  */
 +#if defined _LIBC && (IS_IN (libc) || IS_IN (libpthread))
-+# define __libc_lock_define_initialized_recursive(CLASS,NAME) \
++# define __libc_lock_define_initialized_recursive(CLASS, NAME) \
 +  CLASS __libc_lock_recursive_t NAME = _LIBC_LOCK_RECURSIVE_INITIALIZER;
 +# define _LIBC_LOCK_RECURSIVE_INITIALIZER \
 +  { LLL_LOCK_INITIALIZER, 0, NULL }
@@ -31891,7 +31701,7 @@
 +# define __libc_lock_fini_recursive(NAME) ((void) 0)
 +#else
 +# define __libc_lock_fini_recursive(NAME) \
-+  __libc_maybe_call (__pthread_mutex_destroy, (&(NAME)), 0)
++  __libc_maybe_call (__pthread_mutex_destroy, (&(NAME).mutex), 0)
 +#endif
 +
 +/* Lock the recursive named lock variable.  */
@@ -31933,7 +31743,7 @@
 +  })
 +#else
 +# define __libc_lock_trylock_recursive(NAME) \
-+  __libc_maybe_call (__pthread_mutex_trylock, (&(NAME)), 0)
++  __libc_maybe_call (__pthread_mutex_trylock, (&(NAME).mutex), 0)
 +#endif
 +
 +/* Unlock the recursive named lock variable.  */
@@ -31949,7 +31759,7 @@
 +  } while (0)
 +#else
 +# define __libc_lock_unlock_recursive(NAME) \
-+  __libc_maybe_call (__pthread_mutex_unlock, (&(NAME)), 0)
++  __libc_maybe_call (__pthread_mutex_unlock, (&(NAME).mutex), 0)
 +#endif
 +
 +/* Note that for I/O cleanup handling we are using the old-style
@@ -32015,8 +31825,8 @@
 +   License along with the GNU C Library; see the file COPYING.LIB.  If
 +   not, see <http://www.gnu.org/licenses/>.  */
 +
-+#ifndef _BITS_LIBC_LOCKP_H
-+#define _BITS_LIBC_LOCKP_H 1
++#ifndef _LIBC_LOCKP_H
++#define _LIBC_LOCKP_H 1
 +
 +#include <pthread.h>
 +#define __need_NULL
@@ -32139,7 +31949,7 @@
 +   state.  */
 +#if IS_IN (libc) || IS_IN (libpthread)
 +# define __libc_lock_init(NAME) \
-+  ((void) ((NAME) = LLL_LOCK_INITIALIZER)) 
++  ((void) ((NAME) = LLL_LOCK_INITIALIZER))
 +#else
 +# define __libc_lock_init(NAME) \
 +  __libc_maybe_call (__pthread_mutex_init, (&(NAME), NULL), 0)
@@ -32147,7 +31957,7 @@
 +#if defined SHARED && IS_IN (libc)
 +/* ((NAME) = (__libc_rwlock_t) PTHREAD_RWLOCK_INITIALIZER) is inefficient.  */
 +# define __libc_rwlock_init(NAME) \
-+  ((void) __builtin_memset (&(NAME), '\0', sizeof (NAME))) 
++  ((void) __builtin_memset (&(NAME), '\0', sizeof (NAME)))
 +#else
 +# define __libc_rwlock_init(NAME) \
 +  __libc_maybe_call (__pthread_rwlock_init, (&(NAME), NULL), 0)
@@ -36525,30 +36335,6 @@
 +
 +#endif	/* tls.h */
 --- /dev/null
-+++ b/fbtl/sysdeps/x86_64/tls.h.rej
-@@ -0,0 +1,21 @@
-+--- fbtl/sysdeps/x86_64/tls.h
-++++ fbtl/sysdeps/x86_64/tls.h
-+@@ -67,14 +67,15 @@ typedef struct
-+ # else
-+   int __glibc_reserved1;
-+ # endif
-+-  int rtld_must_xmm_save;
-++  int __glibc_unused1;
-+   /* Reservation of some values for the TM ABI.  */
-+   void *__private_tm[4];
-+   /* GCC split stack support.  */
-+   void *__private_ss;
-+   long int __glibc_reserved2;
-+-  /* Have space for the post-AVX register size.  */
-+-  __128bits rtld_savespace_sse[8][4] __attribute__ ((aligned (32)));
-++  /* Must be kept even if it is no longer used by glibc since programs,
-++     like AddressSanitizer, depend on the size of tcbhead_t.  */
-++  __128bits __glibc_unused2[8][4] __attribute__ ((aligned (32)));
-+ 
-+   void *__padding[8];
-+ } tcbhead_t;
---- /dev/null
 +++ b/fbtl/tpp.c
 @@ -0,0 +1,171 @@
 +/* Thread Priority Protect helpers.
@@ -69605,7 +69391,7 @@
 +#include <posix/tst-vfork2.c>
 --- /dev/null
 +++ b/fbtl/unwind.c
-@@ -0,0 +1,182 @@
+@@ -0,0 +1,148 @@
 +/* Copyright (C) 2003-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>
@@ -69632,8 +69418,6 @@
 +#include "pthreadP.h"
 +#include <jmpbuf-unwind.h>
 +
-+#ifdef HAVE_FORCED_UNWIND
-+
 +#ifdef _STACK_GROWS_DOWN
 +# define FRAME_LEFT(frame, other, adj) \
 +  ((uintptr_t) frame - adj >= (uintptr_t) other - adj)
@@ -69725,8 +69509,6 @@
 +  abort ();
 +}
 +
-+#endif	/* have forced unwind */
-+
 +
 +void
 +__cleanup_fct_attribute __attribute ((noreturn))
@@ -69735,42 +69517,12 @@
 +  struct pthread_unwind_buf *ibuf = (struct pthread_unwind_buf *) buf;
 +  struct pthread *self = THREAD_SELF;
 +
-+#ifdef HAVE_FORCED_UNWIND
 +  /* This is not a catchable exception, so don't provide any details about
 +     the exception type.  We do need to initialize the field though.  */
 +  THREAD_SETMEM (self, exc.exception_class, 0);
 +  THREAD_SETMEM (self, exc.exception_cleanup, &unwind_cleanup);
 +
 +  _Unwind_ForcedUnwind (&self->exc, unwind_stop, ibuf);
-+#else
-+  /* Handle the compatibility stuff first.  Execute all handlers
-+     registered with the old method.  We don't execute them in order,
-+     instead, they will run first.  */
-+  struct _pthread_cleanup_buffer *oldp = ibuf->priv.data.cleanup;
-+  struct _pthread_cleanup_buffer *curp = THREAD_GETMEM (self, cleanup);
-+
-+  if (curp != oldp)
-+    {
-+      do
-+	{
-+	  /* Pointer to the next element.  */
-+	  struct _pthread_cleanup_buffer *nextp = curp->__prev;
-+
-+	  /* Call the handler.  */
-+	  curp->__routine (curp->__arg);
-+
-+	  /* To the next.  */
-+	  curp = nextp;
-+	}
-+      while (curp != oldp);
-+
-+      /* Mark the current element as handled.  */
-+      THREAD_SETMEM (self, cleanup, curp);
-+    }
-+
-+  /* We simply jump to the registered setjmp buffer.  */
-+  __libc_unwind_longjmp ((struct __jmp_buf_tag *) ibuf->cancel_jmp_buf, 1);
-+#endif
 +  /* NOTREACHED */
 +
 +  /* We better do not get here.  */
@@ -69836,7 +69588,7 @@
 +hidden_data_def (__pthread_keys)
 --- /dev/null
 +++ b/fbtl/version.c
-@@ -0,0 +1,44 @@
+@@ -0,0 +1,42 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -69865,9 +69617,7 @@
 +This is free software; see the source for copying conditions.\n\
 +There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\
 +PARTICULAR PURPOSE.\n"
-+#ifdef HAVE_FORCED_UNWIND
 +"Forced unwind support included.\n"
-+#endif
 +;
 +
 +
@@ -71122,7 +70872,7 @@
 +}
 --- /dev/null
 +++ b/fbtl_db/td_ta_clear_event.c
-@@ -0,0 +1,79 @@
+@@ -0,0 +1,77 @@
 +/* Globally disable events.
 +   Copyright (C) 1999-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -71147,9 +70897,7 @@
 +
 +
 +td_err_e
-+td_ta_clear_event (ta_arg, event)
-+     const td_thragent_t *ta_arg;
-+     td_thr_events_t *event;
++td_ta_clear_event (const td_thragent_t *ta_arg, td_thr_events_t *event)
 +{
 +  td_thragent_t *const ta = (td_thragent_t *) ta_arg;
 +  td_err_e err;
@@ -71929,7 +71677,7 @@
 +}
 --- /dev/null
 +++ b/fbtl_db/td_ta_set_event.c
-@@ -0,0 +1,79 @@
+@@ -0,0 +1,77 @@
 +/* Globally enable events.
 +   Copyright (C) 1999-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -71954,9 +71702,7 @@
 +
 +
 +td_err_e
-+td_ta_set_event (ta_arg, event)
-+     const td_thragent_t *ta_arg;
-+     td_thr_events_t *event;
++td_ta_set_event (const td_thragent_t *ta_arg, td_thr_events_t *event)
 +{
 +  td_thragent_t *const ta = (td_thragent_t *) ta_arg;
 +  td_err_e err;
@@ -72305,7 +72051,7 @@
 +}
 --- /dev/null
 +++ b/fbtl_db/td_thr_clear_event.c
-@@ -0,0 +1,77 @@
+@@ -0,0 +1,75 @@
 +/* Disable specific event for thread.
 +   Copyright (C) 1999-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -72332,9 +72078,7 @@
 +
 +
 +td_err_e
-+td_thr_clear_event (th, event)
-+     const td_thrhandle_t *th;
-+     td_thr_events_t *event;
++td_thr_clear_event (const td_thrhandle_t *th, td_thr_events_t *event)
 +{
 +  td_err_e err;
 +  psaddr_t eventmask;
@@ -72449,7 +72193,7 @@
 +}
 --- /dev/null
 +++ b/fbtl_db/td_thr_event_enable.c
-@@ -0,0 +1,51 @@
+@@ -0,0 +1,49 @@
 +/* Enable event process-wide.
 +   Copyright (C) 1999-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -72473,9 +72217,7 @@
 +
 +
 +td_err_e
-+td_thr_event_enable (th, onoff)
-+     const td_thrhandle_t *th;
-+     int onoff;
++td_thr_event_enable (const td_thrhandle_t *th, int onoff)
 +{
 +  LOG ("td_thr_event_enable");
 +
@@ -72937,7 +72679,7 @@
 +}
 --- /dev/null
 +++ b/fbtl_db/td_thr_set_event.c
-@@ -0,0 +1,77 @@
+@@ -0,0 +1,75 @@
 +/* Enable specific event for thread.
 +   Copyright (C) 1999-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -72964,9 +72706,7 @@
 +
 +
 +td_err_e
-+td_thr_set_event (th, event)
-+     const td_thrhandle_t *th;
-+     td_thr_events_t *event;
++td_thr_set_event (const td_thrhandle_t *th, td_thr_events_t *event)
 +{
 +  td_err_e err;
 +  psaddr_t eventmask;
diff --git a/debian/patches/kfreebsd/local-sysdeps.diff b/debian/patches/kfreebsd/local-sysdeps.diff
index bc3d7d9..fceb6d5 100644
--- a/debian/patches/kfreebsd/local-sysdeps.diff
+++ b/debian/patches/kfreebsd/local-sysdeps.diff
@@ -561,7 +561,7 @@
 +weak_alias (__access, access)
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/aio_sigqueue.c
-@@ -0,0 +1,40 @@
+@@ -0,0 +1,38 @@
 +/* Copyright (C) 2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -591,10 +591,8 @@
 +#include <aio_misc.h>
 +
 +int
-+__aio_sigqueue (sig, val, caller_pid)
-+     int sig;
-+     const union sigval val;
-+     pid_t caller_pid;
++internal_function
++__aio_sigqueue (int sig, const union sigval val, pid_t caller_pid)
 +{
 +#if !IS_IN (libc)
 +    return sigqueue(caller_pid, sig, val);
@@ -5151,7 +5149,7 @@
 +#endif	/* Use BSD.  */
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/brk.c
-@@ -0,0 +1,50 @@
+@@ -0,0 +1,49 @@
 +/* Copyright (C) 2004, 2010 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Robert Millan
@@ -5186,8 +5184,7 @@
 +/* Set the end of the process's data space to ADDR.
 +   Return 0 if successful, -1 if not.  */
 +int
-+__brk (addr)
-+     void *addr;
++__brk (void *addr)
 +{
 +  if ((char*)addr < _end)
 +    return 0;
@@ -6503,7 +6500,7 @@
 +#include "getcwd.c"
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/dl-openat64.c
-@@ -0,0 +1,36 @@
+@@ -0,0 +1,33 @@
 +/* Copyright (C) 2011 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@gmain.com>, 2003.
@@ -6531,10 +6528,7 @@
 +libc_hidden_proto (__syscall_openat)
 +
 +int
-+openat64 (dfd, file, oflag)
-+     int dfd;
-+     const char *file;
-+     int oflag;
++openat64 (int dfd, const char *file, int oflag, ...)
 +{
 +  assert ((oflag & O_CREAT) == 0);
 +
@@ -7203,7 +7197,7 @@
 +}
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/faccessat.c
-@@ -0,0 +1,68 @@
+@@ -0,0 +1,64 @@
 +/* Test for access to file, relative to open directory.  Linux version.
 +   Copyright (C) 2006 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -7248,11 +7242,7 @@
 + */
 +
 +int
-+faccessat (fd, file, mode, flag)
-+     int fd;
-+     const char *file;
-+     int mode;
-+     int flag;
++faccessat (int fd, const char *file, int mode, int flag)
 +{
 +        int result = INLINE_SYSCALL (faccessat, 4, fd, file, mode, flag);
 +        if ((result == 0) && (mode & X_OK))
@@ -9042,7 +9032,7 @@
 +#endif
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/fbtl/libc_pthread_init.c
-@@ -0,0 +1,86 @@
+@@ -0,0 +1,85 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -9080,10 +9070,9 @@
 +
 +int *
 +#endif
-+__libc_pthread_init (ptr, reclaim, functions)
-+     unsigned long int *ptr;
-+     void (*reclaim) (void);
-+     const struct pthread_functions *functions;
++internal_function
++__libc_pthread_init (unsigned long int *ptr, void (*reclaim) (void),
++		     const struct pthread_functions *functions)
 +{
 +  /* Remember the pointer to the generation counter in libpthread.  */
 +  __fork_generation_pointer = ptr;
@@ -9482,7 +9471,7 @@
 +strong_alias (__fork, fork)
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/fbtl/pt-raise.c
-@@ -0,0 +1,55 @@
+@@ -0,0 +1,54 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -9509,8 +9498,7 @@
 +
 +
 +int
-+raise (sig)
-+     int sig;
++raise (int sig)
 +{
 +  /* raise is an async-safe function.  It could be called while the
 +     fork function temporarily invalidated the PID field.  Adjust for
@@ -9536,7 +9524,7 @@
 +
 +  return INLINE_SYSCALL (tgkill, 3, pid, THREAD_GETMEM (THREAD_SELF, tid),
 +			 sig);
-+#endif			 
++#endif
 +}
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/fbtl/pthread_attr_getaffinity.c
@@ -9761,7 +9749,7 @@
 +#endif
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/fbtl/pthread_getcpuclockid.c
-@@ -0,0 +1,38 @@
+@@ -0,0 +1,36 @@
 +/* Copyright (C) 2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -9787,9 +9775,7 @@
 +#include <tls.h>
 +
 +int
-+pthread_getcpuclockid (threadid, clockid)
-+     pthread_t threadid;
-+     clockid_t *clockid;
++pthread_getcpuclockid (pthread_t threadid, clockid_t *clockid)
 +{
 +  struct pthread *pd = (struct pthread *) threadid;
 +
@@ -9802,7 +9788,7 @@
 +}
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/fbtl/pthread_getname.c
-@@ -0,0 +1,50 @@
+@@ -0,0 +1,47 @@
 +/* pthread_getname_np -- Get  thread name.
 +   Copyright (C) 2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -9830,10 +9816,7 @@
 +#include <sys/ptrace.h>
 +
 +int
-+pthread_getname_np (th, buf, len)
-+     pthread_t th;
-+     char *buf;
-+     size_t len;
++pthread_getname_np (pthread_t th, char *buf, size_t len)
 +{
 +  const struct pthread *pd = (const struct pthread *) th;
 +  struct ptrace_lwpinfo ti;
@@ -9855,7 +9838,7 @@
 +}
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/fbtl/pthread_getschedparam.c
-@@ -0,0 +1,79 @@
+@@ -0,0 +1,77 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -9881,10 +9864,8 @@
 +
 +
 +int
-+__pthread_getschedparam (threadid, policy, param)
-+     pthread_t threadid;
-+     int *policy;
-+     struct sched_param *param;
++__pthread_getschedparam (pthread_t threadid, int *policy,
++			 struct sched_param *param)
 +{
 +  struct pthread *pd = (struct pthread *) threadid;
 +
@@ -9937,7 +9918,7 @@
 +strong_alias (__pthread_getschedparam, pthread_getschedparam)
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/fbtl/pthread_kill.c
-@@ -0,0 +1,69 @@
+@@ -0,0 +1,67 @@
 +/* Copyright (C) 2002-2012 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -9965,9 +9946,7 @@
 +
 +
 +int
-+__pthread_kill (threadid, signo)
-+     pthread_t threadid;
-+     int signo;
++__pthread_kill (pthread_t threadid, int signo)
 +{
 +  struct pthread *pd = (struct pthread *) threadid;
 +
@@ -10019,14 +9998,14 @@
 +#define LLL_ROBUST_MUTEX_LOCK(mutex, id) \
 +  lll_robust_cond_lock ((mutex)->__data.__lock, id, \
 +			PTHREAD_ROBUST_MUTEX_PSHARED (mutex))
-+#define __pthread_mutex_lock __pthread_mutex_cond_lock
++#define __pthread_mutex_lock internal_function __pthread_mutex_cond_lock
 +#define __pthread_mutex_lock_full __pthread_mutex_cond_lock_full
 +#define NO_INCR
 +
 +#include <fbtl/pthread_mutex_lock.c>
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/fbtl/pthread_once.c
-@@ -0,0 +1,131 @@
+@@ -0,0 +1,129 @@
 +/* Copyright (C) 2003-2014 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Jakub Jelinek <jakub@redhat.com>, 2003.
@@ -10086,9 +10065,7 @@
 +   again, we can deadlock because we can't distinguish the in-progress and
 +   interrupted cases anymore.  */
 +int
-+__pthread_once (once_control, init_routine)
-+     pthread_once_t *once_control;
-+     void (*init_routine) (void);
++__pthread_once (pthread_once_t *once_control, void (*init_routine) (void))
 +{
 +  while (1)
 +    {
@@ -10233,7 +10210,7 @@
 +#endif
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/fbtl/pthread_setname.c
-@@ -0,0 +1,34 @@
+@@ -0,0 +1,32 @@
 +/* pthread_setname_np -- Set  thread name
 +   Copyright (C) 2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -10260,9 +10237,7 @@
 +#include <unistd.h>
 +
 +int
-+pthread_setname_np (th, name)
-+     pthread_t th;
-+     const char *name;
++pthread_setname_np (pthread_t th, const char *name)
 +{
 +  const struct pthread *pd = (const struct pthread *) th;
 +
@@ -10270,7 +10245,7 @@
 +}
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/fbtl/pthread_setschedparam.c
-@@ -0,0 +1,78 @@
+@@ -0,0 +1,76 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -10297,10 +10272,8 @@
 +
 +
 +int
-+__pthread_setschedparam (threadid, policy, param)
-+     pthread_t threadid;
-+     int policy;
-+     const struct sched_param *param;
++__pthread_setschedparam (pthread_t threadid, int policy,
++			 const struct sched_param *param)
 +{
 +  struct pthread *pd = (struct pthread *) threadid;
 +
@@ -10351,7 +10324,7 @@
 +strong_alias (__pthread_setschedparam, pthread_setschedparam)
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/fbtl/pthread_setschedprio.c
-@@ -0,0 +1,70 @@
+@@ -0,0 +1,68 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -10379,9 +10352,7 @@
 +
 +
 +int
-+pthread_setschedprio (threadid, prio)
-+     pthread_t threadid;
-+     int prio;
++pthread_setschedprio (pthread_t threadid, int prio)
 +{
 +  struct pthread *pd = (struct pthread *) threadid;
 +
@@ -10479,7 +10450,7 @@
 +}
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/fbtl/raise.c
-@@ -0,0 +1,74 @@
+@@ -0,0 +1,73 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -10507,8 +10478,7 @@
 +
 +
 +int
-+raise (sig)
-+     int sig;
++raise (int sig)
 +{
 +#if 1
 +#warning TODO recheck
@@ -10556,7 +10526,7 @@
 +weak_alias (raise, gsignal)
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/fbtl/register-atfork.c
-@@ -0,0 +1,145 @@
+@@ -0,0 +1,142 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -10637,11 +10607,8 @@
 +
 +
 +int
-+__register_atfork (prepare, parent, child, dso_handle)
-+     void (*prepare) (void);
-+     void (*parent) (void);
-+     void (*child) (void);
-+     void *dso_handle;
++__register_atfork (void (*prepare) (void), void (*parent) (void),
++		   void (*child) (void), void *dso_handle)
 +{
 +  /* Get the lock to not conflict with other allocations.  */
 +  lll_lock (__fork_lock, LLL_PRIVATE);
@@ -11083,7 +11050,7 @@
 +#endif
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/fbtl/sigprocmask.c
-@@ -0,0 +1,69 @@
+@@ -0,0 +1,66 @@
 +/* Copyright (C) 1997-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -11115,13 +11082,10 @@
 +/* Get and/or change the set of blocked signals.  */
 +int
 +#ifdef BUILD_AS_pthread_sigmask
-+pthread_sigmask(how, set, oset)
++pthread_sigmask(int how, const sigset_t *set, sigset_t *oset)
 +#else
-+__sigprocmask (how, set, oset)
++__sigprocmask (int how, const sigset_t *set, sigset_t *oset)
 +#endif
-+     int how;
-+     const sigset_t *set;
-+     sigset_t *oset;
 +{
 +  sigset_t local_newmask;
 +  int rv;
@@ -11155,7 +11119,7 @@
 +#endif
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/fbtl/sigtimedwait.c
-@@ -0,0 +1,72 @@
+@@ -0,0 +1,70 @@
 +/* Copyright (C) 1997-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -11210,10 +11174,8 @@
 +
 +/* Return any pending signal or wait for one for the given time.  */
 +int
-+__sigtimedwait (set, info, timeout)
-+     const sigset_t *set;
-+     siginfo_t *info;
-+     const struct timespec *timeout;
++__sigtimedwait (const sigset_t *set, siginfo_t *info,
++		const struct timespec *timeout)
 +{
 +  if (SINGLE_THREAD_P)
 +    return do_sigtimedwait (set, info, timeout);
@@ -11230,7 +11192,7 @@
 +weak_alias (__sigtimedwait, sigtimedwait)
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/fbtl/sigwait.c
-@@ -0,0 +1,78 @@
+@@ -0,0 +1,76 @@
 +/* Copyright (C) 1997-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -11291,9 +11253,7 @@
 +}
 +
 +int
-+__sigwait (set, sig)
-+     const sigset_t *set;
-+     int *sig;
++__sigwait (const sigset_t *set, int *sig)
 +{
 +  if (SINGLE_THREAD_P)
 +    return do_sigwait (set, sig);
@@ -11311,7 +11271,7 @@
 +strong_alias (__sigwait, __libc_sigwait)
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/fbtl/sigwaitinfo.c
-@@ -0,0 +1,74 @@
+@@ -0,0 +1,72 @@
 +/* Copyright (C) 1997-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -11368,9 +11328,7 @@
 +
 +/* Return any pending signal or wait for one for the given time.  */
 +int
-+__sigwaitinfo (set, info)
-+     const sigset_t *set;
-+     siginfo_t *info;
++__sigwaitinfo (const sigset_t *set, siginfo_t *info)
 +{
 +  if (SINGLE_THREAD_P)
 +    return do_sigwaitinfo (set, info);
@@ -11520,7 +11478,7 @@
 +#include <sysdeps/posix/sysconf.c>
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/fbtl/timer_create.c
-@@ -0,0 +1,168 @@
+@@ -0,0 +1,165 @@
 +/* Copyright (C) 2003,2004, 2007, 2009, 2012 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
@@ -11555,10 +11513,7 @@
 +
 +
 +int
-+timer_create (clock_id, evp, timerid)
-+     clockid_t clock_id;
-+     struct sigevent *evp;
-+     timer_t *timerid;
++timer_create (clockid_t clock_id, struct sigevent *evp, timer_t *timerid)
 +{
 +    {
 +      /* If the user wants notification via a thread we need to handle
@@ -11691,7 +11646,7 @@
 +}
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/fbtl/timer_delete.c
-@@ -0,0 +1,71 @@
+@@ -0,0 +1,70 @@
 +/* Copyright (C) 2003, 2007, 2012 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
@@ -11720,8 +11675,7 @@
 +
 +
 +int
-+timer_delete (timerid)
-+     timer_t timerid;
++timer_delete (timer_t timerid)
 +{
 +      struct timer *kt = __kfreebsd_timer_id2ptr (timerid);
 +      if (! kt)
@@ -11765,7 +11719,7 @@
 +}
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/fbtl/timer_getoverr.c
-@@ -0,0 +1,37 @@
+@@ -0,0 +1,36 @@
 +/* Copyright (C) 2003, 2012 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
@@ -11793,8 +11747,7 @@
 +
 +
 +int
-+timer_getoverrun (timerid)
-+     timer_t timerid;
++timer_getoverrun (timer_t timerid)
 +{
 +      struct timer *kt = __kfreebsd_timer_id2ptr (timerid);
 +      if (! kt)
@@ -11805,7 +11758,7 @@
 +}
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/fbtl/timer_gettime.c
-@@ -0,0 +1,39 @@
+@@ -0,0 +1,37 @@
 +/* Copyright (C) 2003, 2012 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
@@ -11834,9 +11787,7 @@
 +
 +
 +int
-+timer_gettime (timerid, value)
-+     timer_t timerid;
-+     struct itimerspec *value;
++timer_gettime (timer_t timerid, struct itimerspec *value)
 +{
 +      struct timer *kt = __kfreebsd_timer_id2ptr (timerid);
 +      if (! kt)
@@ -12051,7 +12002,7 @@
 +}
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/fbtl/timer_settime.c
-@@ -0,0 +1,42 @@
+@@ -0,0 +1,39 @@
 +/* Copyright (C) 2003, 2012 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
@@ -12079,11 +12030,8 @@
 +#include "kernel-posix-timers.h"
 +
 +int
-+timer_settime (timerid, flags, value, ovalue)
-+     timer_t timerid;
-+     int flags;
-+     const struct itimerspec *value;
-+     struct itimerspec *ovalue;
++timer_settime (timer_t timerid, int flags, const struct itimerspec *value,
++	       struct itimerspec *ovalue)
 +{
 +      struct timer *kt = __kfreebsd_timer_id2ptr (timerid);
 +      if (! kt)
@@ -12096,7 +12044,7 @@
 +}
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/fbtl/unregister-atfork.c
-@@ -0,0 +1,121 @@
+@@ -0,0 +1,120 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -12122,8 +12070,7 @@
 +
 +
 +void
-+__unregister_atfork (dso_handle)
-+     void *dso_handle;
++__unregister_atfork (void *dso_handle)
 +{
 +  /* Check whether there is any entry in the list which we have to
 +     remove.  It is likely that this is not the case so don't bother
@@ -12673,7 +12620,7 @@
 +/* 'ftruncate64' is the same as 'ftruncate', because __off64_t == __off_t.  */
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/futimesat.c
-@@ -0,0 +1,47 @@
+@@ -0,0 +1,44 @@
 +/* Copyright (C) 2009 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -12711,10 +12658,7 @@
 +/* Change the access time of FILE relative to FD to TVP[0] and
 +   the modification time of FILE to TVP[1].  */
 +int
-+futimesat (fd, file, tvp)
-+     int fd;
-+     const char *file;
-+     const struct timeval tvp[2];
++futimesat (int fd, const char *file, const struct timeval tvp[2])
 +{
 +      if (file == NULL)
 +	return __futimes (fd, tvp);
@@ -12951,7 +12895,7 @@
 +libc_hidden_def (__fxstatat64)
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/gai_sigqueue.c
-@@ -0,0 +1,40 @@
+@@ -0,0 +1,38 @@
 +/* Copyright (C) 2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -12981,10 +12925,8 @@
 +#include <gai_misc.h>
 +
 +int
-+__gai_sigqueue (sig, val, caller_pid)
-+     int sig;
-+     const union sigval val;
-+     pid_t caller_pid;
++internal_function
++__gai_sigqueue (int sig, const union sigval val, pid_t caller_pid)
 +{
 +#if !IS_IN(libc)
 +    return sigqueue(caller_pid, sig, val);
@@ -14161,7 +14103,7 @@
 +weak_alias (__get_avphys_pages, get_avphys_pages)
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/getvfsbyname.c
-@@ -0,0 +1,71 @@
+@@ -0,0 +1,69 @@
 +/*
 + * Copyright (c) 1995
 + *	The Regents of the University of California.  All rights reserved.
@@ -14203,9 +14145,7 @@
 + * and if it is resident, return its xvfsconf structure.
 + */
 +int
-+__getvfsbyname(fsname, vfcp)
-+	const char *fsname;
-+	struct xvfsconf *vfcp;
++__getvfsbyname(const char *fsnamen, struct xvfsconf *vfcp)
 +{
 +	struct xvfsconf *xvfsp;
 +	size_t buflen;
@@ -14629,7 +14569,7 @@
 +u_short:t
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/dl-machine.h
-@@ -0,0 +1,145 @@
+@@ -0,0 +1,80 @@
 +/* Machine-dependent ELF dynamic relocation inline functions.
 +   FreeBSD i386 specific version of dl_platform_init()
 +   Copyright (C) 2006 Free Software Foundation, Inc.
@@ -14681,99 +14621,34 @@
 +
 +#include_next <dl-machine.h>
 +
-+#undef  DL_PLATFORM_INIT
-+#define DL_PLATFORM_INIT dl_platform_kfreebsd_i386_init ()
-+
 +#ifndef _DL_MACHINE_KFREEBSD
 +#define _DL_MACHINE_KFREEBSD
 +
-+#define X86_EFLAGS_AC   0x00040000 /* Alignment Check */
-+#define X86_EFLAGS_ID   0x00200000 /* CPUID detection flag */
-+
-+static inline int try_flip_flags(int val)
-+{
-+    int ret;
-+    __asm__(
-+	"pushfl\n\t"
-+	"pushfl\n\t"
-+	"popl %%ecx\n\t"
-+	"xorl %%ecx,%%eax\n\t"
-+	"pushl %%eax\n\t"
-+	"popfl\n\t"
-+	"pushfl\n\t"
-+	"popl %%eax\n\t"
-+	"xorl %%ecx,%%eax\n\t"
-+	"popfl\n\t"
-+	: "=a" (ret)
-+	: "0" (val)
-+        : "cx"
-+    );
-+    return ret;
-+}
-+
-+static inline void cpuid(int op, int *eax, int *edx)
-+{
-+    __asm__(
-+	"push %%ebx\n\t"
-+	"cpuid\n\t"
-+	"pop %%ebx\n\t"
-+	: "=a" (*eax),
-+	  "=d" (*edx)
-+	: "0" (op)
-+	: "cx"
-+    );
-+}
-+
 +static inline void __attribute__ ((unused))
 +dl_platform_kfreebsd_i386_init (void)
 +{
++	/* This calls cpuid and and fills dl_x86_cpu_features */
++	DL_PLATFORM_INIT;
++
 +	/* we don't have reasonable AT_PLATFORM from kernel
 +	   try to use cpuid to get one, also guess AT_HWCAP */
-+
-+	int val, hwcap;
-+
-+	val = try_flip_flags(X86_EFLAGS_AC | X86_EFLAGS_ID);
-+
-+	if (!(val & X86_EFLAGS_AC))
-+	{
-+		/* 386 */
-+		GLRO(dl_platform) = GLRO(dl_x86_platforms)[0];
-+		GLRO(dl_hwcap) = 0;
-+	}
-+	else if (!(val & X86_EFLAGS_ID))
++	GLRO(dl_hwcap) = GLRO(dl_x86_cpu_features).cpuid[COMMON_CPUID_INDEX_1].edx;
++	switch (GLRO(dl_hwcap) & 0xf00)
 +	{
-+		/* 486 */
++	case 0x400: /* 486 */
 +		GLRO(dl_platform) = GLRO(dl_x86_platforms)[1];
-+		GLRO(dl_hwcap) = 0;
-+	}
-+	else
-+	{
-+	    cpuid(0, &val, &hwcap);
-+	    if (val == 0)
-+	    {
-+		/* 486 */
-+		GLRO(dl_platform) = GLRO(dl_x86_platforms)[1];
-+		GLRO(dl_hwcap) = 0;
-+	    }
-+	    else
-+	    {
-+		cpuid(1, &val, &hwcap);
-+		GLRO(dl_hwcap) = hwcap;
-+		switch (val & 0xf00)
-+		{
-+		case 0x400: /* 486 */
-+			GLRO(dl_platform) = GLRO(dl_x86_platforms)[1];
-+		break;
-+		case 0x500: /* 586 */
-+			GLRO(dl_platform) = GLRO(dl_x86_platforms)[2];
-+		break;
-+		default:    /* 686 */
-+			GLRO(dl_platform) = GLRO(dl_x86_platforms)[3];
-+		}
-+            }
++	break;
++	case 0x500: /* 586 */
++		GLRO(dl_platform) = GLRO(dl_x86_platforms)[2];
++	break;
++	default:    /* 686 */
++		GLRO(dl_platform) = GLRO(dl_x86_platforms)[3];
 +	}
 +}
 +
++#undef  DL_PLATFORM_INIT
++#define DL_PLATFORM_INIT dl_platform_kfreebsd_i386_init ()
++
 +#endif
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/dl-procinfo.h
@@ -15533,7 +15408,7 @@
 +GLIBC_2.3 getaddrinfo_a F
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/libc.abilist
-@@ -0,0 +1,2188 @@
+@@ -0,0 +1,2194 @@
 +GLIBC_2.10 GLIBC_2.10 A
 +GLIBC_2.10 __cxa_at_quick_exit F
 +GLIBC_2.10 __posix_getopt F
@@ -15624,6 +15499,12 @@
 +GLIBC_2.21 __statfs F
 +GLIBC_2.22 GLIBC_2.22 A
 +GLIBC_2.22 fmemopen F
++GLIBC_2.23 GLIBC_2.23 A
++GLIBC_2.23 fts64_children F
++GLIBC_2.23 fts64_close F
++GLIBC_2.23 fts64_open F
++GLIBC_2.23 fts64_read F
++GLIBC_2.23 fts64_set F
 +GLIBC_2.3 GLIBC_2.3 A
 +GLIBC_2.3 _Exit F
 +GLIBC_2.3 _IO_2_1_stderr_ D 0x9c
@@ -17750,7 +17631,7 @@
 +GLIBC_2.3.4 dlmopen F
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/libm.abilist
-@@ -0,0 +1,404 @@
+@@ -0,0 +1,409 @@
 +GLIBC_2.15 GLIBC_2.15 A
 +GLIBC_2.15 __acos_finite F
 +GLIBC_2.15 __acosf_finite F
@@ -17837,6 +17718,11 @@
 +GLIBC_2.18 __issignaling F
 +GLIBC_2.18 __issignalingf F
 +GLIBC_2.18 __issignalingl F
++GLIBC_2.23 GLIBC_2.23 A
++GLIBC_2.23 __signgam D 0x4
++GLIBC_2.23 lgamma F
++GLIBC_2.23 lgammaf F
++GLIBC_2.23 lgammal F
 +GLIBC_2.3 GLIBC_2.3 A
 +GLIBC_2.3 _LIB_VERSION D 0x4
 +GLIBC_2.3 __clog10 F
@@ -24974,7 +24860,7 @@
 +   O_LARGEFILE == 0.  */
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/openat.c
-@@ -0,0 +1,73 @@
+@@ -0,0 +1,70 @@
 +/* Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -25014,10 +24900,7 @@
 +   the directory associated with FD.  If OFLAG includes O_CREAT, a
 +   third argument is the file protection.  */
 +int
-+__openat (fd, file, oflag)
-+     int fd;
-+     const char *file;
-+     int oflag;
++__openat (int fd, const char *file, int oflag, ...)
 +{
 +  int mode = 0;
 +  int result;
@@ -25740,7 +25623,7 @@
 +LIBC_CANCEL_HANDLED (); /* in __libc_recvfrom */
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/remove.c
-@@ -0,0 +1,40 @@
+@@ -0,0 +1,39 @@
 +/* ANSI C `remove' function to delete a file or directory.  POSIX.1 version.
 +   Copyright (C) 1995,96,97,2002,2003 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -25765,8 +25648,7 @@
 +#include <unistd.h>
 +
 +int
-+remove (file)
-+     const char *file;
++remove (const char *file)
 +{
 +  /* First try to unlink since this is more frequently the necessary action. */
 +  if (__unlink (file) != 0
@@ -26726,7 +26608,7 @@
 +}
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/shm_open.c
-@@ -0,0 +1,40 @@
+@@ -0,0 +1,37 @@
 +/* Copyright (C) 2014 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -26753,10 +26635,7 @@
 +libc_hidden_proto (__syscall_shm_open)
 +
 +int
-+shm_open (name, flag, mode)
-+     const char *name;
-+     int flag;
-+     mode_t mode;
++shm_open (const char *name, int flag, mode_t mode)
 +{
 +  /*
 +   * O_CLOEXEC never has any effect on shm_open(). However, old kernel
@@ -26863,7 +26742,7 @@
 +#endif
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/sigaction.c
-@@ -0,0 +1,51 @@
+@@ -0,0 +1,48 @@
 +/* Copyright (C) 1991,1995,1996,1997,2002,2004 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -26891,10 +26770,7 @@
 +libc_hidden_proto (__syscall_sigaction)
 +
 +int
-+__libc_sigaction (sig, act, oact)
-+     int sig;
-+     const struct sigaction *act;
-+     struct sigaction *oact;
++__libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
 +{
 +  if (sig <= 0 || sig >= NSIG)
 +    {
@@ -29879,7 +29755,7 @@
 +}
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/times.c
-@@ -0,0 +1,72 @@
+@@ -0,0 +1,71 @@
 +/* Copyright (C) 1991,92,93,95,96,97,1998,2001 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -29924,8 +29800,7 @@
 +   Return the elapsed real time, or (clock_t) -1 for errors.
 +   All times are in CLK_TCKths of a second.  */
 +clock_t
-+__times (buffer)
-+     struct tms *buffer;
++__times (struct tms *buffer)
 +{
 +  struct rusage usage;
 +  clock_t clk_tck;
@@ -29954,7 +29829,7 @@
 +weak_alias (__times, times)
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/timespec_get.c
-@@ -0,0 +1,49 @@
+@@ -0,0 +1,47 @@
 +/* Copyright (C) 2011-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -29987,9 +29862,7 @@
 +libc_hidden_proto (__syscall_clock_gettime)
 +
 +int
-+timespec_get (ts, base)
-+     struct timespec *ts;
-+     int base;
++timespec_get (struct timespec *ts, int base)
 +{
 +  switch (base)
 +    {
@@ -30010,7 +29883,7 @@
 +/* 'truncate64' is the same as 'truncate', because __off64_t == __off_t.  */
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/ttyname.c
-@@ -0,0 +1,71 @@
+@@ -0,0 +1,70 @@
 +/* Copyright (C) 1991,92,93,96,97,98,2000,2002 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -30045,8 +29918,7 @@
 +/* Return the pathname of the terminal FD is open on, or NULL on errors.
 +   The returned storage is good only until the next call to this function.  */
 +char *
-+ttyname (fd)
-+     int fd;
++ttyname (int fd)
 +{
 +  static size_t buflen;
 +  struct fiodgname_arg fgn;
@@ -30084,7 +29956,7 @@
 +}
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/ttyname_r.c
-@@ -0,0 +1,78 @@
+@@ -0,0 +1,75 @@
 +/* Copyright (C) 1991,92,93,95,96,97,98,2004 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -30117,10 +29989,7 @@
 +/* Store at most BUFLEN character of the pathname of the terminal FD is
 +   open on in BUF.  Return 0 on success,  otherwise an error number.  */
 +int
-+__ttyname_r (fd, buf, buflen)
-+     int fd;
-+     char *buf;
-+     size_t buflen;
++__ttyname_r (int fd, char *buf, size_t buflen)
 +{
 +  int ret;
 +  struct fiodgname_arg fgn;
@@ -32125,7 +31994,7 @@
 +#include <sysdeps/unix/sysv/linux/x86_64/dl-cache.h>
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/dl-machine.h
-@@ -0,0 +1,133 @@
+@@ -0,0 +1,119 @@
 +/* Machine-dependent ELF dynamic relocation inline functions.  FreeBSD/amd64 version.
 +   Copyright (C) 2006 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -32226,38 +32095,24 @@
 +                                                                                                                
 +#endif
 +
-+#undef  DL_PLATFORM_INIT
-+#define DL_PLATFORM_INIT dl_platform_kfreebsd_x86_64_init ()
-+
 +#ifndef _DL_MACHINE_KFREEBSD
 +#define _DL_MACHINE_KFREEBSD
 +
-+static inline void cpuid(long op, long *rax, long *rdx)
-+{
-+    __asm__(
-+	"push %%rbx\n\t"
-+	"cpuid\n\t"
-+	"pop %%rbx\n\t"
-+	: "=a" (*rax),
-+	  "=d" (*rdx)
-+	: "0" (op)
-+	: "rcx"
-+    );
-+}
-+
 +static inline void __attribute__ ((unused))
 +dl_platform_kfreebsd_x86_64_init (void)
 +{
++	/* This calls cpuid and and fills dl_x86_cpu_features */
++	DL_PLATFORM_INIT;
++
 +	/* we don't have reasonable AT_PLATFORM from kernel
 +	   use cpuid to guess AT_HWCAP */
-+
-+	long val, hwcap;
-+
-+	cpuid(1, &val, &hwcap);
-+	GLRO(dl_hwcap) = hwcap;
++	GLRO(dl_hwcap) = GLRO(dl_x86_cpu_features).cpuid[COMMON_CPUID_INDEX_1].edx;
 +	GLRO(dl_platform) = ELF_MACHINE_NAME;
 +}
 +
++#undef  DL_PLATFORM_INIT
++#define DL_PLATFORM_INIT dl_platform_kfreebsd_x86_64_init ()
++
 +#endif
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/dl-procinfo.c
@@ -32918,7 +32773,7 @@
 +GLIBC_2.3 getaddrinfo_a F
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/libc.abilist
-@@ -0,0 +1,2136 @@
+@@ -0,0 +1,2142 @@
 +GLIBC_2.10 GLIBC_2.10 A
 +GLIBC_2.10 __cxa_at_quick_exit F
 +GLIBC_2.10 __posix_getopt F
@@ -33011,6 +32866,12 @@
 +GLIBC_2.21 __statfs F
 +GLIBC_2.22 GLIBC_2.22 A
 +GLIBC_2.22 fmemopen F
++GLIBC_2.23 GLIBC_2.23 A
++GLIBC_2.23 fts64_children F
++GLIBC_2.23 fts64_close F
++GLIBC_2.23 fts64_open F
++GLIBC_2.23 fts64_read F
++GLIBC_2.23 fts64_set F
 +GLIBC_2.3 GLIBC_2.3 A
 +GLIBC_2.3 _Exit F
 +GLIBC_2.3 _IO_2_1_stderr_ D 0xe0
@@ -35083,7 +34944,7 @@
 +GLIBC_2.3.4 dlmopen F
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/libm.abilist
-@@ -0,0 +1,402 @@
+@@ -0,0 +1,407 @@
 +GLIBC_2.15 GLIBC_2.15 A
 +GLIBC_2.15 __acos_finite F
 +GLIBC_2.15 __acosf_finite F
@@ -35170,6 +35031,11 @@
 +GLIBC_2.18 __issignaling F
 +GLIBC_2.18 __issignalingf F
 +GLIBC_2.18 __issignalingl F
++GLIBC_2.23 GLIBC_2.23 A
++GLIBC_2.23 __signgam D 0x4
++GLIBC_2.23 lgamma F
++GLIBC_2.23 lgammaf F
++GLIBC_2.23 lgammal F
 +GLIBC_2.3 GLIBC_2.3 A
 +GLIBC_2.3 _LIB_VERSION D 0x4
 +GLIBC_2.3 __clog10 F

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git


Reply to: