diff -urN diffutils-2.7/Makefile diffutils-2.7-eo/Makefile --- diffutils-2.7/Makefile Sun Jun 22 18:13:04 2003 +++ diffutils-2.7-eo/Makefile Sun Apr 13 23:59:41 2003 @@ -20,9 +20,20 @@ #### Start of system configuration section. #### +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 -O -Wall -I. -I$(NEWLIB)/targ-include \ + -I$(NEWLIB)/libc/include -DEOTA +LDFLAGS = -s -Bstatic -o $@ -e ${ENTRY} -Ttext=$(STARTADDR) + srcdir = . CC = gcc +LD = ld INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 @@ -31,9 +42,9 @@ CPPFLAGS = DEFS = -DHAVE_CONFIG_H -CFLAGS = -g -O -LDFLAGS = -LIBS = +#CFLAGS = -g -O +#LDFLAGS = +#LIBS = LIBOBJS = # Some System V machines do not come with libPW. @@ -62,7 +73,8 @@ util.c dir.c memchr.c waitpid.c \ version.c diff.h regex.c regex.h side.c system.h \ diff3.c sdiff.c cmp.c error.c xmalloc.c getopt.c getopt1.c getopt.h \ - fnmatch.c fnmatch.h alloca.c + fnmatch.c fnmatch.h alloca.c \ + eota.c distfiles = $(srcs) README INSTALL NEWS diagmeet.note Makefile.in \ stamp-h.in config.hin configure configure.in COPYING ChangeLog \ diff.texi diff.info* texinfo.tex \ @@ -79,21 +91,21 @@ diff_o = diff.o analyze.o cmpbuf.o dir.o io.o util.o \ context.o ed.o ifdef.o normal.o side.o \ - fnmatch.o getopt.o getopt1.o regex.o version.o $(ALLOCA) $(LIBOBJS) -diff: $(diff_o) - $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(diff_o) $(LIBS) - -diff3_o = diff3.o getopt.o getopt1.o version.o $(LIBOBJS) -diff3: $(diff3_o) - $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(diff3_o) $(LIBS) - -sdiff_o = sdiff.o getopt.o getopt1.o version.o $(LIBOBJS) -sdiff: $(sdiff_o) - $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(sdiff_o) $(LIBS) + fnmatch.o getopt.o getopt1.o regex.o version.o eota.o $(ALLOCA) $(LIBOBJS) +diff: $(diff_o) $(LIBS) $(KERNLIBS) + $(LD) -o $@ $(LDFLAGS) $(diff_o) $(LIBS) $(KERNLIBS) + +diff3_o = diff3.o getopt.o getopt1.o version.o eota.o $(LIBOBJS) +diff3: $(diff3_o) $(LIBS) $(KERNLIBS) + $(LD) -o $@ $(LDFLAGS) $(diff3_o) $(LIBS) $(KERNLIBS) + +sdiff_o = sdiff.o getopt.o getopt1.o version.o eota.o $(LIBOBJS) +sdiff: $(sdiff_o) $(LIBS) $(KERNLIBS) + $(LD) -o $@ $(LDFLAGS) $(sdiff_o) $(LIBS) $(KERNLIBS) cmp_o = cmp.o cmpbuf.o error.o getopt.o getopt1.o xmalloc.o version.o $(LIBOBJS) -cmp: $(cmp_o) - $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(cmp_o) $(LIBS) +cmp: $(cmp_o) $(LIBS) $(KERNLIBS) + $(LD) -o $@ $(LDFLAGS) $(cmp_o) $(LIBS) $(KERNLIBS) info: diff.info diff.info: diff.texi diff -urN diffutils-2.7/config.h diffutils-2.7-eo/config.h --- diffutils-2.7/config.h Sun Jun 22 18:13:05 2003 +++ diffutils-2.7-eo/config.h Sun Sep 29 17:16:17 2002 @@ -15,7 +15,7 @@ /* #undef CRAY_STACKSEG_END */ /* 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 */ @@ -73,7 +73,7 @@ #define HAVE_MEMCHR 1 /* Define if you have the sigaction function. */ -#define HAVE_SIGACTION 1 +/* #define HAVE_SIGACTION 1 */ /* Define if you have the strchr function. */ #define HAVE_STRCHR 1 @@ -91,7 +91,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_NDIR_H */ diff -urN diffutils-2.7/eota.c diffutils-2.7-eo/eota.c --- diffutils-2.7/eota.c Thu Jan 1 09:00:00 1970 +++ diffutils-2.7-eo/eota.c Sun Jun 22 18:05:29 2003 @@ -0,0 +1,4 @@ +int vfork() +{ + return fork(); +}