hurd-l4 ./ChangeLog ./TODO ./configure.ac laden...

[Marcus Brinkmann]

CVSROOT:        /cvsroot/hurd
Module name:    hurd-l4
Branch:         
Changes by:     Marcus Brinkmann <address@hidden>       03/10/12 18:35:17

Modified files:
        .              : ChangeLog TODO configure.ac 
        laden          : ChangeLog Makefile.am 
        physmem        : ChangeLog Makefile.am output.h 
        wortel         : ChangeLog Makefile.am 
Added files:
        .              : acinclude.m4 
        laden          : config.m4 
        physmem        : config.m4 
        wortel         : config.m4 

Log message:
        2003-10-12  Marcus Brinkmann  <address@hidden>
        
        * acinclude.m4: New file.
        * configure.ac: Include laden/config.m4, wortel/config.m4, and
        physmem/config.m4.
        
        laden/
        2003-10-12  Marcus Brinkmann  <address@hidden>
        
        * config.m4: New file.
        * Makefile.am (laden_LDFLAGS): Replace load address with
        @address@hidden
        
        physmem/
        2003-10-12  Marcus Brinkmann  <address@hidden>
        
        * config.m4: New file.
        * Makefile.am (physmem_LDFLAGS): Replace load address with
        @address@hidden
        
        wortel/
        2003-10-12  Marcus Brinkmann  <address@hidden>
        
        * config.m4: New file.
        * Makefile.am (wortel_LDFLAGS): Replace load address with
        @address@hidden

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/acinclude.m4.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/ChangeLog.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/TODO.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/configure.ac.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/laden/config.m4?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/laden/ChangeLog.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/laden/Makefile.am.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/physmem/config.m4?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/physmem/ChangeLog.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/physmem/Makefile.am.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/physmem/output.h.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/wortel/config.m4?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/wortel/ChangeLog.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/wortel/Makefile.am.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: hurd-l4/ChangeLog
diff -u hurd-l4/ChangeLog:1.4 hurd-l4/ChangeLog:1.5
--- hurd-l4/ChangeLog:1.4       Mon Sep 22 17:27:57 2003
+++ hurd-l4/ChangeLog   Sun Oct 12 18:35:16 2003
@@ -1,3 +1,9 @@
+2003-10-12  Marcus Brinkmann  <address@hidden>
+
+       * acinclude.m4: New file.
+       * configure.ac: Include laden/config.m4, wortel/config.m4, and
+       physmem/config.m4.
+
 2003-09-22  Marcus Brinkmann  <address@hidden>
 
        * configure.ac: Always define the automake conditionals ARCH_* to
Index: hurd-l4/TODO
diff -u hurd-l4/TODO:1.8 hurd-l4/TODO:1.9
--- hurd-l4/TODO:1.8    Mon Sep 22 17:40:55 2003
+++ hurd-l4/TODO        Sun Oct 12 18:35:16 2003
@@ -1,5 +1,5 @@
 * configure.ac
-** Allow user to specify libc.a.
+** Allow user to specify location of libc.a.
 
 * laden
 ** Overlaps between modules and destination regions should be resolved
@@ -15,13 +15,8 @@
 
 
 * wortel
-** Link base should be configurable.
 ** Conventional memory overriding non-conventional memory in the
    descriptor list is not supported.
-
-
-* physmem
-** Link base should be configurable.
 
 
 * libhurd-slab
Index: hurd-l4/configure.ac
diff -u hurd-l4/configure.ac:1.12 hurd-l4/configure.ac:1.13
--- hurd-l4/configure.ac:1.12   Wed Sep 24 16:32:42 2003
+++ hurd-l4/configure.ac        Sun Oct 12 18:35:16 2003
@@ -89,6 +89,11 @@
 AM_CONDITIONAL([ARCH_IA32], $arch_ia32)
 AM_CONDITIONAL([ARCH_POWERPC], $arch_powerpc)
 
+# Configure components.
+m4_include([laden/config.m4])
+m4_include([wortel/config.m4])
+m4_include([physmem/config.m4])
+
 # Create links for header file.
 m4_include([libl4/headers.m4])
 m4_include([libhurd-ihash/headers.m4])
Index: hurd-l4/laden/ChangeLog
diff -u hurd-l4/laden/ChangeLog:1.10 hurd-l4/laden/ChangeLog:1.11
--- hurd-l4/laden/ChangeLog:1.10        Sat Oct  4 13:42:22 2003
+++ hurd-l4/laden/ChangeLog     Sun Oct 12 18:35:17 2003
@@ -1,3 +1,9 @@
+2003-10-12  Marcus Brinkmann  <address@hidden>
+
+       * config.m4: New file.
+       * Makefile.am (laden_LDFLAGS): Replace load address with
+       @address@hidden
+
 2003-10-04  Marcus Brinkmann  <address@hidden>
 
        * laden.h (add_memory_map): Don't round END up to 1K.
Index: hurd-l4/laden/Makefile.am
diff -u hurd-l4/laden/Makefile.am:1.8 hurd-l4/laden/Makefile.am:1.9
--- hurd-l4/laden/Makefile.am:1.8       Sun Sep 21 14:12:46 2003
+++ hurd-l4/laden/Makefile.am   Sun Oct 12 18:35:17 2003
@@ -36,7 +36,6 @@
        elf.h loader.h loader.c                                 \
        laden.h laden.c kip-fixup.c
 
