[Tinyos-commits] CVS: tinyos-1.x/tools/make/pxa27x pxa27x.rules, 1.3, 1.4

[Robbie Adler]

Update of /cvsroot/tinyos/tinyos-1.x/tools/make/pxa27x
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1356

Modified Files:
	pxa27x.rules 
Log Message:
updated rules to dynamically compile assembly files

Index: pxa27x.rules
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/make/pxa27x/pxa27x.rules,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pxa27x.rules	10 Jun 2005 21:41:02 -0000	1.3
--- pxa27x.rules	4 Aug 2005 22:27:41 -0000	1.4
***************
*** 11,14 ****
--- 11,15 ----
  HELP += $(PXA27X_HELP)
  
+ GAS = xscale-elf-as
  OBJCOPY = xscale-elf-objcopy
  OBJDUMP = xscale-elf-objdump
***************
*** 22,27 ****
  MAIN_BIN = $(BUILDDIR)/main.bin
  INSTALL_BIN = $(MAIN_BIN).out$(if $(NODEID),-$(NODEID),)
  
! OPTFLAGS ?= -Os
  PFLAGS += -Wall -Wshadow -DDEF_TOS_AM_GROUP=$(DEFAULT_LOCAL_GROUP) $(NESC_FLAGS)
  PFLAGS += -target=$(PLATFORM) -fnesc-cfile=$(BUILDDIR)/app.c -board=$(SENSORBOARD)
--- 23,31 ----
  MAIN_BIN = $(BUILDDIR)/main.bin
  INSTALL_BIN = $(MAIN_BIN).out$(if $(NODEID),-$(NODEID),)
+ PLATFORM_DIR = $(TOSDIR)/platform/pxa27x
+ ASSEMBLY_FILES += $(PLATFORM_DIR)/barecrt.s $(PLATFORM_DIR)/mmu_table.s $(PLATFORM_DIR)/util.s 
+ ASSEMBLY_OBJS =  $(BUILDDIR)/asms.o
  
! OPTFLAGS ?= -Os	
  PFLAGS += -Wall -Wshadow -DDEF_TOS_AM_GROUP=$(DEFAULT_LOCAL_GROUP) $(NESC_FLAGS)
  PFLAGS += -target=$(PLATFORM) -fnesc-cfile=$(BUILDDIR)/app.c -board=$(SENSORBOARD)
***************
*** 54,60 ****
  	@:
  
! exe0: builddir $(BUILD_EXTRA_DEPS) FORCE
  	@echo "    compiling $(COMPONENT) to a $(PLATFORM) binary"
! 	$(NCC) -o $(MAIN_EXE) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(COMPONENT).nc $(LIBS) $(LDFLAGS)
  	@echo "    compiled $(COMPONENT) to $(MAIN_EXE)"
  
--- 58,64 ----
  	@:
  
! exe0: builddir asms $(BUILD_EXTRA_DEPS) FORCE
  	@echo "    compiling $(COMPONENT) to a $(PLATFORM) binary"
! 	$(NCC) -o $(MAIN_EXE) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(COMPONENT).nc $(LIBS) $(LDFLAGS) $(ASSEMBLY_OBJS)
  	@echo "    compiled $(COMPONENT) to $(MAIN_EXE)"
  
***************
*** 65,66 ****
--- 69,73 ----
  	@objdump -h $(MAIN_EXE) | perl -ne '$$b{$$1}=hex $$2 if /^\s*\d+\s*\.(text|data|bss)\s+(\S+)/; END { printf("%16d bytes in ROM\n%16d bytes in RAM\n",$$b{text}+$$b{data},$$b{data}+$$b{bss}); }'
  
+ asms: 
+ 	$(GAS) $(ASSEMBLY_FILES) -o $(BUILDDIR)/asms.o -mfpu=softfpa
+