2007-05-10 Joel Sherrill <joel.sherrill@OARcorp.com>

* custom/gba.cfg, custom/gp32.cfg, custom/i386ex.cfg, custom/pc386.cfg, custom/sim68000.cfg, custom/ts_386ex.cfg: Clean up to use .nxe extension instead of BSP unique ones.
2007-05-10 17:36:19 +00:00
parent 6bdfa7a9e6
commit c6eba79c2d
7 changed files with 33 additions and 41 deletions
--- a/make/ChangeLog
+++ b/make/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-10	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* custom/gba.cfg, custom/gp32.cfg, custom/i386ex.cfg, custom/pc386.cfg,
+	custom/sim68000.cfg, custom/ts_386ex.cfg: Clean up to use .nxe
+	extension instead of BSP unique ones.
+
 2007-05-09	Joel Sherrill <joel.sherrill@OARcorp.com>

 	* compilers/gcc-no_bsp.cfg: There are no longer any required managers.
--- a/make/custom/gba.cfg
+++ b/make/custom/gba.cfg
@@ -23,26 +23,26 @@ CFLAGS_OPTIMIZE_V = -O2 -g

 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
-	    -Wl,-Map,$(basename $@).map -o $(basename $@).elf \
+	    -Wl,-Map,$(basename $@).map -o $(basename $@).nxe \
 	    $(LINK_OBJS) $(LINK_LIBS)
-	$(OBJCOPY) -O binary  $(basename $@).elf $@
+	$(OBJCOPY) -O binary  $(basename $@).nxe $@
 	$(OBJCOPY) -O binary --remove-section=.comment \
 	    --remove-section=.note --strip-unneeded \
-	    $(basename $@).elf $(basename $@).gba
-	$(NM) -g -n $(basename $@).elf > $(basename $@).num
-	$(SIZE) $(basename $@).elf
+	    $(basename $@).nxe $(basename $@).gba
+	$(NM) -g -n $(basename $@).nxe > $(basename $@).num
+	$(SIZE) $(basename $@).nxe
 endef

 define make-cxx-exe
 	$(LINK.cc) $(AM_CFLAGS) $(AM_CXXFLAGS) $(AM_LDFLAGS) \
-	    -Wl,-Map,$(basename $@).map -o $(basename $@).elf \
+	    -Wl,-Map,$(basename $@).map -o $(basename $@).nxe \
 	    $(LINK_OBJS) $(LINK_LIBS)
-	$(OBJCOPY) -O binary  $(basename $@).elf $@
+	$(OBJCOPY) -O binary  $(basename $@).nxe $@
 	$(OBJCOPY) -O binary --remove-section=.comment \
 	    --remove-section=.note --strip-unneeded  \
-	    $(basename $@).elf $(basename $@).gba
-	$(NM) -g -n $(basename $@).elf > $(basename $@).num
-	$(SIZE) $(basename $@).elf
+	    $(basename $@).nxe $(basename $@).gba
+	$(NM) -g -n $(basename $@).nxe > $(basename $@).num
+	$(SIZE) $(basename $@).nxe
 endef

 # Miscellaneous additions go here
--- a/make/custom/gp32.cfg
+++ b/make/custom/gp32.cfg
@@ -23,7 +23,7 @@ CFLAGS_OPTIMIZE_V = -O2 -g
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ \
 	    $(LINK_OBJS) $(LINK_LIBS)
-	$(OBJCOPY) -O binary $(basename $@).exe $(basename $@).elf
+	$(OBJCOPY) -O binary $(basename $@).exe $(basename $@).nxe
 	$(NM) -g -n $(basename $@).exe > $(basename $@).num
 	$(SIZE) $(basename $@).exe
 endef
@@ -31,7 +31,7 @@ endef
 define make-cxx-exe
 	$(LINK.cc) $(AM_CFLAGS) $(AM_CXXFLAGS) $(AM_LDFLAGS) -o $@ \
 	    $(LINK_OBJS) $(LINK_LIBS)
-	$(OBJCOPY) -O binary $(basename $@).exe $(basename $@).elf
+	$(OBJCOPY) -O binary $(basename $@).exe $(basename $@).nxe
 	$(NM) -g -n $(basename $@).exe > $(basename $@).num
 	$(SIZE) $(basename $@).exe
 endef
--- a/make/custom/i386ex.cfg
+++ b/make/custom/i386ex.cfg
@@ -22,12 +22,6 @@ CFLAGS_OPTIMIZE_V = -O2 -g

 #  Something like this should produce a map file but this does not work.

-#     -Xlinker "-Map $(basename $@).map" $(LINK_OBJS)
-#
-#  This is a good way to get debug information.  The rdmp file is large
-#  though (1.9 Mb for hello) and greatly slows the build process.
-# $(OBJDUMP) -x -m i386 -d $(basename $@).elf > $(basename $@).rdmp
-
 # The following are definitions of make-exe which will work using ld as
 # is currently required.

