From 4ef4096e11ad305d27b4f286098f392cc6be265a Mon Sep 17 00:00:00 2001 From: "Neal H. Walfield" Date: Wed, 17 Dec 2008 19:33:13 +0100 Subject: Merge hurd/exceptions.h into hurd/thread.h. hurd/ 2008-12-17 Neal H. Walfield * exceptions.h: Merge contents of this file... * thread.h: ... into this one. Update users. * headers.m4: Don't link hurd/exceptions.h. * Makefile.am (includehurd_HEADERS): Remove exceptions.h. libc-parts/ 2008-12-17 Neal H. Walfield * backtrace.c: Don't include . libhurd-mm/ 2008-12-17 Neal H. Walfield * anonymous.h: Don't include . * as.h: Likewise. * exceptions.c: Likewise. * map.h: Likewise. * message-buffer.c: Likewise. * mm-init.c: Likewise. * as-build.c: Don't include . Include and . * as-dump.c: Include and . * as-lookup.c: Likewise. libpthread/ 2008-12-17 Neal H. Walfield * sysdeps/viengoos/ia32/pt-setup.c: Don't include or . * sysdeps/viengoos/pt-startup.c (__pthread_startup): Don't include or . Include . (__pthread_startup): Set pthread->threadid using hurd_myself. * sysdeps/viengoos/pt-sysdep.h: Don't cinlude . Include . * sysdeps/viengoos/pt-thread-dealloc.c: Don't include . Include . * sysdeps/viengoos/pt-thread-start.c: Don't include or . Include . libviengoos/ 2008-12-17 Neal H. Walfield * viengoos/misc.h: Don't include . --- libpthread/ChangeLog | 15 +++++++++++++++ libpthread/sysdeps/viengoos/ia32/pt-setup.c | 2 -- libpthread/sysdeps/viengoos/pt-startup.c | 9 ++++----- libpthread/sysdeps/viengoos/pt-sysdep.h | 2 +- libpthread/sysdeps/viengoos/pt-thread-dealloc.c | 2 +- libpthread/sysdeps/viengoos/pt-thread-start.c | 3 +-- 6 files changed, 22 insertions(+), 11 deletions(-) (limited to 'libpthread') diff --git a/libpthread/ChangeLog b/libpthread/ChangeLog index ed6a689..ec19176 100644 --- a/libpthread/ChangeLog +++ b/libpthread/ChangeLog @@ -1,3 +1,18 @@ +2008-12-17 Neal H. Walfield + + * sysdeps/viengoos/ia32/pt-setup.c: Don't include + or . + * sysdeps/viengoos/pt-startup.c (__pthread_startup): Don't include + or . Include . + (__pthread_startup): Set pthread->threadid using hurd_myself. + * sysdeps/viengoos/pt-sysdep.h: Don't cinlude + . Include . + * sysdeps/viengoos/pt-thread-dealloc.c: Don't include + . Include . + * sysdeps/viengoos/pt-thread-start.c: Don't include + or . Include + . + 2008-12-17 Neal H. Walfield * sysdeps/generic/bits/spin-lock.h: New file. diff --git a/libpthread/sysdeps/viengoos/ia32/pt-setup.c b/libpthread/sysdeps/viengoos/ia32/pt-setup.c index bdd814a..5604d11 100644 --- a/libpthread/sysdeps/viengoos/ia32/pt-setup.c +++ b/libpthread/sysdeps/viengoos/ia32/pt-setup.c @@ -20,8 +20,6 @@ #include #include -#include -#include /* The stack layout used on the i386 is: diff --git a/libpthread/sysdeps/viengoos/pt-startup.c b/libpthread/sysdeps/viengoos/pt-startup.c index b6461de..1a93e2e 100644 --- a/libpthread/sysdeps/viengoos/pt-startup.c +++ b/libpthread/sysdeps/viengoos/pt-startup.c @@ -1,5 +1,5 @@ -/* Thread initialization. Hurd/L4 version. - Copyright (C) 2007 Free Software Foundation, Inc. +/* Thread initialization. Viengoos version. + Copyright (C) 2007, 2008 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -17,14 +17,13 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include #include -#include +#include void __pthread_startup (void) { struct __pthread *pthread = _pthread_self (); - pthread->threadid = l4_myself (); + pthread->threadid = hurd_myself (); } diff --git a/libpthread/sysdeps/viengoos/pt-sysdep.h b/libpthread/sysdeps/viengoos/pt-sysdep.h index b276b87..f7ababa 100644 --- a/libpthread/sysdeps/viengoos/pt-sysdep.h +++ b/libpthread/sysdeps/viengoos/pt-sysdep.h @@ -30,7 +30,7 @@ /* The default stack size: 2MB. */ #define PTHREAD_STACK_DEFAULT (2 * 1024 * 1024) -#include +#include #include #define PTHREAD_SYSDEP_MEMBERS \ diff --git a/libpthread/sysdeps/viengoos/pt-thread-dealloc.c b/libpthread/sysdeps/viengoos/pt-thread-dealloc.c index f7d732b..2011df2 100644 --- a/libpthread/sysdeps/viengoos/pt-thread-dealloc.c +++ b/libpthread/sysdeps/viengoos/pt-thread-dealloc.c @@ -22,7 +22,7 @@ #include -#include +#include #include #include #include diff --git a/libpthread/sysdeps/viengoos/pt-thread-start.c b/libpthread/sysdeps/viengoos/pt-thread-start.c index 6a9fc90..1b341cb 100644 --- a/libpthread/sysdeps/viengoos/pt-thread-start.c +++ b/libpthread/sysdeps/viengoos/pt-thread-start.c @@ -20,8 +20,7 @@ #include #include #include -#include -#include +#include #include -- cgit v1.2.3