diff -urN make-3.78.1/Makefile make-3.78.1-eo/Makefile --- make-3.78.1/Makefile Sun Jun 22 20:13:44 2003 +++ make-3.78.1-eo/Makefile Sun Jun 22 20:10:17 2003 @@ -13,6 +13,15 @@ # This is a -*-Makefile-*-, or close enough +ROOT = $(HOME)/EOTA/eota/kernel +NEWLIB = $(HOME)/EOTA/libc/newlib-1.8.1/eota/newlib +LIBS = $(NEWLIB)/crt0.o $(NEWLIB)/libc.a +KERNLIBS = $(ROOT)/POSIX/libc/libgt.a $(ROOT)/POSIX/libc/libnative.a +STARTADDR = 0x00001000 +ENTRY = _start +CFLAGS = -g -O2 -Wall -I. -I$(NEWLIB)/targ-include \ + -I$(NEWLIB)/libc/include -DEOTA +LDFLAGS = -Bstatic -o $@ -e ${ENTRY} -Ttext=$(STARTADDR) SHELL = /bin/sh @@ -65,7 +74,7 @@ CC = gcc CPP = gcc -E GETCONF = getconf -GLOBLIB = +GLOBLIB = glob/libglob.a LIBOBJS = getloadavg.o MAKEINFO = makeinfo PACKAGE = make @@ -78,7 +87,7 @@ bin_PROGRAMS = make -make_SOURCES = main.c commands.c job.c dir.c file.c misc.c read.c remake.c rule.c implicit.c default.c variable.c expand.c function.c vpath.c version.c ar.c arscan.c remote-$(REMOTE).c commands.h dep.h filedef.h job.h make.h rule.h variable.h signame.c signame.h getopt.c getopt1.c getopt.h +make_SOURCES = main.c commands.c job.c dir.c file.c misc.c read.c remake.c rule.c implicit.c default.c variable.c expand.c function.c vpath.c version.c ar.c arscan.c remote-$(REMOTE).c commands.h dep.h filedef.h job.h make.h rule.h variable.h signame.c signame.h getopt.c getopt1.c getopt.h eota.c make_LDADD = getloadavg.o @@ -129,18 +138,18 @@ DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I. CPPFLAGS = -LDFLAGS = -LIBS = +## LDFLAGS = +## LIBS = make_OBJECTS = main.o commands.o job.o dir.o file.o misc.o read.o \ remake.o rule.o implicit.o default.o variable.o expand.o function.o \ vpath.o version.o ar.o arscan.o remote-$(REMOTE).o signame.o getopt.o \ -getopt1.o +getopt1.o eota.o make_DEPENDENCIES = getloadavg.o make_LDFLAGS = -CFLAGS = -g -O2 +## CFLAGS = -g -O2 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +## LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ TEXI2DVI = texi2dvi INFO_DEPS = make.info DVIS = make.dvi @@ -254,9 +263,11 @@ maintainer-clean-compile: -make: $(make_OBJECTS) $(make_DEPENDENCIES) +make: $(make_OBJECTS) $(make_DEPENDENCIES) $(LIBS) $(KERNLIBS) @rm -f make - $(LINK) $(make_LDFLAGS) $(make_OBJECTS) $(make_LDADD) $(LIBS) + $(LD) -o $@ $(LDFLAGS) $(make_LDFLAGS) $(make_OBJECTS) \ + $(make_LDADD) $(GLOBLIB) $(LIBS) $(KERNLIBS) + strip $(PROGRAMS) make.info: make.texinfo make.dvi: make.texinfo @@ -598,6 +609,7 @@ commands.h variable.h version.o: version.c config.h vpath.o: vpath.c make.h config.h signame.h filedef.h variable.h +eota.o: eota.c info-am: $(INFO_DEPS) info: info-recursive diff -urN make-3.78.1/config.h make-3.78.1-eo/config.h --- make-3.78.1/config.h Sun Jun 22 20:13:50 2003 +++ make-3.78.1-eo/config.h Sun Apr 13 19:12:48 2003 @@ -34,7 +34,7 @@ #define HAVE_ALLOCA 1 /* Define if you have and it should be used (not on Ultrix). */ -#define HAVE_ALLOCA_H 1 +/* #define HAVE_ALLOCA_H 1 */ /* Define if you don't have vprintf but do have _doprnt. */ /* #undef HAVE_DOPRNT */ @@ -102,7 +102,7 @@ #define HAVE_VPRINTF 1 /* Define if you have the wait3 system call. */ -#define HAVE_WAIT3 1 +/* #define HAVE_WAIT3 1 */ /* Define if on MINIX. */ /* #undef _MINIX */ @@ -153,7 +153,7 @@ /* #undef SVR4 */ /* Define if `sys_siglist' is declared by . */ -#define SYS_SIGLIST_DECLARED 1 +/* #define SYS_SIGLIST_DECLARED 1 */ /* Define to `int' if doesn't define. */ /* #undef uid_t */ @@ -182,7 +182,7 @@ /* #undef ST_MTIM_NSEC */ /* Define this if the C library defines the variable `sys_siglist'. */ -#define HAVE_SYS_SIGLIST 1 +/* #define HAVE_SYS_SIGLIST 1 */ /* Define this if the C library defines the variable `_sys_siglist'. */ /* #undef HAVE__SYS_SIGLIST */ @@ -201,10 +201,10 @@ #define fd_set_size_t int /* Define this if select() args need to be cast away from fd_set (HP-UX). */ -#define SELECT_FD_SET_CAST +/* #define SELECT_FD_SET_CAST */ /******/ /* Define if you have the INTTYPES_H function. */ -#define HAVE_INTTYPES_H 1 +/* #define HAVE_INTTYPES_H 1 */ /* Define if you have the clock_gettime function. */ /* #undef HAVE_CLOCK_GETTIME */ @@ -234,37 +234,37 @@ #define HAVE_MKTEMP 1 /* Define if you have the pipe function. */ -#define HAVE_PIPE 1 +/* #define HAVE_PIPE 1 */ /* Define if you have the psignal function. */ -#define HAVE_PSIGNAL 1 +/* #define HAVE_PSIGNAL 1 */ /* Define if you have the pstat_getdynamic function. */ /* #undef HAVE_PSTAT_GETDYNAMIC */ /* Define if you have the select function. */ -#define HAVE_SELECT 1 +/* #define HAVE_SELECT 1 */ /* Define if you have the setegid function. */ -#define HAVE_SETEGID 1 +/* #define HAVE_SETEGID 1 */ /* Define if you have the seteuid function. */ -#define HAVE_SETEUID 1 +/* #define HAVE_SETEUID 1 */ /* Define if you have the setlinebuf function. */ -#define HAVE_SETLINEBUF 1 +/* #define HAVE_SETLINEBUF 1 */ /* Define if you have the setregid function. */ -#define HAVE_SETREGID 1 +/* #define HAVE_SETREGID 1 */ /* Define if you have the setreuid function. */ -#define HAVE_SETREUID 1 +/* #define HAVE_SETREUID 1 */ /* Define if you have the sigaction function. */ #define HAVE_SIGACTION 1 /* Define if you have the sigsetmask function. */ -#define HAVE_SIGSETMASK 1 +/* #define HAVE_SIGSETMASK 1 */ /* Define if you have the socket function. */ /* #undef HAVE_SOCKET */ @@ -279,7 +279,7 @@ #define HAVE_STRERROR 1 /* Define if you have the strsignal function. */ -#define HAVE_STRSIGNAL 1 +/* #define HAVE_STRSIGNAL 1 */ /* Define if you have the wait3 function. */ #define HAVE_WAIT3 1 @@ -297,7 +297,7 @@ #define HAVE_FCNTL_H 1 /* Define if you have the header file. */ -#define HAVE_LIMITS_H 1 +/* #define HAVE_LIMITS_H 1 */ /* Define if you have the header file. */ /* #undef HAVE_MACH_MACH_H */ @@ -324,10 +324,10 @@ #define HAVE_SYS_PARAM_H 1 /* Define if you have the header file. */ -#define HAVE_SYS_SELECT_H 1 +/* #define HAVE_SYS_SELECT_H 1 */ /* Define if you have the header file. */ -#define HAVE_SYS_SOCKET_H 1 +/* #define HAVE_SYS_SOCKET_H 1 */ /* Define if you have the header file. */ #define HAVE_SYS_TIME_H 1 diff -urN make-3.78.1/eota.c make-3.78.1-eo/eota.c --- make-3.78.1/eota.c Thu Jan 1 09:00:00 1970 +++ make-3.78.1-eo/eota.c Sun Apr 13 19:12:48 2003 @@ -0,0 +1,13 @@ +/* 2002/10/4 by nakanishi */ + +#include + +struct passwd *getpwnam(const char * name) +{ + return NULL; +} + +int vfork() +{ + return fork(); +} diff -urN make-3.78.1/glob/Makefile make-3.78.1-eo/glob/Makefile --- make-3.78.1/glob/Makefile Sun Jun 22 20:13:45 2003 +++ make-3.78.1-eo/glob/Makefile Sun Apr 13 19:12:48 2003 @@ -13,6 +13,15 @@ # -*-Makefile-*-, or close enough +ROOT = $(HOME)/EOTA/eota/kernel +NEWLIB = $(HOME)/EOTA/libc/newlib-1.8.1/eota/newlib +LIBS = $(NEWLIB)/crt0.o $(NEWLIB)/libc.a +KERNLIBS = $(ROOT)/POSIX/libc/libgt.a $(ROOT)/POSIX/libc/libnative.a +STARTADDR = 0x00001000 +ENTRY = _start +CFLAGS = -g -O2 -Wall -I. -I$(NEWLIB)/targ-include \ + -I$(NEWLIB)/libc/include -DEOTA +LDFLAGS = -S -Bstatic -o $@ -e ${ENTRY} -Ttext=$(STARTADDR) SHELL = /bin/sh @@ -63,6 +72,7 @@ host_triplet = i586-pc-linux-gnu AR = ar CC = gcc +LD = ld CPP = gcc -E GETCONF = getconf GLOBLIB = @@ -91,14 +101,14 @@ DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I.. CPPFLAGS = -LDFLAGS = -LIBS = +## LDFLAGS = +## LIBS = libglob_a_LIBADD = libglob_a_OBJECTS = glob.o fnmatch.o -CFLAGS = -g -O2 +## CFLAGS = -g -O2 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +## CCLD = $(CC) +LINK = $(LD) $(LDFLAGS) -o $@ DIST_COMMON = COPYING.LIB ChangeLog Makefile.am Makefile.in