--- a/make/custom/pc386.cfg
+++ b/make/custom/pc386.cfg
@@ -47,18 +47,18 @@ HEADERADDR=0x00097E00

 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -Wl,-Ttext,$(RELOCADDR) \
-	    -o $(basename $@).elf \
+	    -o $(basename $@).nxe \
 	    $(LINK_OBJS) $(LINK_LIBS)
 	$(OBJCOPY) -O elf32-i386 \
 	    --remove-section=.rodata \
 	    --remove-section=.comment \
 	    --remove-section=.note \
-	    --strip-unneeded $(basename $@).elf $@
-	$(OBJCOPY) -O binary $(basename $@).elf $(basename $@).bin
+	    --strip-unneeded $(basename $@).nxe $@
+	$(OBJCOPY) -O binary $(basename $@).nxe $(basename $@).bin
 	$(PROJECT_TOOLS)/bin2boot -v $(basename $@).bt $(HEADERADDR)\
 	  $(START16FILE) $(START16ADDR) 0 $(basename $@).bin $(RELOCADDR) 0
-	$(NM) -g -n $(basename $@).elf > $(basename $@).num
-	$(SIZE) $(basename $@).elf
+	$(NM) -g -n $(basename $@).nxe > $(basename $@).num
+	$(SIZE) $(basename $@).nxe
 #	test -d ${PROJECT_RELEASE}/BootImgs \
 #	  || mkdir ${PROJECT_RELEASE}/BootImgs
 #	f=`basename $@ .exe`; \
@@ -71,18 +71,18 @@ define make-exe
 endef
 define make-cxx-exe
 	$(LINK.cc) $(AM_CFLAGS) $(AM_CXXFLAGS) $(AM_LDFLAGS) \
-	   -Wl,-Ttext,$(RELOCADDR) -o $(basename $@).elf \
+	   -Wl,-Ttext,$(RELOCADDR) -o $(basename $@).nxe \
 	    $(LINK_OBJS) $(LINK_LIBS)
 	$(OBJCOPY) -O elf32-i386 \
 	    --remove-section=.rodata \
 	    --remove-section=.comment \
 	    --remove-section=.note \
-	    --strip-unneeded $(basename $@).elf $@
-	$(OBJCOPY) -O binary $(basename $@).elf $(basename $@).bin
+	    --strip-unneeded $(basename $@).nxe $@
+	$(OBJCOPY) -O binary $(basename $@).nxe $(basename $@).bin
 	$(PROJECT_TOOLS)/bin2boot -v $(basename $@).bt $(HEADERADDR)\
 	  $(START16FILE) $(START16ADDR) 0 $(basename $@).bin $(RELOCADDR) 0
-	$(NM) -g -n $(basename $@).elf > $(basename $@).num
-	$(SIZE) $(basename $@).elf
+	$(NM) -g -n $(basename $@).nxe > $(basename $@).num
+	$(SIZE) $(basename $@).nxe
 endef

 # Miscellaneous additions go here
--- a/make/custom/sim68000.cfg
+++ b/make/custom/sim68000.cfg
@@ -27,6 +27,6 @@ define make-exe
 	    -o $(basename $@).nxe $(LINK_OBJS) $(LINK_LIBS)
 	$(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).exe
 	$(NM) -g -n $(basename $@).nxe > $(basename $@).num
-	$(SIZE) $@
+	$(SIZE) $(basename $@).nxe
 endef
 # Miscellaneous additions go here
--- a/make/custom/ts_386ex.cfg
+++ b/make/custom/ts_386ex.cfg
@@ -21,20 +21,12 @@ CPU_CFLAGS =-msoft-float -mno-fp-ret-in-387
 # optimize flag: typically -O2
 CFLAGS_OPTIMIZE_V = -O2 -g 

-#  Something like this should produce a map file but this does not work.
-
-#     -Xlinker "-Map $(basename $@).map" $(LINK_OBJS)
-#
-#  This is a good way to get debug information.  The rdmp file is large
-#  though (1.9 Mb for hello) and greatly slows the build process.
-# $(OBJDUMP) -x -m i386 -d $(basename $@).elf > $(basename $@).rdmp
-
 define make-exe
-	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $(basename $@).elf \
+	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $(basename $@).nxe \
 	    $(LINK_OBJS) $(LINK_LIBS)
-	$(OBJCOPY) -O binary $(basename $@).elf $(basename $@).exe
-	$(NM) -g -n $(basename $@).elf > $(basename $@).num
-	$(SIZE) $(basename $@).elf
+	$(OBJCOPY) -O binary $(basename $@).nxe $(basename $@).exe
+	$(NM) -g -n $(basename $@).nxe > $(basename $@).num
+	$(SIZE) $(basename $@).nxe
 endef

 # Miscellaneous additions go here