diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-01-08 17:06:21 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-01-08 17:06:21 +0000 |
| commit | aaf14056e435090f70b7e82d42874d090d1a1e35 (patch) | |
| tree | 41a2ddea543958ebb2c2d0e4018edd3275b690f2 /nuttx/arch/pjrc-8051 | |
| parent | 6be6922d92309de635a5c222d94224adab2f73e5 (diff) | |
| download | px4-nuttx-aaf14056e435090f70b7e82d42874d090d1a1e35.tar.gz px4-nuttx-aaf14056e435090f70b7e82d42874d090d1a1e35.tar.bz2 px4-nuttx-aaf14056e435090f70b7e82d42874d090d1a1e35.zip | |
Make logic reorganized for non-GNU toolchain
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@528 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/pjrc-8051')
| -rw-r--r-- | nuttx/arch/pjrc-8051/src/Makefile | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/nuttx/arch/pjrc-8051/src/Makefile b/nuttx/arch/pjrc-8051/src/Makefile index 3cd07406b..5d95b2f78 100644 --- a/nuttx/arch/pjrc-8051/src/Makefile +++ b/nuttx/arch/pjrc-8051/src/Makefile @@ -108,13 +108,13 @@ STACK_BASE = ${shell \ all: up_head$(OBJEXT) libarch$(LIBEXT) $(ASRCS) $(LINKASRCS): %$(ASMEXT): %.S - $(CPP) -P $(CPPFLAGS) -D__ASSEMBLY__ $< -o $@ + $(CPP) -P $(CPPFLAGS) $< -o $@ $(AOBJS) $(LINKOBJS): $(ASRCS) $(LINKASRCS) - $(AS) $(ASFLAGS) $< + $(call ASSEMBLE, $<, $@) $(COBJS) $(TESTOBJS): %$(OBJEXT): %.c - $(CC) -c $(CFLAGS) $< -o $@ + $(call COMPILE, $<, $@) # Create a header file that contains addressing information needed by the code @@ -147,8 +147,7 @@ up_mem.h: pass1.mem libarch$(LIBEXT): up_mem.h $(OBJS) @( for obj in $(OBJS) ; do \ - $(AR) $@ $${obj} || \ - { echo "$(AR) $@ $${obj} FAILED!" ; exit 1 ; } ; \ + $(call ARCHIVE, $@, $${obj}); \ done ; ) # This is a kludge to work around some conflicting symbols in libsdcc.liXqueb @@ -171,19 +170,21 @@ board/libboard$(LIBEXT): # This target builds the final executable pass1.ihx: up_mem.h $(SDCCLIBDIR)/libmysdcc.lib $(LINKOBJS) board/libboard$(LIBEXT) - $(CC) $(LDFLAGS) $(LDPATHES) -L$(BOARDDIR) $(SDCCPATH) $(LINKOBJS) \ + @echo "LD: $@" + @$(CC) $(LDFLAGS) $(LDPATHES) -L$(BOARDDIR) $(SDCCPATH) $(LINKOBJS) \ $(LDLIBS) -llibboard$(LIBEXT) $(SDCCLIBS) -o $@ @rm -f up_mem.h @rm -f up_allocateheap$(OBJEXT) libarch$(LIBEXT) @$(MAKE) TOPDIR=$(TOPDIR) libarch$(LIBEXT) nuttx.ihx: up_mem.h $(SDCCLIBDIR)/libmysdcc.lib $(LINKOBJS) - $(CC) $(LDFLAGS) $(LDPATHES) -L$(BOARDDIR) $(SDCCPATH) $(LINKOBJS) \ + @echo "LD: $@" + @$(CC) $(LDFLAGS) $(LDPATHES) -L$(BOARDDIR) $(SDCCPATH) $(LINKOBJS) \ $(LDLIBS) -llibboard$(LIBEXT) $(SDCCLIBS) -o $@ nuttx$(EXEEXT): pass1.ihx nuttx.ihx @rm -f pass1.* - packihx nuttx.ihx > $(TOPDIR)/nuttx$(EXEEXT) + @packihx nuttx.ihx > $(TOPDIR)/nuttx$(EXEEXT) @cp -f nuttx.map $(TOPDIR)/. # This target builds a test program to verify interrupt context switching. irqtest is |