diff -urP binutils-2.8/Makefile binutils-2.8-eo/Makefile --- binutils-2.8/Makefile Sat Feb 22 21:53:05 2003 +++ binutils-2.8-eo/Makefile Sat Feb 22 20:21:33 2003 @@ -81,7 +81,8 @@ HOST_PREFIX = HOST_PREFIX_1 = loser- -NEWLIB = /home/naniwa/PDS/OS/libc/newlib-1.8.1-eota/eota/newlib +ROOT = $(HOME)/EOTA/eota +NEWLIB = $(HOME)/EOTA/libc/newlib-1.8.1/eota/newlib # We don't specify -g -O because many compilers don't support -g -O, # and/or -O is broken in and of itself. diff -urP binutils-2.8/binutils/Makefile binutils-2.8-eo/binutils/Makefile --- binutils-2.8/binutils/Makefile Sat Feb 22 21:52:03 2003 +++ binutils-2.8-eo/binutils/Makefile Sat Feb 22 21:47:01 2003 @@ -70,6 +70,9 @@ NM = $(NM_FOR_TARGET) SYMLINK = ln -s +LD=ld +STRIP=strip + BISON = bison -y LEX_OPTIONS = LEX = `if [ -f ../flex/flex ] ; then echo ../flex/flex ; else echo flex ; fi` @@ -246,23 +249,40 @@ dvi: binutils.dvi + +ROOT=$(HOME)/EOTA/eota/kernel +NEWLIB=$(HOME)/EOTA/libc/newlib-1.8.1-eota/eota/newlib +EOBJ=$(NEWLIB)/crt0.o +ELIBS=$(NEWLIB)/libc.a $(ROOT)/POSIX/libc/libnative.a +STARTADDR=0x00001000 +ENTRY=_start + +OBJ2E = -Bstatic -o $@ -e ${ENTRY} -Ttext=$(STARTADDR) + $(SIZE_PROG): $(ADDL_DEPS) size.o - $(HLDENV) $(CC) $(HLDFLAGS) $(CFLAGS) $(LDFLAGS) -o $(SIZE_PROG) size.o $(ADDL_LIBS) $(EXTRALIBS) + $(HLDENV) $(LD) $(OBJ2E) $(EOBJ) $(HLDFLAGS) -o $(SIZE_PROG) size.o $(ADDL_LIBS) $(EXTRALIBS) $(ELIBS) + $(STRIP) $@ $(OBJCOPY_PROG): $(ADDL_DEPS) objcopy.o not-strip.o $(WRITE_DEBUG_OBJS) - $(HLDENV) $(CC) $(HLDFLAGS) $(CFLAGS) $(LDFLAGS) -o $(OBJCOPY_PROG) objcopy.o not-strip.o $(WRITE_DEBUG_OBJS) $(ADDL_LIBS) $(EXTRALIBS) + $(HLDENV) $(LD) $(OBJ2E) $(EOBJ) $(HLDFLAGS) -o $(OBJCOPY_PROG) \ +objcopy.o not-strip.o $(WRITE_DEBUG_OBJS) $(ADDL_LIBS) $(EXTRALIBS) $(ELIBS) + $(STRIP) $@ $(STRINGS_PROG): $(ADDL_DEPS) strings.o - $(HLDENV) $(CC) $(HLDFLAGS) $(CFLAGS) $(LDFLAGS) -o $(STRINGS_PROG) strings.o $(ADDL_LIBS) $(EXTRALIBS) + $(HLDENV) $(LD) $(OBJ2E) $(EOBJ) $(HLDFLAGS) -o $(STRINGS_PROG) strings.o $(ADDL_LIBS) $(EXTRALIBS) $(ELIBS) + $(STRIP) $@ $(STRIP_PROG): $(ADDL_DEPS) objcopy.o is-strip.o $(WRITE_DEBUG_OBJS) - $(HLDENV) $(CC) $(HLDFLAGS) $(CFLAGS) $(LDFLAGS) -o $(STRIP_PROG) objcopy.o is-strip.o $(WRITE_DEBUG_OBJS) $(ADDL_LIBS) $(EXTRALIBS) + $(HLDENV) $(LD) $(OBJ2E) $(EOBJ) $(HLDFLAGS) -o $(STRIP_PROG) objcopy.o is-strip.o $(WRITE_DEBUG_OBJS) $(ADDL_LIBS) $(EXTRALIBS) $(ELIBS) + $(STRIP) $@ $(NM_PROG): $(ADDL_DEPS) nm.o - $(HLDENV) $(CC) $(HLDFLAGS) $(CFLAGS) $(LDFLAGS) -o $(NM_PROG) nm.o $(ADDL_LIBS) $(EXTRALIBS) + $(HLDENV) $(LD) $(OBJ2E) $(EOBJ) $(HLDFLAGS) -o $(NM_PROG) nm.o $(ADDL_LIBS) $(EXTRALIBS) $(ELIBS) + $(STRIP) $@ $(OBJDUMP_PROG): $(ADDL_DEPS) objdump.o prdbg.o $(DEBUG_OBJS) $(OPCODES_DEP) - $(HLDENV) $(CC) $(HLDFLAGS) $(CFLAGS) $(LDFLAGS) -o $(OBJDUMP_PROG) objdump.o prdbg.o $(DEBUG_OBJS) $(OPCODES) $(ADDL_LIBS) $(EXTRALIBS) + $(HLDENV) $(LD) $(OBJ2E) $(EOBJ) $(HLDFLAGS) -o $(OBJDUMP_PROG) objdump.o prdbg.o $(DEBUG_OBJS) $(OPCODES) $(ADDL_LIBS) $(EXTRALIBS) $(ELIBS) + $(STRIP) $@ underscore.c: stamp-under ; @true @@ -282,7 +302,8 @@ $(CC) -c -DMAIN -DVERSION='"$(VERSION)"' $(ALL_CFLAGS) $(BASEDIR)/libiberty/cplus-dem.c $(DEMANGLER_PROG): cplus-dem.o $(LIBIBERTY) underscore.o $(DEMANGLER_PROG).1 - $(HLDENV) $(CC) $(HLDFLAGS) $(CFLAGS) $(LDFLAGS) -o $(DEMANGLER_PROG) cplus-dem.o $(LIBIBERTY) $(EXTRALIBS) underscore.o + $(HLDENV) $(LD) $(OBJ2E) $(EOBJ) $(HLDFLAGS) -o $(DEMANGLER_PROG) cplus-dem.o $(LIBIBERTY) $(EXTRALIBS) underscore.o $(ELIBS) + $(STRIP) $@ arparse.c: arparse.y $(BISON) $(BISONFLAGS) $(srcdir)/arparse.y @@ -298,13 +319,16 @@ mv lex.yy.c arlex.c $(AR_PROG): $(ADDL_DEPS) ar.o arparse.o arlex.o not-ranlib.o arsup.o - $(HLDENV) $(CC) $(HLDFLAGS) $(CFLAGS) $(LDFLAGS) -o $(AR_PROG) ar.o arparse.o arlex.o arsup.o not-ranlib.o $(ADDL_LIBS) $(EXTRALIBS) + $(HLDENV) $(LD) $(OBJ2E) $(EOBJ) $(HLDFLAGS) -o $(AR_PROG) ar.o arparse.o arlex.o arsup.o not-ranlib.o $(ADDL_LIBS) $(EXTRALIBS) $(ELIBS) + $(STRIP) $@ $(RANLIB_PROG): $(ADDL_DEPS) ar.o is-ranlib.o arparse.o arlex.o arsup.o - $(HLDENV) $(CC) $(HLDFLAGS) $(CFLAGS) $(LDFLAGS) -o $(RANLIB_PROG) ar.o arparse.o arlex.o arsup.o is-ranlib.o $(ADDL_LIBS) $(EXTRALIBS) + $(HLDENV) $(LD) $(OBJ2E) $(EOBJ) $(HLDFLAGS) -o $(RANLIB_PROG) ar.o arparse.o arlex.o arsup.o is-ranlib.o $(ADDL_LIBS) $(EXTRALIBS) $(ELIBS) + $(STRIP) $@ $(ADDR2LINE_PROG): $(ADDL_DEPS) addr2line.o - $(HLDENV) $(CC) $(HLDFLAGS) $(CFLAGS) $(LDFLAGS) -o $(ADDR2LINE_PROG) addr2line.o $(ADDL_LIBS) $(EXTRALIBS) + $(HLDENV) $(LD) $(OBJ2E) $(EOBJ) $(HLDFLAGS) -o $(ADDR2LINE_PROG) addr2line.o $(ADDL_LIBS) $(EXTRALIBS) $(ELIBS) + $(STRIP) $@ # This rule creates a single binary that switches between ar and ranlib # by looking at argv[0]. Use this kludge to save some disk space. @@ -314,14 +338,16 @@ # Alternatively, you can install ranlib.sh as ranlib. ar_with_ranlib: $(ADDL_DEPS) ar.o maybe-ranlib.o - $(HLDENV) $(CC) $(HLDFLAGS) $(CFLAGS) $(LDFLAGS) -o $(AR_PROG) ar.o maybe-ranlib.o $(ADDL_LIBS) $(EXTRALIBS) + $(HLDENV) $(LD) $(OBJ2E) $(EOBJ) $(HLDFLAGS) -o $(AR_PROG) ar.o maybe-ranlib.o $(ADDL_LIBS) $(EXTRALIBS) $(ELIBS) + $(STRIP) $@ -rm -f $(RANLIB_PROG) -ln $(AR_PROG) $(RANLIB_PROG) # objcopy and strip in one binary that uses argv[0] to decide its action. objcopy_with_strip: $(ADDL_DEPS) objcopy.o maybe-strip.o - $(HLDENV) $(CC) $(HLDFLAGS) $(CFLAGS) $(LDFLAGS) -o $(OBJCOPY_PROG) objcopy.o maybe-strip.o $(ADDL_LIBS) $(EXTRALIBS) + $(HLDENV) $(LD) $(OBJ2E) $(EOBJ) $(HLDFLAGS) -o $(OBJCOPY_PROG) objcopy.o maybe-strip.o $(ADDL_LIBS) $(EXTRALIBS) $(ELIBS) + $(STRIP) $@ -rm -f $(STRIP_PROG) -ln $(OBJCOPY_PROG) $(STRIP_PROG) @@ -367,10 +393,12 @@ fi srconv: srconv.o coffgrok.o $(ADDL_DEPS) - $(HLDENV) $(CC) $(HLDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ srconv.o coffgrok.o $(ADDL_LIBS) $(EXTRALIBS) + $(HLDENV) $(LD) $(OBJ2E) $(EOBJ) $(HLDFLAGS) -o $@ srconv.o coffgrok.o $(ADDL_LIBS) $(EXTRALIBS) $(ELIBS) + $(STRIP) $@ dlltool: dlltool.o defparse.o deflex.o cplus-dem.o $(ADDL_DEPS) - $(HLDENV) $(CC) $(HLDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ dlltool.o defparse.o deflex.o $(ADDL_LIBS) $(EXTRALIBS) + $(HLDENV) $(LD) $(OBJ2E) $(EOBJ) $(HLDFLAGS) -o $@ dlltool.o defparse.o deflex.o $(ADDL_LIBS) $(EXTRALIBS) $(ELIBS) + $(STRIP) $@ defparse.c:defparse.y $(BISON) $(BISONFLAGS) $(srcdir)/defparse.y @@ -387,10 +415,12 @@ $(CC) -c $(ALL_CFLAGS) $(srcdir)/dlltool.c coffdump: coffdump.o coffgrok.o $(ADDL_DEPS) - $(HLDENV) $(CC) $(HLDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ coffdump.o coffgrok.o $(ADDL_LIBS) $(EXTRALIBS) + $(HLDENV) $(LD) $(OBJ2E) $(EOBJ) $(HLDFLAGS) -o $@ coffdump.o coffgrok.o $(ADDL_LIBS) $(EXTRALIBS) $(ELIBS) + $(STRIP) $@ sysdump: sysdump.o $(ADDL_DEPS) - $(HLDENV) $(CC) $(HLDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ sysdump.o $(ADDL_LIBS) $(EXTRALIBS) + $(HLDENV) $(LD) $(OBJ2E) $(EOBJ) $(HLDFLAGS) -o $@ sysdump.o $(ADDL_LIBS) $(EXTRALIBS) $(ELIBS) + $(STRIP) $@ # Depend upon sysinfo.c to avoid building both nlmheader.c and sysinfo.c # simultaneously. @@ -406,7 +436,8 @@ $(CC) -c -DLD_NAME="\"$${ldname}\"" $(ALL_CFLAGS) $(srcdir)/nlmconv.c $(NLMCONV_PROG): nlmconv.o nlmheader.o $(ADDL_DEPS) - $(HLDENV) $(CC) $(HLDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ nlmconv.o nlmheader.o $(ADDL_LIBS) $(EXTRALIBS) + $(HLDENV) $(LD) $(OBJ2E) $(EOBJ) $(HLDFLAGS) -o $@ nlmconv.o nlmheader.o $(ADDL_LIBS) $(EXTRALIBS) $(ELIBS) + $(STRIP) $@ # Targets to rebuild dependencies in this Makefile. # Have to get rid of .dep1 here so that "$?" later includes all of $(CFILES). diff -urP binutils-2.8/gas/Makefile binutils-2.8-eo/gas/Makefile --- binutils-2.8/gas/Makefile Sat Feb 22 21:53:05 2003 +++ binutils-2.8-eo/gas/Makefile Sat Feb 22 20:22:40 2003 @@ -478,8 +478,8 @@ STAGESTUFF = *.o as.new gasp.new $(OBJS): ../bfd/bfd.h -ROOT=../../EOTA-CUR/kernel -NEWLIB=../../libc/newlib-1.8.1-eota/eota/newlib +ROOT=$(HOME)/EOTA/eota/kernel +NEWLIB=$(HOME)/EOTA/libc/newlib-1.8.1-eota/eota/newlib EOBJ=$(NEWLIB)/crt0.o ELIBS=$(NEWLIB)/libc.a $(ROOT)/POSIX/libc/libnative.a #$(ROOT)/ITRON/kernlib/libkernel.a STARTADDR=0x00001000 diff -urP binutils-2.8/ld/Makefile binutils-2.8-eo/ld/Makefile --- binutils-2.8/ld/Makefile Sat Feb 22 21:53:05 2003 +++ binutils-2.8-eo/ld/Makefile Sat Feb 22 20:28:01 2003 @@ -642,8 +642,8 @@ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/z8000.sc ${GEN_DEPENDS} ${GENSCRIPTS} z8002 "$(tdir_z8002)" -ROOT=../../EOTA-CUR/kernel -NEWLIB=../../libc/newlib-1.8.1-eota/eota/newlib +ROOT=$(HOME)/EOTA/eota/kernel +NEWLIB=$(HOME)/EOTA/libc/newlib-1.8.1-eota/eota/newlib EOBJ=$(NEWLIB)/crt0.o ELIBS=$(NEWLIB)/libc.a $(ROOT)/POSIX/libc/libnative.a #$(ROOT)/ITRON/kernlib/libkernel.a STARTADDR=0x00001000 diff -urP binutils-2.8/libiberty/Makefile binutils-2.8-eo/libiberty/Makefile --- binutils-2.8/libiberty/Makefile Sat Feb 22 21:51:12 2003 +++ binutils-2.8-eo/libiberty/Makefile Sat Feb 22 20:44:35 2003 @@ -175,12 +175,14 @@ strchr.c strdup.c strerror.c strrchr.c strsignal.c \ strstr.c strtod.c strtol.c strtoul.c tmpnam.c \ vasprintf.c vfork.c vfprintf.c vprintf.c vsprintf.c waitpid.c \ - xatexit.c xexit.c xmalloc.c xstrdup.c xstrerror.c + xatexit.c xexit.c xmalloc.c xstrdup.c xstrerror.c \ + eota.c # These are always included in the library. REQUIRED_OFILES = argv.o basename.o choose-temp.o concat.o cplus-dem.o \ fdmatch.o fnmatch.o getopt.o getopt1.o getruntime.o hex.o \ floatformat.o objalloc.o obstack.o spaces.o strerror.o strsignal.o \ - xatexit.o xexit.o xmalloc.o xstrdup.o xstrerror.o + xatexit.o xexit.o xmalloc.o xstrdup.o xstrerror.o \ + eota.o # Do we want/need any config overrides? # diff -urP binutils-2.8/libiberty/eota.c binutils-2.8-eo/libiberty/eota.c --- binutils-2.8/libiberty/eota.c Thu Jan 1 09:00:00 1970 +++ binutils-2.8-eo/libiberty/eota.c Sat Feb 22 20:46:27 2003 @@ -0,0 +1,4 @@ +int lstat(const char *file_name, struct stat *buf) +{ + return stat(file_name, buf); +}