hurd-l4 ./Makefile.am ./TODO ./configure.ac lad...

[Marcus Brinkmann]

CVSROOT:        /cvsroot/hurd
Module name:    hurd-l4
Branch:         
Changes by:     Marcus Brinkmann <address@hidden>       03/09/12 20:25:51

Modified files:
        .              : Makefile.am TODO configure.ac 
        laden          : Makefile.am laden.h 
        wortel         : Makefile.am wortel.h 
Added files:
        libc-parts     : Makefile.am README 
Removed files:
        laden          : string.c string.h 
        wortel         : string.c string.h 

Log message:
        Add libc-parts, which takes functions out of libc.a bit by bit.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/Makefile.am.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/TODO.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/configure.ac.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/laden/Makefile.am.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/laden/laden.h.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/libc-parts/Makefile.am?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/libc-parts/README?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/wortel/Makefile.am.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/wortel/wortel.h.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: hurd-l4/Makefile.am
diff -u hurd-l4/Makefile.am:1.5 hurd-l4/Makefile.am:1.6
--- hurd-l4/Makefile.am:1.5     Fri Sep 12 14:15:19 2003
+++ hurd-l4/Makefile.am Fri Sep 12 20:25:50 2003
@@ -1 +1 @@
-SUBDIRS = libl4 laden wortel physmem libhurd-slab libhurd-ihash
+SUBDIRS = libl4 libc-parts laden wortel physmem libhurd-slab libhurd-ihash
Index: hurd-l4/TODO
diff -u hurd-l4/TODO:1.4 hurd-l4/TODO:1.5
--- hurd-l4/TODO:1.4    Mon Sep  8 11:42:58 2003
+++ hurd-l4/TODO        Fri Sep 12 20:25:50 2003
@@ -1,3 +1,6 @@
+* configure.ac
+** Allow user to specify libc.a.
+
 * laden
 ** Overlaps between modules and destination regions should be resolved
    intelligently.
Index: hurd-l4/configure.ac
diff -u hurd-l4/configure.ac:1.7 hurd-l4/configure.ac:1.8
--- hurd-l4/configure.ac:1.7    Fri Sep 12 14:45:56 2003
+++ hurd-l4/configure.ac        Fri Sep 12 20:25:50 2003
@@ -33,6 +33,10 @@
 AC_PROG_CC
 AM_PROG_AS
 AC_PROG_RANLIB
+AC_CHECK_TOOL([AR], [ar], :)
+AC_CHECK_TOOL([NM], [nm], :)
+AC_PATH_PROG([SED], [sed], :)
+AC_PATH_PROG([SORT], [sort], :)
 
 # Required for building the documentation
 AC_PATH_PROG([LATEX], [latex], no)
@@ -49,6 +53,16 @@
 fi
 
 # Checks for libraries.
+AC_MSG_CHECKING([for static GNU C library])
+STATIC_GLIBC=`$CC -print-file-name=libc.a`
+if test "x$STATIC_GLIBC" = xlibc.a; then
+  AC_MSG_RESULT([none])
+  AC_MSG_ERROR([Could not find static version of the GNU C library])
+else
+  AC_MSG_RESULT([$STATIC_GLIBC])
+fi
+AC_SUBST(STATIC_GLIBC)
+
 
 # Checks for header files.
 
@@ -79,6 +93,7 @@
 # Checks for library functions.
 AC_CONFIG_FILES([Makefile
                 libl4/ia32/Makefile libl4/Makefile
+                libc-parts/Makefile
                  laden/Makefile
                  wortel/Makefile
                  physmem/Makefile
Index: hurd-l4/laden/Makefile.am
diff -u hurd-l4/laden/Makefile.am:1.5 hurd-l4/laden/Makefile.am:1.6
--- hurd-l4/laden/Makefile.am:1.5       Fri Sep 12 14:45:56 2003
+++ hurd-l4/laden/Makefile.am   Fri Sep 12 20:25:50 2003
@@ -27,7 +27,7 @@
 
 laden_CFLAGS = -I$(srcdir) -I$(top_srcdir)/include $(AM_CFLAGS)
 
-laden_SOURCES =  $(ARCH_SOURCES) string.h string.c             \
+laden_SOURCES =  $(ARCH_SOURCES)                               \
        output.h output.c output-none.c                         \
        shutdown.h shutdown.c                                   \
        elf.h loader.h loader.c                                 \
@@ -36,4 +36,4 @@
 /* FIXME: Make linkbase configurable.  */
 laden_LDFLAGS = -u_start -e_start -N -nostdlib -Ttext=0x180000
 
-laden_LDADD = -lgcc
+laden_LDADD = -lgcc ../libc-parts/libc-parts.a
Index: hurd-l4/laden/laden.h
diff -u hurd-l4/laden/laden.h:1.7 hurd-l4/laden/laden.h:1.8
--- hurd-l4/laden/laden.h:1.7   Mon Sep  8 10:23:17 2003
+++ hurd-l4/laden/laden.h       Fri Sep 12 20:25:50 2003
@@ -18,8 +18,14 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <string.h>
+
 #include <l4.h>
-#include "string.h"
+
 #include "output.h"
 #include "shutdown.h"
 #include "loader.h"
Index: hurd-l4/wortel/Makefile.am
diff -u hurd-l4/wortel/Makefile.am:1.5 hurd-l4/wortel/Makefile.am:1.6
--- hurd-l4/wortel/Makefile.am:1.5      Fri Sep 12 14:45:56 2003
+++ hurd-l4/wortel/Makefile.am  Fri Sep 12 20:25:51 2003
@@ -27,7 +27,7 @@
 
 wortel_CFLAGS = -I$(srcdir) -I$(top_srcdir)/include $(AM_CFLAGS)
 
-wortel_SOURCES = $(ARCH_SOURCES) string.h string.c             \
+wortel_SOURCES = $(ARCH_SOURCES)                               \
        output.h output.c output-none.c                         \
        shutdown.h shutdown.c                                   \
        elf.h loader.h loader.c                                 \
@@ -37,4 +37,4 @@
 /* FIXME: Make linkbase configurable.  */
 wortel_LDFLAGS = -u_start -e_start -N -nostdlib -Ttext=0x300000
 
-wortel_LDADD = -lgcc
\ No newline at end of file
+wortel_LDADD = -lgcc ../libc-parts/libc-parts.a
Index: hurd-l4/wortel/wortel.h
diff -u hurd-l4/wortel/wortel.h:1.4 hurd-l4/wortel/wortel.h:1.5
--- hurd-l4/wortel/wortel.h:1.4 Tue Sep  9 17:43:12 2003
+++ hurd-l4/wortel/wortel.h     Fri Sep 12 20:25:51 2003
@@ -18,8 +18,14 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <string.h>
+
 #include <l4.h>
-#include "string.h"
+
 #include "output.h"
 #include "shutdown.h"
 #include "loader.h"