diff options
| author | neal <neal> | 2008-01-23 14:06:02 +0000 |
|---|---|---|
| committer | neal <neal> | 2008-01-23 14:06:02 +0000 |
| commit | 51d38f444c9ee5690aaa61d76d46554487e3daec (patch) | |
| tree | 8b94122dee5453c021bbb13a324599772aabeccd /ruth | |
| parent | 1f6ecffcafe4cca6928b775f49891f38fbf03804 (diff) | |
libpthread/
2008-01-23 Neal H. Walfield <neal@gnu.org>
* Makefile.am (AM_CPPFLAGS): Add -I$(LIBC)/include.
libhurd-slab/
2008-01-23 Neal H. Walfield <neal@gnu.org>
* Makefile.am (AM_CPPFLAGS): Add -I$(LIBC)/include.
libhurd-mm/
2008-01-23 Neal H. Walfield <neal@gnu.org>
* Makefile.am (COMMON_CPPFLAGS): Add -I$(LIBC)/include.
libhurd-ihash/
2008-01-23 Neal H. Walfield <neal@gnu.org>
* Makefile.am (AM_CPPFLAGS): Add -I$(LIBC)/include.
ruth/
2008-01-23 Neal H. Walfield <neal@gnu.org>
* Makefile.am (COMMON_CPPFLAGS): Add -I$(LIBC)/include.
(ruth_SOURCES): Remove malloc-wrap.c, output.h and output.c.
(ruth_LDADD): Set to $(top_builddir)/libc.a.
* panic.c: Don't include "output.h". Include <stdio.h>.
* ruth.h: Likewise.
* ruth.c (getpagesize): Return a size_t, not an int.
Diffstat (limited to 'ruth')
| -rw-r--r-- | ruth/ChangeLog | 10 | ||||
| -rw-r--r-- | ruth/Makefile.am | 22 | ||||
| -rw-r--r-- | ruth/panic.c | 3 | ||||
| -rw-r--r-- | ruth/ruth.c | 2 | ||||
| -rw-r--r-- | ruth/ruth.h | 2 |
5 files changed, 19 insertions, 20 deletions
diff --git a/ruth/ChangeLog b/ruth/ChangeLog index f407866..262faaa 100644 --- a/ruth/ChangeLog +++ b/ruth/ChangeLog @@ -1,5 +1,15 @@ 2008-01-23 Neal H. Walfield <neal@gnu.org> + * Makefile.am (COMMON_CPPFLAGS): Add -I$(LIBC)/include. + (ruth_SOURCES): Remove malloc-wrap.c, output.h and output.c. + (ruth_LDADD): Set to $(top_builddir)/libc.a. + * panic.c: Don't include "output.h". Include <stdio.h>. + * ruth.h: Likewise. + + * ruth.c (getpagesize): Return a size_t, not an int. + +2008-01-23 Neal H. Walfield <neal@gnu.org> + * panic.c (panic_): Print the thread id of the thread that called panic. diff --git a/ruth/Makefile.am b/ruth/Makefile.am index 038bdf6..7ac8387 100644 --- a/ruth/Makefile.am +++ b/ruth/Makefile.am @@ -1,5 +1,5 @@ # Makefile.am - Makefile template for the ruth server. -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2008 Free Software Foundation, Inc. # Written by Marcus Brinkmann. # # This file is part of the GNU Hurd. @@ -25,27 +25,15 @@ endif bootdir = $(prefix)/boot boot_PROGRAMS = ruth -COMMON_CPPFLAGS = -Wall -g -std=gnu99 -I$(srcdir) \ - -I$(top_builddir)/include \ - -I$(top_srcdir)/libc-parts -D_GNU_SOURCE +COMMON_CPPFLAGS = -Wall -g -std=gnu99 -D_GNU_SOURCE -I$(srcdir) \ + -I$(top_builddir)/newlib/include -I$(top_builddir)/include \ + -I$(top_srcdir)/libc-parts ruth_CPPFLAGS = $(COMMON_CPPFLAGS) ruth_SOURCES = $(ARCH_SOURCES) \ - output.h output.c \ panic.h panic.c \ - malloc-wrap.c \ ruth.h ruth.c -# Doug Lea's malloc is included by malloc-wrap.c. -EXTRA_ruth_SOURCES = malloc.c - ruth_LDFLAGS = -u_start -e_start -nostdlib -ruth_LDADD = \ - ../libhurd-mm/libhurd-mm.a \ - ../viengoos/libhurd-cap.a \ - ../libhurd-slab/libhurd-slab.a \ - ../libpthread/libpthread.a \ - ../libhurd-ihash/libhurd-ihash.a \ - ../libhurd-btree/libhurd-btree.a \ - ../libc-parts/libc-parts.a -lgcc +ruth_LDADD = $(top_builddir)/libc.a diff --git a/ruth/panic.c b/ruth/panic.c index feaa89f..7bde1ed 100644 --- a/ruth/panic.c +++ b/ruth/panic.c @@ -19,7 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ #include <hurd/stddef.h> -#include "output.h" +#include <stdio.h> +#include <stdarg.h> extern const char program_name[]; diff --git a/ruth/ruth.c b/ruth/ruth.c index 1b5e395..10afff0 100644 --- a/ruth/ruth.c +++ b/ruth/ruth.c @@ -72,7 +72,7 @@ abort (void) /* FIXME: Should be elsewhere. Needed by libhurd-slab. */ -int +size_t getpagesize() { return PAGESIZE; diff --git a/ruth/ruth.h b/ruth/ruth.h index 1b1eba8..84a330f 100644 --- a/ruth/ruth.h +++ b/ruth/ruth.h @@ -22,7 +22,7 @@ #include <l4.h> -#include "output.h" +#include <stdio.h> /* The program name. */ |