-/* FIXME: Make linkbase configurable.  */
-laden_LDFLAGS = -u_start -e_start -N -nostdlib -Ttext=0x180000
+laden_LDFLAGS = -u_start -e_start -N -nostdlib address@hidden@
 
 laden_LDADD = -lgcc ../libc-parts/libc-parts.a
Index: hurd-l4/physmem/ChangeLog
diff -u hurd-l4/physmem/ChangeLog:1.4 hurd-l4/physmem/ChangeLog:1.5
--- hurd-l4/physmem/ChangeLog:1.4       Wed Sep 24 18:13:56 2003
+++ hurd-l4/physmem/ChangeLog   Sun Oct 12 18:35:17 2003
@@ -1,3 +1,9 @@
+2003-10-12  Marcus Brinkmann  <address@hidden>
+
+       * config.m4: New file.
+       * Makefile.am (physmem_LDFLAGS): Replace load address with
+       @address@hidden
+
 2003-09-24  Marcus Brinkmann  <address@hidden>
 
        * mmap.c: New file.
Index: hurd-l4/physmem/Makefile.am
diff -u hurd-l4/physmem/Makefile.am:1.10 hurd-l4/physmem/Makefile.am:1.11
--- hurd-l4/physmem/Makefile.am:1.10    Wed Sep 24 18:13:56 2003
+++ hurd-l4/physmem/Makefile.am Sun Oct 12 18:35:17 2003
@@ -35,7 +35,7 @@
 # Doug Lea's malloc is included by malloc-wrap.c.
 EXTRA_physmem_SOURCES = malloc.c
 
-# FIXME: Make linkbase configurable.
-physmem_LDFLAGS = -u_start -e_start -N -nostdlib -Ttext=0x35000
+physmem_LDFLAGS = -u_start -e_start -N -nostdlib \
+       address@hidden@
 
 physmem_LDADD = -lgcc ../libc-parts/libc-parts.a
Index: hurd-l4/physmem/output.h
diff -u hurd-l4/physmem/output.h:1.2 hurd-l4/physmem/output.h:1.3
--- hurd-l4/physmem/output.h:1.2        Mon Sep 15 14:18:58 2003
+++ hurd-l4/physmem/output.h    Sun Oct 12 18:35:17 2003
@@ -21,6 +21,7 @@
 #ifndef _OUTPUT_H
 #define _OUTPUT_H      1
 
+
 /* Print the single character CHR on the output device.  */
 int putchar (int chr);
 
@@ -28,10 +29,32 @@
 
 int printf (const char *fmt, ...);
 
+/* This is not an output function, but it is part of the panic()
+   macro.  */
+void shutdown (void);
+
+
 /* True if debug mode is enabled.  */
 extern int output_debug;
 
 /* Print a debug message.  */
-#define debug(...) do { if (output_debug) printf (__VA_ARGS__); } while (0)
+#define debug(...)                                     \
+  ({                                                   \
+    if (output_debug)                                  \
+      printf (__VA_ARGS__);                            \
+  })
+
+
+/* The program name.  */
+extern char program_name[];
+
+/* Print an error message and fail.  */
+#define panic(...)                                     \
+  ({                                                   \
+    printf ("%s: %s: error: ", program_name, __func__);        \
+    printf (__VA_ARGS__);                              \
+    putchar ('\n');                                    \
+    shutdown ();                                       \
+  })
 
 #endif /* _OUTPUT_H */
Index: hurd-l4/wortel/ChangeLog
diff -u hurd-l4/wortel/ChangeLog:1.9 hurd-l4/wortel/ChangeLog:1.10
--- hurd-l4/wortel/ChangeLog:1.9        Sat Oct  4 13:42:21 2003
+++ hurd-l4/wortel/ChangeLog    Sun Oct 12 18:35:17 2003
@@ -1,3 +1,9 @@
+2003-10-12  Marcus Brinkmann  <address@hidden>
+
+       * config.m4: New file.
+       * Makefile.am (wortel_LDFLAGS): Replace load address with
+       @address@hidden
+
 2003-10-04  Marcus Brinkmann  <address@hidden>
 
        * loader.c: Include <l4/kip.h>.
Index: hurd-l4/wortel/Makefile.am
diff -u hurd-l4/wortel/Makefile.am:1.10 hurd-l4/wortel/Makefile.am:1.11
--- hurd-l4/wortel/Makefile.am:1.10     Sun Sep 21 14:12:47 2003
+++ hurd-l4/wortel/Makefile.am  Sun Oct 12 18:35:17 2003
@@ -37,7 +37,7 @@
        sigma0.h sigma0.c                                       \
        wortel.h wortel.c
 
-/* FIXME: Make linkbase configurable.  */
-wortel_LDFLAGS = -u_start -e_start -N -nostdlib -Ttext=0x300000
+wortel_LDFLAGS = -u_start -e_start -N -nostdlib \
+       address@hidden@
 
 wortel_LDADD = -lgcc ../libc-parts/libc-parts.a