svn commit: branches/uClibc-nptl/libpthread: linuxthreads linuxthreads/sysdeps/pthrea etc...
sjhill at uclibc.org
sjhill at uclibc.org
Sat Jan 20 19:52:57 UTC 2007
Author: sjhill
Date: 2007-01-20 11:52:56 -0800 (Sat, 20 Jan 2007)
New Revision: 17399
Log:
Merge from trunk.
Modified:
branches/uClibc-nptl/libpthread/linuxthreads.old/forward.c
branches/uClibc-nptl/libpthread/linuxthreads.old/pthread.c
branches/uClibc-nptl/libpthread/linuxthreads.old/sysdeps/pthread/pthread-functions.h
branches/uClibc-nptl/libpthread/linuxthreads/forward.c
branches/uClibc-nptl/libpthread/linuxthreads/pthread.c
branches/uClibc-nptl/libpthread/linuxthreads/sysdeps/pthread/pthread-functions.h
Changeset:
Modified: branches/uClibc-nptl/libpthread/linuxthreads/forward.c
===================================================================
--- branches/uClibc-nptl/libpthread/linuxthreads/forward.c 2007-01-20 18:32:10 UTC (rev 17398)
+++ branches/uClibc-nptl/libpthread/linuxthreads/forward.c 2007-01-20 19:52:56 UTC (rev 17399)
@@ -17,11 +17,13 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+#include <features.h>
+#include <stdlib.h>
#include <dlfcn.h>
-#include <stdlib.h>
/* psm: keep this before internals.h */
libc_hidden_proto(exit)
+
#include "internals.h"
/* Pointers to the libc functions. */
@@ -129,7 +131,6 @@
FORWARD (pthread_mutex_unlock, (pthread_mutex_t *mutex), (mutex), 0)
strong_alias(pthread_mutex_unlock, __pthread_mutex_unlock)
-
FORWARD2 (pthread_self, pthread_t, (void), (), return 0)
@@ -139,5 +140,7 @@
FORWARD (pthread_setcanceltype, (int type, int *oldtype), (type, oldtype), 0)
FORWARD2 (_pthread_cleanup_push, void, (struct _pthread_cleanup_buffer * buffer, void (*routine)(void *), void * arg), (buffer, routine, arg), return)
+FORWARD2 (_pthread_cleanup_push_defer, void, (struct _pthread_cleanup_buffer * buffer, void (*routine)(void *), void * arg), (buffer, routine, arg), return)
FORWARD2 (_pthread_cleanup_pop, void, (struct _pthread_cleanup_buffer * buffer, int execute), (buffer, execute), return)
+FORWARD2 (_pthread_cleanup_pop_restore, void, (struct _pthread_cleanup_buffer * buffer, int execute), (buffer, execute), return)
Modified: branches/uClibc-nptl/libpthread/linuxthreads/pthread.c
===================================================================
--- branches/uClibc-nptl/libpthread/linuxthreads/pthread.c 2007-01-20 18:32:10 UTC (rev 17398)
+++ branches/uClibc-nptl/libpthread/linuxthreads/pthread.c 2007-01-20 19:52:56 UTC (rev 17399)
@@ -278,7 +278,9 @@
.ptr_pthread_sigwait = __pthread_sigwait,
.ptr_pthread_raise = __pthread_raise,
.ptr__pthread_cleanup_push = _pthread_cleanup_push,
- .ptr__pthread_cleanup_pop = _pthread_cleanup_pop
+ .ptr__pthread_cleanup_push_defer = _pthread_cleanup_push_defer,
+ .ptr__pthread_cleanup_pop = _pthread_cleanup_pop,
+ .ptr__pthread_cleanup_pop_restore = _pthread_cleanup_pop_restore,
};
#ifdef SHARED
# define ptr_pthread_functions &__pthread_functions
Modified: branches/uClibc-nptl/libpthread/linuxthreads/sysdeps/pthread/pthread-functions.h
===================================================================
--- branches/uClibc-nptl/libpthread/linuxthreads/sysdeps/pthread/pthread-functions.h 2007-01-20 18:32:10 UTC (rev 17398)
+++ branches/uClibc-nptl/libpthread/linuxthreads/sysdeps/pthread/pthread-functions.h 2007-01-20 19:52:56 UTC (rev 17399)
@@ -84,9 +84,12 @@
const struct timespec *);
void (*ptr__pthread_cleanup_push) (struct _pthread_cleanup_buffer * buffer,
void (*routine)(void *), void * arg);
-
+ void (*ptr__pthread_cleanup_push_defer) (struct _pthread_cleanup_buffer * buffer,
+ void (*routine)(void *), void * arg);
void (*ptr__pthread_cleanup_pop) (struct _pthread_cleanup_buffer * buffer,
int execute);
+ void (*ptr__pthread_cleanup_pop_restore) (struct _pthread_cleanup_buffer * buffer,
+ int execute);
};
/* Variable in libc.so. */
Modified: branches/uClibc-nptl/libpthread/linuxthreads.old/forward.c
===================================================================
--- branches/uClibc-nptl/libpthread/linuxthreads.old/forward.c 2007-01-20 18:32:10 UTC (rev 17398)
+++ branches/uClibc-nptl/libpthread/linuxthreads.old/forward.c 2007-01-20 19:52:56 UTC (rev 17399)
@@ -140,5 +140,7 @@
FORWARD (pthread_setcanceltype, (int type, int *oldtype), (type, oldtype), 0)
FORWARD2 (_pthread_cleanup_push, void, (struct _pthread_cleanup_buffer * buffer, void (*routine)(void *), void * arg), (buffer, routine, arg), return)
+FORWARD2 (_pthread_cleanup_push_defer, void, (struct _pthread_cleanup_buffer * buffer, void (*routine)(void *), void * arg), (buffer, routine, arg), return)
FORWARD2 (_pthread_cleanup_pop, void, (struct _pthread_cleanup_buffer * buffer, int execute), (buffer, execute), return)
+FORWARD2 (_pthread_cleanup_pop_restore, void, (struct _pthread_cleanup_buffer * buffer, int execute), (buffer, execute), return)
Modified: branches/uClibc-nptl/libpthread/linuxthreads.old/pthread.c
===================================================================
--- branches/uClibc-nptl/libpthread/linuxthreads.old/pthread.c 2007-01-20 18:32:10 UTC (rev 17398)
+++ branches/uClibc-nptl/libpthread/linuxthreads.old/pthread.c 2007-01-20 19:52:56 UTC (rev 17399)
@@ -336,6 +336,8 @@
.ptr__pthread_cleanup_push = _pthread_cleanup_push,
.ptr__pthread_cleanup_pop = _pthread_cleanup_pop
*/
+ .ptr__pthread_cleanup_push_defer = _pthread_cleanup_push_defer,
+ .ptr__pthread_cleanup_pop_restore = _pthread_cleanup_pop_restore,
};
#ifdef SHARED
# define ptr_pthread_functions &__pthread_functions
Modified: branches/uClibc-nptl/libpthread/linuxthreads.old/sysdeps/pthread/pthread-functions.h
===================================================================
--- branches/uClibc-nptl/libpthread/linuxthreads.old/sysdeps/pthread/pthread-functions.h 2007-01-20 18:32:10 UTC (rev 17398)
+++ branches/uClibc-nptl/libpthread/linuxthreads.old/sysdeps/pthread/pthread-functions.h 2007-01-20 19:52:56 UTC (rev 17399)
@@ -84,9 +84,12 @@
const struct timespec *);
void (*ptr__pthread_cleanup_push) (struct _pthread_cleanup_buffer * buffer,
void (*routine)(void *), void * arg);
-
+ void (*ptr__pthread_cleanup_push_defer) (struct _pthread_cleanup_buffer * buffer,
+ void (*routine)(void *), void * arg);
void (*ptr__pthread_cleanup_pop) (struct _pthread_cleanup_buffer * buffer,
int execute);
+ void (*ptr__pthread_cleanup_pop_restore) (struct _pthread_cleanup_buffer * buffer,
+ int execute);
};
/* Variable in libc.so. */
More information about the uClibc-cvs
mailing list