From 71f2d3d25dc2942c32b896e908b25e6f9ee5a902 Mon Sep 17 00:00:00 2001 From: patacongo Date: Tue, 8 Jan 2008 13:02:47 +0000 Subject: [PATCH] ZNeo compiler now works git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@525 42af7a65-404d-4744-a932-0658087f49c3 --- Makefile | 34 ++++++++++++++-------------- TODO | 4 ++-- arch/arm/src/Makefile | 8 +++---- arch/z16/src/Makefile | 10 ++++---- arch/z80/src/Makefile | 12 +++++----- configs/z16f2800100zcog/Make.defs | 11 +++++---- configs/z16f2800100zcog/setenv.sh | 2 +- configs/z16f2800100zcog/src/Makefile | 4 ++-- examples/ostest/Makefile | 4 ++-- lib/Makefile | 4 ++-- mm/Makefile | 4 ++-- sched/Makefile | 6 ++--- 12 files changed, 52 insertions(+), 51 deletions(-) diff --git a/Makefile b/Makefile index 8d9d0c7b74..34961b9c60 100644 --- a/Makefile +++ b/Makefile @@ -113,7 +113,7 @@ all: $(BIN) # Build the mkconfig tool used to create include/nuttx/config.h tools/mkconfig: - $(MAKE) -C tools -f Makefile.mkconfig TOPDIR=$(TOPDIR) mkconfig + $(MAKE) -C tools -f Makefile.mkconfig TOPDIR="$(TOPDIR)" mkconfig # Create the include/nuttx/config.h file include/nuttx/config.h: $(TOPDIR)/.config tools/mkconfig @@ -203,51 +203,51 @@ check_context: fi sched/libsched$(LIBEXT): context - $(MAKE) -C sched TOPDIR=$(TOPDIR) libsched$(LIBEXT) + $(MAKE) -C sched TOPDIR="$(TOPDIR)" libsched$(LIBEXT) lib/liblib$(LIBEXT): context - $(MAKE) -C lib TOPDIR=$(TOPDIR) liblib$(LIBEXT) + $(MAKE) -C lib TOPDIR="$(TOPDIR)" liblib$(LIBEXT) $(ARCH_SRC)/libarch$(LIBEXT): context - $(MAKE) -C $(ARCH_SRC) TOPDIR=$(TOPDIR) libarch$(LIBEXT) + $(MAKE) -C $(ARCH_SRC) TOPDIR="$(TOPDIR)" libarch$(LIBEXT) mm/libmm$(LIBEXT): context - $(MAKE) -C mm TOPDIR=$(TOPDIR) libmm$(LIBEXT) + $(MAKE) -C mm TOPDIR="$(TOPDIR)" libmm$(LIBEXT) net/libnet$(LIBEXT): context - $(MAKE) -C net TOPDIR=$(TOPDIR) libnet$(LIBEXT) + $(MAKE) -C net TOPDIR="$(TOPDIR)" libnet$(LIBEXT) netutils/libnetutils$(LIBEXT): context - $(MAKE) -C netutils TOPDIR=$(TOPDIR) libnetutils$(LIBEXT) + $(MAKE) -C netutils TOPDIR="$(TOPDIR)" libnetutils$(LIBEXT) fs/libfs$(LIBEXT): context - $(MAKE) -C fs TOPDIR=$(TOPDIR) libfs$(LIBEXT) + $(MAKE) -C fs TOPDIR="$(TOPDIR)" libfs$(LIBEXT) drivers/libdrivers$(LIBEXT): context - $(MAKE) -C drivers TOPDIR=$(TOPDIR) libdrivers$(LIBEXT) + $(MAKE) -C drivers TOPDIR="$(TOPDIR)" libdrivers$(LIBEXT) pcode/libpcode$(LIBEXT): context - $(MAKE) -C pcode TOPDIR=$(TOPDIR) libpcode$(LIBEXT) + $(MAKE) -C pcode TOPDIR="$(TOPDIR)" libpcode$(LIBEXT) examples/$(CONFIG_EXAMPLE)/lib$(CONFIG_EXAMPLE)$(LIBEXT): context - $(MAKE) -C examples/$(CONFIG_EXAMPLE) TOPDIR=$(TOPDIR) lib$(CONFIG_EXAMPLE)$(LIBEXT) + $(MAKE) -C examples/$(CONFIG_EXAMPLE) TOPDIR="$(TOPDIR)" lib$(CONFIG_EXAMPLE)$(LIBEXT) $(BIN): context depend $(LINKLIBS) - $(MAKE) -C $(ARCH_SRC) TOPDIR=$(TOPDIR) LINKLIBS="$(LINKLIBS)" $(BIN) + $(MAKE) -C $(ARCH_SRC) TOPDIR="$(TOPDIR)" LINKLIBS="$(LINKLIBS)" $(BIN) depend: @for dir in $(MAKEDIRS) ; do \ - $(MAKE) -C $$dir TOPDIR=$(TOPDIR) depend ; \ + $(MAKE) -C $$dir TOPDIR="$(TOPDIR)" depend ; \ done subdir_clean: @for dir in $(CLEANDIRS) ; do \ if [ -e $$dir/Makefile ]; then \ - $(MAKE) -C $$dir TOPDIR=$(TOPDIR) clean ; \ + $(MAKE) -C $$dir TOPDIR="$(TOPDIR)" clean ; \ fi \ done - $(MAKE) -C tools -f Makefile.mkconfig TOPDIR=$(TOPDIR) clean - $(MAKE) -C mm -f Makefile.test TOPDIR=$(TOPDIR) clean + $(MAKE) -C tools -f Makefile.mkconfig TOPDIR="$(TOPDIR)" clean + $(MAKE) -C mm -f Makefile.test TOPDIR="$(TOPDIR)" clean clean: subdir_clean rm -f $(BIN) $(BIN).* mm_test *.map *~ @@ -255,7 +255,7 @@ clean: subdir_clean subdir_distclean: @for dir in $(CLEANDIRS) ; do \ if [ -e $$dir/Makefile ]; then \ - $(MAKE) -C $$dir TOPDIR=$(TOPDIR) distclean ; \ + $(MAKE) -C $$dir TOPDIR="$(TOPDIR)" distclean ; \ fi \ done diff --git a/TODO b/TODO index 8c8bfcccd8..917122cc88 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,5 @@ -NuttX TODO List (Last updated December 13, 2007) -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +NuttX TODO List (Last updated January 6, 2008) +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ (6) Task/Scheduler (sched/) (1) Dynamic loader (N/A) diff --git a/arch/arm/src/Makefile b/arch/arm/src/Makefile index 625f0226c4..e0f73fb0a1 100644 --- a/arch/arm/src/Makefile +++ b/arch/arm/src/Makefile @@ -78,7 +78,7 @@ libarch$(LIBEXT): $(OBJS) done ; ) board/libboard$(LIBEXT): - $(MAKE) -C board TOPDIR=$(TOPDIR) libboard$(LIBEXT) + $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) nuttx: $(HEAD_AOBJ) board/libboard$(LIBEXT) $(LD) --entry=__start $(LDFLAGS) $(LDPATHES) -L$(BOARDDIR) -o $(TOPDIR)/$@ $(HEAD_AOBJ) \ @@ -100,7 +100,7 @@ endif .depend: Makefile chip/Make.defs $(SRCS) @if [ -e board/Makefile ]; then \ - $(MAKE) -C board TOPDIR=$(TOPDIR) depend ; \ + $(MAKE) -C board TOPDIR="$(TOPDIR)" depend ; \ fi $(MKDEP) --dep-path chip --dep-path common $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ @@ -109,14 +109,14 @@ depend: .depend clean: @if [ -e board/Makefile ]; then \ - $(MAKE) -C board TOPDIR=$(TOPDIR) clean ; \ + $(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \ fi @rm -f libarch$(LIBEXT) *~ @if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi distclean: clean @if [ -e board/Makefile ]; then \ - $(MAKE) -C board TOPDIR=$(TOPDIR) distclean ; \ + $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \ fi @rm -f Make.dep .depend diff --git a/arch/z16/src/Makefile b/arch/z16/src/Makefile index 93eaff1476..487257dda1 100644 --- a/arch/z16/src/Makefile +++ b/arch/z16/src/Makefile @@ -78,7 +78,7 @@ libarch$(LIBEXT): $(OBJS) done ; ) board/libboard$(LIBEXT): - $(MAKE) -C board TOPDIR=$(TOPDIR) libboard$(LIBEXT) + $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) nuttx: $(HEAD_AOBJ) board/libboard$(LIBEXT) $(LD) --entry=__start $(LDFLAGS) $(LDPATHES) -L$(BOARDDIR) -o $(TOPDIR)/$@ $(HEAD_AOBJ) \ @@ -86,23 +86,23 @@ nuttx: $(HEAD_AOBJ) board/libboard$(LIBEXT) .depend: Makefile chip/Make.defs $(SRCS) @if [ -e board/Makefile ]; then \ - $(MAKE) -C board TOPDIR=$(TOPDIR) depend ; \ + $(MAKE) -C board TOPDIR="$(TOPDIR)" depend ; \ fi - $(MKDEP) --dep-path chip --dep-path common $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) --dep-path chip --dep-path common $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend clean: @if [ -e board/Makefile ]; then \ - $(MAKE) -C board TOPDIR=$(TOPDIR) clean ; \ + $(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \ fi @rm -f libarch$(LIBEXT) *~ @if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi distclean: clean @if [ -e board/Makefile ]; then \ - $(MAKE) -C board TOPDIR=$(TOPDIR) distclean ; \ + $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \ fi @rm -f Make.dep .depend diff --git a/arch/z80/src/Makefile b/arch/z80/src/Makefile index 5c9ccb5d3f..b1025ed674 100644 --- a/arch/z80/src/Makefile +++ b/arch/z80/src/Makefile @@ -165,7 +165,7 @@ libarch$(LIBEXT): up_mem.h asm_mem.h $(OBJS) # This builds the libboard library in the board/ subdirectory board/libboard$(LIBEXT): - $(MAKE) -C board TOPDIR=$(TOPDIR) libboard$(LIBEXT) + $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) # This target builds the final executable @@ -190,8 +190,8 @@ pass1.ihx: up_mem.h asm_mem.h $(SDCCLIBDIR)/myz80.lib $(HEAD_AOBJ) board/libboar $(LD) -f pass1.lnk @rm -f up_mem.h asm_mem.h @rm -f up_allocateheap$(OBJEXT) $(HEAD_AOBJ) libarch$(LIBEXT) - @$(MAKE) TOPDIR=$(TOPDIR) libarch$(LIBEXT) - @$(MAKE) TOPDIR=$(TOPDIR) $(HEAD_AOBJ) + @$(MAKE) TOPDIR="$(TOPDIR)" libarch$(LIBEXT) + @$(MAKE) TOPDIR="$(TOPDIR)" $(HEAD_AOBJ) nuttx.ihx: up_mem.h asm_mem.h $(SDCCLIBDIR)/myz80.lib $(HEAD_AOBJ) board/libboard$(LIBEXT) @echo "--" >nuttx.lnk # Non-interactive @@ -222,7 +222,7 @@ nuttx$(EXEEXT): pass1.ihx nuttx.ihx .depend: Makefile up_mem.h asm_mem.h chip/Make.defs $(DEPSRCS) @if [ -e board/Makefile ]; then \ - $(MAKE) -C board TOPDIR=$(TOPDIR) depend ; \ + $(MAKE) -C board TOPDIR="$(TOPDIR)" depend ; \ fi $(MKDEP) --dep-path chip --dep-path common $(CC) -- $(CFLAGS) -- $(DEPSRCS) >Make.dep @touch $@ @@ -231,7 +231,7 @@ depend: .depend clean: @if [ -e board/Makefile ]; then \ - $(MAKE) -C board TOPDIR=$(TOPDIR) clean ; \ + $(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \ fi rm -f libarch$(LIBEXT) up_mem.h asm_mem.h pass1.* nuttx.* rm -f *.asm *.rel *.lst *.rst *.sym *.adb *.lnk *.map *.mem *.ihx *.hex @@ -240,7 +240,7 @@ clean: distclean: clean @if [ -e board/Makefile ]; then \ - $(MAKE) -C board TOPDIR=$(TOPDIR) distclean ; \ + $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \ fi rm -f Make.dep .depend diff --git a/configs/z16f2800100zcog/Make.defs b/configs/z16f2800100zcog/Make.defs index a690606cae..569a9f0e46 100644 --- a/configs/z16f2800100zcog/Make.defs +++ b/configs/z16f2800100zcog/Make.defs @@ -36,6 +36,7 @@ include ${TOPDIR}/.config ZDSINSTALLDIR = C:/Program\ Files/ZiLOG/ZDSII_ZNEO_4.10.2 +ZDSBINDIR = $(ZDSINSTALLDIR)/bin ZDSLIBDIR = $(ZDSINSTALLDIR)/lib/std ZDSINCDIR = $(ZDSINSTALLDIR)/include @@ -72,11 +73,11 @@ CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \ $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) CROSSDEV = -CC = zneocc -CPP = zneoasm -LD = zneolink -AS = zneoasm -AR = zneolib +CC = $(ZDSBINDIR)/zneocc.exe +CPP = $(ZDSBINDIR)/zneoasm.exe +LD = $(ZDSBINDIR)/zneolink.exe +AS = $(ZDSBINDIR)/zneoasm.exe +AR = $(ZDSBINDIR)/zneolib.exe ASMEXT = .asm OBJEXT = .obj diff --git a/configs/z16f2800100zcog/setenv.sh b/configs/z16f2800100zcog/setenv.sh index 6ab843c2ed..e0c18d13a2 100755 --- a/configs/z16f2800100zcog/setenv.sh +++ b/configs/z16f2800100zcog/setenv.sh @@ -41,6 +41,6 @@ if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi WD=`pwd` ZDSINSTALLDIR="C:/Program\ Files/ZiLOG/ZDSII_ZNEO_4.10.2" -export PATH=${ZDSINSTALLDIR}/bin:/sbin:/usr/sbin:${PATH_ORIG} +export PATH="${ZDSINSTALLDIR}/bin:/sbin:/usr/sbin:${PATH_ORIG}" echo "PATH : ${PATH}" diff --git a/configs/z16f2800100zcog/src/Makefile b/configs/z16f2800100zcog/src/Makefile index 96acd71010..be3eedd310 100644 --- a/configs/z16f2800100zcog/src/Makefile +++ b/configs/z16f2800100zcog/src/Makefile @@ -57,13 +57,13 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(CC) -c $(CFLAGS) $< -o $@ libboard$(LIBEXT): $(OBJS) - ( for obj in $(OBJS) ; do \ + @( for obj in $(OBJS) ; do \ $(AR) $@ $${obj} || \ { echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \ done ; ) .depend: Makefile $(SRCS) - $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep touch $@ depend: .depend diff --git a/examples/ostest/Makefile b/examples/ostest/Makefile index 28a21794f9..f87e9f3d20 100644 --- a/examples/ostest/Makefile +++ b/examples/ostest/Makefile @@ -78,13 +78,13 @@ $(COBJS): %$(OBJEXT): %.c $(CC) -c $(CFLAGS) $< -o $@ $(BIN): $(OBJS) - ( for obj in $(OBJS) ; do \ + @( for obj in $(OBJS) ; do \ $(AR) $@ $${obj} || \ { echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \ done ; ) .depend: Makefile $(SRCS) - $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep touch $@ depend: .depend diff --git a/lib/Makefile b/lib/Makefile index ce98422b2d..cdfacf9ae9 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -97,13 +97,13 @@ $(COBJS): %$(OBJEXT): %.c $(CC) -c $(CFLAGS) $< -o $@ $(BIN): $(OBJS) - ( for obj in $(OBJS) ; do \ + @( for obj in $(OBJS) ; do \ $(AR) $@ $${obj} || \ { echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \ done ; ) .depend: Makefile $(SRCS) - $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep touch $@ depend: .depend diff --git a/mm/Makefile b/mm/Makefile index b3e5bfe762..001cdcda59 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -56,13 +56,13 @@ $(COBJS): %.o: %.c $(CC) -c $(CFLAGS) $< -o $@ $(BIN): $(OBJS) - ( for obj in $(OBJS) ; do \ + @( for obj in $(OBJS) ; do \ $(AR) $@ $${obj} || \ { echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \ done ; ) .depend: Makefile $(SRCS) - $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep touch $@ depend: .depend diff --git a/sched/Makefile b/sched/Makefile index 8bd0cd80ec..205a83c839 100644 --- a/sched/Makefile +++ b/sched/Makefile @@ -148,14 +148,14 @@ $(COBJS): %$(OBJEXT): %.c $(CC) -c $(CFLAGS) $< -o $@ $(BIN): $(OBJS) - ( for obj in $(OBJS) ; do \ + @( for obj in $(OBJS) ; do \ $(AR) $@ $${obj} || \ { echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \ done ; ) .depend: Makefile $(SRCS) - $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - touch $@ + @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @touch $@ depend: .depend