diff options
| author | Neal H. Walfield <neal@gnu.org> | 2007-12-23 14:39:42 +0000 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gnu.org> | 2009-04-07 23:11:45 +0200 |
| commit | b9ef8522bdb2b64bb5c5c73afe3dd17ba74e9d72 (patch) | |
| tree | f08bb5e705d77a4a5a80308b18f306ec4a3f0dc6 | |
| parent | 7d83f98545fac33bcdb6e42914da1d9f2548d522 (diff) | |
2007-12-23 Neal H. Walfield <neal@gnu.org>
* Makefile.am (AM_CPPFLAGS): Add "-std=gnu99 -Wall -g -O3".
* sysdeps/l4/pt-block.c (__pthread_block): Remove unused variable
err.
* pthread/pt-join.c (pthread_join): Cast argument to
pthread_cleanup_push to avoid warning.
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | pthread/pt-join.c | 3 | ||||
| -rw-r--r-- | sysdeps/l4/hurd/pt-thread-start.c | 4 | ||||
| -rw-r--r-- | sysdeps/l4/pt-block.c | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 9698b88e..0b7a3750 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,7 +38,8 @@ SYSDEP_PATH = $(srcdir)/sysdeps/l4/hurd/${arch} \ $(srcdir)/include vpath %.c $(SYSDEP_PATH) -AM_CPPFLAGS = -I$(top_builddir)/include -D_GNU_SOURCE=1 -I$(srcdir)/pthread \ +AM_CPPFLAGS = -std=gnu99 -Wall -g -O3 \ + -I$(top_builddir)/include -D_GNU_SOURCE=1 -I$(srcdir)/pthread \ -I$(top_srcdir)/libc-parts $(addprefix -I, $(SYSDEP_PATH)) \ -imacros $(srcdir)/include/libc-symbols.h diff --git a/pthread/pt-join.c b/pthread/pt-join.c index 698b6c9f..06e9f1f7 100644 --- a/pthread/pt-join.c +++ b/pthread/pt-join.c @@ -37,7 +37,8 @@ pthread_join (pthread_t thread, void **status) return ESRCH; __pthread_mutex_lock (&pthread->state_lock); - pthread_cleanup_push (__pthread_mutex_unlock, &pthread->state_lock); + pthread_cleanup_push ((void (*)(void *)) __pthread_mutex_unlock, + &pthread->state_lock); while (pthread->state == PTHREAD_JOINABLE) pthread_cond_wait (&pthread->state_cond, &pthread->state_lock); diff --git a/sysdeps/l4/hurd/pt-thread-start.c b/sysdeps/l4/hurd/pt-thread-start.c index f2d7ef59..131f59d6 100644 --- a/sysdeps/l4/hurd/pt-thread-start.c +++ b/sysdeps/l4/hurd/pt-thread-start.c @@ -43,8 +43,8 @@ __pthread_thread_start (struct __pthread *thread) struct hurd_thread_exregs_out out; in.aspace = ADDR (0, 0); - in.aspace_addr_trans = CAP_ADDR_TRANS_VOID; - in.aspace_addr_trans_flags = CAP_COPY_COPY_SOURCE_GUARD; + in.aspace_cap_properties = CAP_PROPERTIES_VOID; + in.aspace_cap_properties_flags = CAP_COPY_COPY_SOURCE_GUARD; in.activity = ADDR_VOID; diff --git a/sysdeps/l4/pt-block.c b/sysdeps/l4/pt-block.c index e92ce91c..69e1d358 100644 --- a/sysdeps/l4/pt-block.c +++ b/sysdeps/l4/pt-block.c @@ -35,7 +35,6 @@ __pthread_block (struct __pthread *thread) l4_msg_tag_t tag = l4_receive (l4_anythread); if (l4_ipc_failed (tag)) { - int err = l4_error_code (); debug (1, "%x.%x failed to block: %d, offset: %x", l4_thread_no (l4_myself ()), l4_version (l4_myself ()), (l4_error_code () >> 1) & 0x7, |