From efdda56546011b906f8332d25def5a929b14d0b7 Mon Sep 17 00:00:00 2001 From: Nick Withers Date: Fri, 9 Aug 2013 14:18:17 +1000 Subject: Use $(EXEEXT) [defaults to "exe"] to generate binaries --- c/src/lib/libbsp/arm/gba/make/custom/gba.cfg | 2 +- c/src/lib/libbsp/arm/gp32/make/custom/gp32.cfg | 2 +- c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s69xx.inc | 2 +- c/src/lib/libbsp/arm/nds/make/custom/nds.cfg | 2 +- .../lib/libbsp/arm/raspberrypi/make/custom/raspberrypi.cfg | 4 ++-- c/src/lib/libbsp/i386/pc386/make/custom/pc386.cfg | 2 +- c/src/lib/libbsp/lm32/lm32_evr/make/custom/lm32_evr.cfg | 2 +- c/src/lib/libbsp/lm32/milkymist/make/custom/milkymist.cfg | 2 +- c/src/lib/libbsp/m68k/av5282/make/custom/av5282.cfg | 2 +- c/src/lib/libbsp/m68k/genmcf548x/make/custom/genmcf548x.inc | 2 +- c/src/lib/libbsp/m68k/idp/make/custom/idp.cfg | 2 +- c/src/lib/libbsp/m68k/mcf52235/make/custom/mcf52235.cfg | 4 ++-- c/src/lib/libbsp/m68k/mcf5225x/make/custom/mcf5225x.cfg | 4 ++-- c/src/lib/libbsp/m68k/mcf5235/make/custom/mcf5235.cfg | 4 ++-- c/src/lib/libbsp/m68k/mcf5329/make/custom/mcf5329.cfg | 4 ++-- c/src/lib/libbsp/m68k/mrm332/make/custom/mrm332.cfg | 6 +++--- c/src/lib/libbsp/m68k/mvme136/make/custom/mvme136.cfg | 2 +- c/src/lib/libbsp/m68k/mvme147/make/custom/mvme147.cfg | 2 +- c/src/lib/libbsp/m68k/mvme147s/make/custom/mvme147s.cfg | 2 +- c/src/lib/libbsp/m68k/mvme162/make/custom/mvme162.cfg | 2 +- c/src/lib/libbsp/m68k/mvme162/make/custom/mvme162lx.cfg | 2 +- c/src/lib/libbsp/m68k/mvme167/make/custom/mvme167.cfg | 2 +- c/src/lib/libbsp/m68k/sim68000/make/custom/sim68000.cfg | 2 +- c/src/lib/libbsp/m68k/sim68000/make/custom/simcpu32.cfg | 2 +- c/src/lib/libbsp/m68k/uC5282/make/custom/uC5282.cfg | 2 +- c/src/lib/libbsp/nios2/nios2_iss/make/custom/nios2_iss.cfg | 2 +- .../lib/libbsp/powerpc/haleakala/make/custom/haleakala.cfg | 2 +- c/src/lib/libbsp/powerpc/mbx8xx/make/custom/mbx8xx.inc | 2 +- .../libbsp/powerpc/motorola_powerpc/make/custom/mcp750.cfg | 4 ++-- .../libbsp/powerpc/motorola_powerpc/make/custom/mtx603e.cfg | 4 ++-- .../powerpc/motorola_powerpc/make/custom/mvme2100.cfg | 4 ++-- .../powerpc/motorola_powerpc/make/custom/mvme2307.cfg | 4 ++-- .../motorola_powerpc/make/custom/qemuprep-altivec.cfg | 6 +++--- .../powerpc/motorola_powerpc/make/custom/qemuprep.cfg | 6 +++--- c/src/lib/libbsp/powerpc/mvme3100/make/custom/mvme3100.cfg | 2 +- c/src/lib/libbsp/powerpc/mvme5500/make/custom/mvme5500.cfg | 2 +- c/src/lib/libbsp/powerpc/qemuppc/make/custom/qemuppc.cfg | 2 +- .../lib/libbsp/powerpc/score603e/make/custom/score603e.cfg | 2 +- c/src/lib/libbsp/powerpc/ss555/make/custom/ss555.cfg | 2 +- c/src/lib/libbsp/powerpc/tqm8xx/make/custom/tqm8xx.inc | 2 +- c/src/lib/libbsp/powerpc/virtex/make/custom/virtex.cfg | 2 +- c/src/lib/libbsp/powerpc/virtex4/make/custom/virtex4.cfg | 2 +- c/src/lib/libbsp/powerpc/virtex5/make/custom/virtex5.cfg | 2 +- c/src/make/leaf.cfg | 7 ++----- make/leaf.cfg | 13 +++++-------- 45 files changed, 65 insertions(+), 71 deletions(-) diff --git a/c/src/lib/libbsp/arm/gba/make/custom/gba.cfg b/c/src/lib/libbsp/arm/gba/make/custom/gba.cfg index ee9be6a15b..1ae2fb8d5a 100644 --- a/c/src/lib/libbsp/arm/gba/make/custom/gba.cfg +++ b/c/src/lib/libbsp/arm/gba/make/custom/gba.cfg @@ -20,6 +20,6 @@ CFLAGS_OPTIMIZE_V = -O2 -g define bsp-post-link $(OBJCOPY) -O binary --remove-section=.comment \ --remove-section=.note --strip-unneeded \ - $(basename $@).exe $(basename $@)$(DOWNEXT) + $(basename $@)$(EXEEXT) $(basename $@)$(DOWNEXT) $(default-bsp-post-link) endef diff --git a/c/src/lib/libbsp/arm/gp32/make/custom/gp32.cfg b/c/src/lib/libbsp/arm/gp32/make/custom/gp32.cfg index f287310385..a558362a1f 100644 --- a/c/src/lib/libbsp/arm/gp32/make/custom/gp32.cfg +++ b/c/src/lib/libbsp/arm/gp32/make/custom/gp32.cfg @@ -16,6 +16,6 @@ CPU_CFLAGS = -mstructure-size-boundary=32 -mcpu=arm920t -mfpu=vfp -mfloat-abi=so CFLAGS_OPTIMIZE_V = -O2 -g define bsp-post-link - $(OBJCOPY) -O binary $(basename $@).exe $(basename $@)$(DOWNEXT) + $(OBJCOPY) -O binary $(basename $@)$(EXEEXT) $(basename $@)$(DOWNEXT) $(default-bsp-post-link) endef diff --git a/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s69xx.inc b/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s69xx.inc index 4387c19c78..362d9f4de5 100644 --- a/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s69xx.inc +++ b/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s69xx.inc @@ -12,5 +12,5 @@ CFLAGS_OPTIMIZE_V = -O2 -g define bsp-post-link $(default-bsp-post-link) - $(OBJCOPY) -O binary $(basename $@).exe $(basename $@).ralf + $(OBJCOPY) -O binary $(basename $@)$(EXEEXT) $(basename $@)$(DOWNEXT) endef diff --git a/c/src/lib/libbsp/arm/nds/make/custom/nds.cfg b/c/src/lib/libbsp/arm/nds/make/custom/nds.cfg index 9e4844d3ec..78172e68fd 100644 --- a/c/src/lib/libbsp/arm/nds/make/custom/nds.cfg +++ b/c/src/lib/libbsp/arm/nds/make/custom/nds.cfg @@ -28,7 +28,7 @@ endif define bsp-post-link $(default-bsp-post-link) - $(OBJCOPY) -O binary $(basename $@).exe $(basename $@).bin + $(OBJCOPY) -O binary $(basename $@)$(EXEEXT) $(basename $@).bin $(NDSTOOL) -c $(basename $@).nds -9 $(basename $@).bin \ -7 $(COPROC_ELF_PATH)/coproc.bin rm -f $(basename $@).bin diff --git a/c/src/lib/libbsp/arm/raspberrypi/make/custom/raspberrypi.cfg b/c/src/lib/libbsp/arm/raspberrypi/make/custom/raspberrypi.cfg index 9751658a6e..6b47ea228e 100644 --- a/c/src/lib/libbsp/arm/raspberrypi/make/custom/raspberrypi.cfg +++ b/c/src/lib/libbsp/arm/raspberrypi/make/custom/raspberrypi.cfg @@ -16,7 +16,7 @@ CFLAGS_OPTIMIZE_V = -O2 -g # is currently required. define bsp-post-link $(OBJCOPY) -O binary --strip-all \ - $(basename $@).exe $(basename $@)$(DOWNEXT) - $(SIZE) $(basename $@).exe + $(basename $@)$(EXEEXT) $(basename $@)$(DOWNEXT) + $(SIZE) $(basename $@)$(EXEEXT) endef diff --git a/c/src/lib/libbsp/i386/pc386/make/custom/pc386.cfg b/c/src/lib/libbsp/i386/pc386/make/custom/pc386.cfg index e827d8706c..9f7428dd3a 100644 --- a/c/src/lib/libbsp/i386/pc386/make/custom/pc386.cfg +++ b/c/src/lib/libbsp/i386/pc386/make/custom/pc386.cfg @@ -46,7 +46,7 @@ define bsp-post-link $(OBJCOPY) -O elf32-i386 \ --remove-section=.comment \ --remove-section=.note \ - --strip-unneeded $(basename $@).exe $(basename $@).nxe + --strip-unneeded $(basename $@)$(EXEEXT) $(basename $@).nxe $(OBJCOPY) -O binary $(basename $@).nxe $(basename $@).bin $(PROJECT_TOOLS)/bin2boot -v $(basename $@)$(DOWNEXT) $(HEADERADDR)\ $(START16FILE) $(START16ADDR) 0 $(basename $@).bin $(RELOCADDR) 0 diff --git a/c/src/lib/libbsp/lm32/lm32_evr/make/custom/lm32_evr.cfg b/c/src/lib/libbsp/lm32/lm32_evr/make/custom/lm32_evr.cfg index d70ff8050b..c1951d0e68 100644 --- a/c/src/lib/libbsp/lm32/lm32_evr/make/custom/lm32_evr.cfg +++ b/c/src/lib/libbsp/lm32/lm32_evr/make/custom/lm32_evr.cfg @@ -21,7 +21,7 @@ CPU_CFLAGS = CFLAGS_OPTIMIZE_V = -O0 -g define bsp-post-link - $(OBJCOPY) -O binary --strip-all $(basename $@).exe \ + $(OBJCOPY) -O binary --strip-all $(basename $@)$(EXEEXT) \ -R entry -R exceptions $(basename $@)$(DOWNEXT) $(default-bsp-post-link) endef diff --git a/c/src/lib/libbsp/lm32/milkymist/make/custom/milkymist.cfg b/c/src/lib/libbsp/lm32/milkymist/make/custom/milkymist.cfg index 5a44658389..ae691eb2a3 100644 --- a/c/src/lib/libbsp/lm32/milkymist/make/custom/milkymist.cfg +++ b/c/src/lib/libbsp/lm32/milkymist/make/custom/milkymist.cfg @@ -21,7 +21,7 @@ CPU_CFLAGS = -mbarrel-shift-enabled -mmultiply-enabled \ CFLAGS_OPTIMIZE_V = -O2 -g define bsp-post-link - $(OBJCOPY) -O binary --strip-all $(basename $@).exe \ + $(OBJCOPY) -O binary --strip-all $(basename $@)$(EXEEXT) \ -R entry -R exceptions $(basename $@)$(DOWNEXT) $(default-bsp-post-link) endef diff --git a/c/src/lib/libbsp/m68k/av5282/make/custom/av5282.cfg b/c/src/lib/libbsp/m68k/av5282/make/custom/av5282.cfg index 0bbeaf184c..a668d99e6f 100644 --- a/c/src/lib/libbsp/m68k/av5282/make/custom/av5282.cfg +++ b/c/src/lib/libbsp/m68k/av5282/make/custom/av5282.cfg @@ -22,5 +22,5 @@ endif define bsp-post-link $(default-bsp-post-link) $(OBJCOPY) -O binary --strip-all \ - $(basename $@).exe $(basename $@)$(DOWNEXT) + $(basename $@)$(EXEEXT) $(basename $@)$(DOWNEXT) endef diff --git a/c/src/lib/libbsp/m68k/genmcf548x/make/custom/genmcf548x.inc b/c/src/lib/libbsp/m68k/genmcf548x/make/custom/genmcf548x.inc index 843524c010..a910bd3536 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/make/custom/genmcf548x.inc +++ b/c/src/lib/libbsp/m68k/genmcf548x/make/custom/genmcf548x.inc @@ -15,7 +15,7 @@ CPU_CFLAGS = -mcfv4e -Wa,-memac CFLAGS_OPTIMIZE_V = -O2 -g -fomit-frame-pointer define bsp-post-link - $(OBJCOPY) -O binary --strip-all $(basename $@).exe \ + $(OBJCOPY) -O binary --strip-all $(basename $@)$(EXEEXT) \ $(basename $@)$(DOWNEXT) $(default-bsp-post-link) endef diff --git a/c/src/lib/libbsp/m68k/idp/make/custom/idp.cfg b/c/src/lib/libbsp/m68k/idp/make/custom/idp.cfg index 937ce30f68..d10029a291 100644 --- a/c/src/lib/libbsp/m68k/idp/make/custom/idp.cfg +++ b/c/src/lib/libbsp/m68k/idp/make/custom/idp.cfg @@ -16,7 +16,7 @@ CPU_CFLAGS = -msoft-float CFLAGS_OPTIMIZE_V = -O2 -g -fomit-frame-pointer define bsp-post-link - $(OBJCOPY) -O srec $(basename $@).exe $(basename $@).srec + $(OBJCOPY) -O srec $(basename $@)$(EXEEXT) $(basename $@).srec sed -e 's/.$$//' -e '/^S0/d' $(basename $@).srec | \ $(PACKHEX) > $(basename $@)$(DOWNEXT) rm -f $(basename $@).srec diff --git a/c/src/lib/libbsp/m68k/mcf52235/make/custom/mcf52235.cfg b/c/src/lib/libbsp/m68k/mcf52235/make/custom/mcf52235.cfg index 4dcb89004b..9b22a2196f 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/make/custom/mcf52235.cfg +++ b/c/src/lib/libbsp/m68k/mcf52235/make/custom/mcf52235.cfg @@ -18,6 +18,6 @@ CFLAGS_OPTIMIZE_V = -O2 -g -fomit-frame-pointer # is currently required. define bsp-post-link $(OBJCOPY) -O binary --strip-all \ - $(basename $@).exe $(basename $@)$(DOWNEXT) - $(SIZE) $(basename $@).exe + $(basename $@)$(EXEEXT) $(basename $@)$(DOWNEXT) + $(SIZE) $(basename $@)$(EXEEXT) endef diff --git a/c/src/lib/libbsp/m68k/mcf5225x/make/custom/mcf5225x.cfg b/c/src/lib/libbsp/m68k/mcf5225x/make/custom/mcf5225x.cfg index 6a415a787c..90e76e2709 100644 --- a/c/src/lib/libbsp/m68k/mcf5225x/make/custom/mcf5225x.cfg +++ b/c/src/lib/libbsp/m68k/mcf5225x/make/custom/mcf5225x.cfg @@ -22,6 +22,6 @@ CFLAGS_OPTIMIZE_V = -O2 -fomit-frame-pointer # is currently required. define bsp-post-link $(OBJCOPY) -O binary --strip-all \ - $(basename $@).exe $(basename $@)$(DOWNEXT) - $(SIZE) $(basename $@).exe + $(basename $@)$(EXEEXT) $(basename $@)$(DOWNEXT) + $(SIZE) $(basename $@)$(EXEEXT) endef diff --git a/c/src/lib/libbsp/m68k/mcf5235/make/custom/mcf5235.cfg b/c/src/lib/libbsp/m68k/mcf5235/make/custom/mcf5235.cfg index 8a543ac75b..b5c3c49ccb 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/make/custom/mcf5235.cfg +++ b/c/src/lib/libbsp/m68k/mcf5235/make/custom/mcf5235.cfg @@ -22,6 +22,6 @@ endif # is currently required. define bsp-post-link $(OBJCOPY) -O binary --strip-all \ - $(basename $@).exe $(basename $@)$(DOWNEXT) - $(SIZE) $(basename $@).exe + $(basename $@)$(EXEEXT) $(basename $@)$(DOWNEXT) + $(SIZE) $(basename $@)$(EXEEXT) endef diff --git a/c/src/lib/libbsp/m68k/mcf5329/make/custom/mcf5329.cfg b/c/src/lib/libbsp/m68k/mcf5329/make/custom/mcf5329.cfg index e68fd280f3..e1f5734061 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/make/custom/mcf5329.cfg +++ b/c/src/lib/libbsp/m68k/mcf5329/make/custom/mcf5329.cfg @@ -20,6 +20,6 @@ CFLAGS_OPTIMIZE_V = -O2 -g -fomit-frame-pointer # is currently required. define bsp-post-link $(OBJCOPY) -O binary --strip-all \ - $(basename $@).exe $(basename $@)$(DOWNEXT) - $(SIZE) $(basename $@).exe + $(basename $@)$(EXEEXT) $(basename $@)$(DOWNEXT) + $(SIZE) $(basename $@)$(EXEEXT) endef diff --git a/c/src/lib/libbsp/m68k/mrm332/make/custom/mrm332.cfg b/c/src/lib/libbsp/m68k/mrm332/make/custom/mrm332.cfg index a1be91bbbe..bf55e4fe02 100644 --- a/c/src/lib/libbsp/m68k/mrm332/make/custom/mrm332.cfg +++ b/c/src/lib/libbsp/m68k/mrm332/make/custom/mrm332.cfg @@ -31,8 +31,8 @@ define bsp-post-link return s } ;\ /\.text/ { base = $$4 ; size = $$3 };\ END { printf("0x%x", h2d(base) + h2d(size)) }'\ - ` $(basename $@).pxe $(basename $@).exe - $(OBJCOPY) -O srec $(basename $@).exe $(basename $@).srec + ` $(basename $@).pxe $(basename $@)$(EXEEXT) + $(OBJCOPY) -O srec $(basename $@)$(EXEEXT) $(basename $@).srec sed -e 's/.$$//' -e '/^S0/d' $(basename $@).srec | \ $(PACKHEX) > $(basename $@)$(DOWNEXT) $(NM) -g -n $(basename $@).pxe > $(basename $@).pnum @@ -41,7 +41,7 @@ define bsp-post-link endef else define bsp-post-link - $(OBJCOPY) -O srec $(basename $@).exe $(basename $@).srec + $(OBJCOPY) -O srec $(basename $@)$(EXEEXT) $(basename $@).srec sed -e 's/.$$//' -e '/^S0/d' $(basename $@).srec | \ $(PACKHEX) > $(basename $@)$(DOWNEXT) rm -f $(basename $@).srec diff --git a/c/src/lib/libbsp/m68k/mvme136/make/custom/mvme136.cfg b/c/src/lib/libbsp/m68k/mvme136/make/custom/mvme136.cfg index 74cdd64c3e..2f63f040c3 100644 --- a/c/src/lib/libbsp/m68k/mvme136/make/custom/mvme136.cfg +++ b/c/src/lib/libbsp/m68k/mvme136/make/custom/mvme136.cfg @@ -17,7 +17,7 @@ CPU_CFLAGS = -mcpu=68020 CFLAGS_OPTIMIZE_V = -Os -g -fomit-frame-pointer -DNDEBUG define bsp-post-link - $(OBJCOPY) -O srec $(basename $@).exe $(basename $@).srec + $(OBJCOPY) -O srec $(basename $@)$(EXEEXT) $(basename $@).srec sed -e 's/.$$//' -e '/^S0/d' $(basename $@).srec | \ $(PACKHEX) > $(basename $@)$(DOWNEXT) rm -f $(basename $@).srec diff --git a/c/src/lib/libbsp/m68k/mvme147/make/custom/mvme147.cfg b/c/src/lib/libbsp/m68k/mvme147/make/custom/mvme147.cfg index 0ba9719815..988058748e 100644 --- a/c/src/lib/libbsp/m68k/mvme147/make/custom/mvme147.cfg +++ b/c/src/lib/libbsp/m68k/mvme147/make/custom/mvme147.cfg @@ -15,7 +15,7 @@ CPU_CFLAGS = -mcpu=68030 CFLAGS_OPTIMIZE_V = -O2 -g -fomit-frame-pointer define bsp-post-link - $(OBJCOPY) -O srec $(basename $@).exe $(basename $@).srec + $(OBJCOPY) -O srec $(basename $@)$(EXEEXT) $(basename $@).srec sed -e 's/.$$//' -e '/^S0/d' $(basename $@).srec | \ $(PACKHEX) > $(basename $@)$(DOWNEXT) rm -f $(basename $@).srec diff --git a/c/src/lib/libbsp/m68k/mvme147s/make/custom/mvme147s.cfg b/c/src/lib/libbsp/m68k/mvme147s/make/custom/mvme147s.cfg index e14de8d8eb..3eaade80d2 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/make/custom/mvme147s.cfg +++ b/c/src/lib/libbsp/m68k/mvme147s/make/custom/mvme147s.cfg @@ -15,7 +15,7 @@ CPU_CFLAGS = -mcpu=68030 CFLAGS_OPTIMIZE_V = -O2 -g -fomit-frame-pointer define bsp-post-link - $(OBJCOPY) -O srec $(basename $@).exe $(basename $@).srec + $(OBJCOPY) -O srec $(basename $@)$(EXEEXT) $(basename $@).srec sed -e 's/.$$//' -e '/^S0/d' $(basename $@).srec | \ $(PACKHEX) > $(basename $@)$(DOWNEXT) rm -f $(basename $@).srec diff --git a/c/src/lib/libbsp/m68k/mvme162/make/custom/mvme162.cfg b/c/src/lib/libbsp/m68k/mvme162/make/custom/mvme162.cfg index d8a217f00d..4b343b2fe5 100644 --- a/c/src/lib/libbsp/m68k/mvme162/make/custom/mvme162.cfg +++ b/c/src/lib/libbsp/m68k/mvme162/make/custom/mvme162.cfg @@ -20,7 +20,7 @@ CFLAGS_OPTIMIZE_V = -O2 -g -fomit-frame-pointer define bsp-post-link $(default-bsp-post-link) - $(OBJCOPY) -O binary $(basename $@).exe $(basename $@)$(DOWNEXT) + $(OBJCOPY) -O binary $(basename $@)$(EXEEXT) $(basename $@)$(DOWNEXT) endef # BSP-specific tools diff --git a/c/src/lib/libbsp/m68k/mvme162/make/custom/mvme162lx.cfg b/c/src/lib/libbsp/m68k/mvme162/make/custom/mvme162lx.cfg index 81c398ec2e..2a210a9b92 100644 --- a/c/src/lib/libbsp/m68k/mvme162/make/custom/mvme162lx.cfg +++ b/c/src/lib/libbsp/m68k/mvme162/make/custom/mvme162lx.cfg @@ -25,7 +25,7 @@ CFLAGS_OPTIMIZE_V = -O2 -g -fomit-frame-pointer define bsp-post-link $(default-bsp-post-link) - $(OBJCOPY) -O binary $(basename $@).exe $(basename $@)$(DOWNEXT) + $(OBJCOPY) -O binary $(basename $@)$(EXEEXT) $(basename $@)$(DOWNEXT) endef # BSP-specific tools diff --git a/c/src/lib/libbsp/m68k/mvme167/make/custom/mvme167.cfg b/c/src/lib/libbsp/m68k/mvme167/make/custom/mvme167.cfg index a56de0f244..21bd9af8db 100644 --- a/c/src/lib/libbsp/m68k/mvme167/make/custom/mvme167.cfg +++ b/c/src/lib/libbsp/m68k/mvme167/make/custom/mvme167.cfg @@ -36,5 +36,5 @@ CFLAGS_OPTIMIZE_V = -O2 -g -fno-omit-frame-pointer # for more details. define bsp-post-link $(default-bsp-post-link) - $(OBJCOPY) -O binary -R .comment -S $(basename $@).exe $(basename $@)$(DOWNEXT) + $(OBJCOPY) -O binary -R .comment -S $(basename $@)$(EXEEXT) $(basename $@)$(DOWNEXT) endef diff --git a/c/src/lib/libbsp/m68k/sim68000/make/custom/sim68000.cfg b/c/src/lib/libbsp/m68k/sim68000/make/custom/sim68000.cfg index bb3354a4a8..fb355cbdda 100644 --- a/c/src/lib/libbsp/m68k/sim68000/make/custom/sim68000.cfg +++ b/c/src/lib/libbsp/m68k/sim68000/make/custom/sim68000.cfg @@ -16,5 +16,5 @@ CFLAGS_OPTIMIZE_V = -O2 -g -fomit-frame-pointer define bsp-post-link $(default-bsp-post-link) - $(OBJCOPY) -O srec $(basename $@).exe $(basename $@)$(DOWNEXT) + $(OBJCOPY) -O srec $(basename $@)$(EXEEXT) $(basename $@)$(DOWNEXT) endef diff --git a/c/src/lib/libbsp/m68k/sim68000/make/custom/simcpu32.cfg b/c/src/lib/libbsp/m68k/sim68000/make/custom/simcpu32.cfg index 939a1e1f04..817e162231 100644 --- a/c/src/lib/libbsp/m68k/sim68000/make/custom/simcpu32.cfg +++ b/c/src/lib/libbsp/m68k/sim68000/make/custom/simcpu32.cfg @@ -16,5 +16,5 @@ CFLAGS_OPTIMIZE_V = -O2 -g -fomit-frame-pointer define bsp-post-link $(default-bsp-post-link) - $(OBJCOPY) -O srec $(basename $@).exe $(basename $@)$(DOWNEXT) + $(OBJCOPY) -O srec $(basename $@)$(EXEEXT) $(basename $@)$(DOWNEXT) endef diff --git a/c/src/lib/libbsp/m68k/uC5282/make/custom/uC5282.cfg b/c/src/lib/libbsp/m68k/uC5282/make/custom/uC5282.cfg index caf93a8bf9..3c62a17c20 100644 --- a/c/src/lib/libbsp/m68k/uC5282/make/custom/uC5282.cfg +++ b/c/src/lib/libbsp/m68k/uC5282/make/custom/uC5282.cfg @@ -16,5 +16,5 @@ CFLAGS_OPTIMIZE_V = -O2 -g define bsp-post-link $(default-bsp-post-link) - $(OBJCOPY) -O binary $(basename $@).exe $(basename $@)$(DOWNEXT) + $(OBJCOPY) -O binary $(basename $@)$(EXEEXT) $(basename $@)$(DOWNEXT) endef diff --git a/c/src/lib/libbsp/nios2/nios2_iss/make/custom/nios2_iss.cfg b/c/src/lib/libbsp/nios2/nios2_iss/make/custom/nios2_iss.cfg index e8fb39d22f..8254eecc39 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/make/custom/nios2_iss.cfg +++ b/c/src/lib/libbsp/nios2/nios2_iss/make/custom/nios2_iss.cfg @@ -21,7 +21,7 @@ CPU_CFLAGS = -mno-hw-mul -mno-hw-div CFLAGS_OPTIMIZE_V = -O0 -g define bsp-post-link - $(OBJCOPY) -O binary --strip-all $(basename $@).exe \ + $(OBJCOPY) -O binary --strip-all $(basename $@)$(EXEEXT) \ -R entry -R exceptions $(basename $@)$(DOWNEXT) $(default-bsp-post-link) endef diff --git a/c/src/lib/libbsp/powerpc/haleakala/make/custom/haleakala.cfg b/c/src/lib/libbsp/powerpc/haleakala/make/custom/haleakala.cfg index 41cd98e842..67ffe58ed1 100644 --- a/c/src/lib/libbsp/powerpc/haleakala/make/custom/haleakala.cfg +++ b/c/src/lib/libbsp/powerpc/haleakala/make/custom/haleakala.cfg @@ -20,5 +20,5 @@ CFLAGS_OPTIMIZE_V = -O1 -g define bsp-post-link $(default-bsp-post-link) - $(OBJCOPY) -O srec $(basename $@).exe $(basename $@)$(DOWNEXT) + $(OBJCOPY) -O srec $(basename $@)$(EXEEXT) $(basename $@)$(DOWNEXT) endef diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/make/custom/mbx8xx.inc b/c/src/lib/libbsp/powerpc/mbx8xx/make/custom/mbx8xx.inc index c1a22352e6..922d95dc95 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/make/custom/mbx8xx.inc +++ b/c/src/lib/libbsp/powerpc/mbx8xx/make/custom/mbx8xx.inc @@ -49,7 +49,7 @@ CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions LDFLAGS += $(MBX8xx_LDFLAGS) define bsp-post-link - cp $(basename $@).exe $(basename $@)$(DOWNEXT) + cp $(basename $@)$(EXEEXT) $(basename $@)$(DOWNEXT) $(STRIP) $(basename $@)$(DOWNEXT) $(default-bsp-post-link) endef diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/mcp750.cfg b/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/mcp750.cfg index fc775d1e24..8ff97b3a1a 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/mcp750.cfg +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/mcp750.cfg @@ -17,11 +17,11 @@ CFLAGS_OPTIMIZE_V = -O2 -g -mmultiple -mstring -mstrict-align define bsp-post-link $(default-bsp-post-link) - $(OBJCOPY) -O binary -R .comment -S $(basename $@).exe rtems + $(OBJCOPY) -O binary -R .comment -S $(basename $@)$(EXEEXT) rtems gzip -vf9 rtems $(LD) -o $(basename $@)$(DOWNEXT) \ $ $(PROJECT_RELEASE)/lib/bootloader.o \ - --just-symbols=$(basename $@).exe \ + --just-symbols=$(basename $@)$(EXEEXT) \ -b binary rtems.gz -T $(PROJECT_RELEASE)/lib/ppcboot.lds \ -Map $(basename $@).map && chmod 755 $@ rm -f rtems.gz diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/mtx603e.cfg b/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/mtx603e.cfg index 2411501fbb..6c7f59787c 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/mtx603e.cfg +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/mtx603e.cfg @@ -16,11 +16,11 @@ CFLAGS_OPTIMIZE_V = -O2 -g -mmultiple -mstring -mstrict-align define bsp-post-link $(default-bsp-post-link) - $(OBJCOPY) -O binary -R .comment -S $(basename $@).exe rtems + $(OBJCOPY) -O binary -R .comment -S $(basename $@)$(EXEEXT) rtems gzip -vf9 rtems $(LD) -o $(basename $@)$(DOWNEXT) \ $(PROJECT_RELEASE)/lib/bootloader.o \ - --just-symbols=$(basename $@).exe \ + --just-symbols=$(basename $@)$(EXEEXT) \ -b binary rtems.gz -T $(PROJECT_RELEASE)/lib/ppcboot.lds \ -Map $(basename $@).map && chmod 755 $@ rm -f rtems.gz diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/mvme2100.cfg b/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/mvme2100.cfg index 93e14ab0f8..d724b5dd1e 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/mvme2100.cfg +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/mvme2100.cfg @@ -16,11 +16,11 @@ CFLAGS_OPTIMIZE_V = -O2 -g -mmultiple -mstring -mstrict-align define bsp-post-link $(default-bsp-post-link) - $(OBJCOPY) -O binary -R .comment -S $(basename $@).exe rtems + $(OBJCOPY) -O binary -R .comment -S $(basename $@)$(EXEEXT) rtems gzip -vf9 rtems $(LD) -o $(basename $@)$(DOWNEXT) \ $(PROJECT_RELEASE)/lib/bootloader.o \ - --just-symbols=$(basename $@).exe \ + --just-symbols=$(basename $@)$(EXEEXT) \ -b binary rtems.gz -T $(PROJECT_RELEASE)/lib/ppcboot.lds \ -Map $(basename $@).map && chmod 755 $@ rm -f rtems.gz diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/mvme2307.cfg b/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/mvme2307.cfg index d7dac3a11f..ee00561d01 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/mvme2307.cfg +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/mvme2307.cfg @@ -17,10 +17,10 @@ CFLAGS_OPTIMIZE_V = -O2 -g define bsp-post-link $(default-bsp-post-link) - $(OBJCOPY) -O binary -R .comment -S $(basename $@).exe rtems + $(OBJCOPY) -O binary -R .comment -S $(basename $@)$(EXEEXT) rtems gzip -vf9 rtems $(LD) -o $(basename $@)$(DOWNEXT) $(PROJECT_RELEASE)/lib/bootloader.o \ - --just-symbols=$(basename $@).exe \ + --just-symbols=$(basename $@)$(EXEEXT) \ -b binary rtems.gz -T $(PROJECT_RELEASE)/lib/ppcboot.lds \ -Map $(basename $@).map && chmod 755 $@ rm -f rtems.gz diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/qemuprep-altivec.cfg b/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/qemuprep-altivec.cfg index cef17e5acf..1dd1744a4d 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/qemuprep-altivec.cfg +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/qemuprep-altivec.cfg @@ -18,15 +18,15 @@ CFLAGS_OPTIMIZE_V = -O2 -g ifdef PURE_BINARY define bsp-post-link $(default-bsp-post-link) - $(OBJCOPY) -O binary -R .comment -S $(basename $@).exe $(basename $@)$(DOWNEXT) + $(OBJCOPY) -O binary -R .comment -S $(basename $@)$(EXEEXT) $(basename $@)$(DOWNEXT) endef else define bsp-post-link $(default-bsp-post-link) - $(OBJCOPY) -O binary -R .comment -S $(basename $@).exe rtems + $(OBJCOPY) -O binary -R .comment -S $(basename $@)$(EXEEXT) rtems gzip -vf9 rtems $(LD) -o $(basename $@)$(DOWNEXT) $(PROJECT_RELEASE)/lib/bootloader.o \ - --just-symbols=$(basename $@).exe \ + --just-symbols=$(basename $@)$(EXEEXT) \ -b binary rtems.gz -T $(PROJECT_RELEASE)/lib/ppcboot.lds \ -Map $(basename $@).map && chmod 755 $@ rm -f rtems.gz diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/qemuprep.cfg b/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/qemuprep.cfg index 392276797c..e5f11fc468 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/qemuprep.cfg +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/make/custom/qemuprep.cfg @@ -18,15 +18,15 @@ CFLAGS_OPTIMIZE_V = -O2 -g ifdef PURE_BINARY define bsp-post-link $(default-bsp-post-link) - $(OBJCOPY) -O binary -R .comment -S $(basename $@).exe $(basename $@)$(DOWNEXT) + $(OBJCOPY) -O binary -R .comment -S $(basename $@)$(EXEEXT) $(basename $@)$(DOWNEXT) endef else define bsp-post-link $(default-bsp-post-link) - $(OBJCOPY) -O binary -R .comment -S $(basename $@).exe rtems + $(OBJCOPY) -O binary -R .comment -S $(basename $@)$(EXEEXT) rtems gzip -vf9 rtems $(LD) -o $(basename $@)$(DOWNEXT) $(PROJECT_RELEASE)/lib/bootloader.o \ - --just-symbols=$(basename $@).exe \ + --just-symbols=$(basename $@)$(EXEEXT) \ -b binary rtems.gz -T $(PROJECT_RELEASE)/lib/ppcboot.lds \ -Map $(basename $@).map && chmod 755 $@ rm -f rtems.gz diff --git a/c/src/lib/libbsp/powerpc/mvme3100/make/custom/mvme3100.cfg b/c/src/lib/libbsp/powerpc/mvme3100/make/custom/mvme3100.cfg index 3ea5c2b325..ddd6d23f16 100644 --- a/c/src/lib/libbsp/powerpc/mvme3100/make/custom/mvme3100.cfg +++ b/c/src/lib/libbsp/powerpc/mvme3100/make/custom/mvme3100.cfg @@ -17,5 +17,5 @@ CFLAGS_OPTIMIZE_V = -O2 -g define bsp-post-link $(default-bsp-post-link) - $(OBJCOPY) -O binary $(basename $@).exe $(basename $@)$(DOWNEXT) + $(OBJCOPY) -O binary $(basename $@)$(EXEEXT) $(basename $@)$(DOWNEXT) endef diff --git a/c/src/lib/libbsp/powerpc/mvme5500/make/custom/mvme5500.cfg b/c/src/lib/libbsp/powerpc/mvme5500/make/custom/mvme5500.cfg index b4727bce80..4c59a07f61 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/make/custom/mvme5500.cfg +++ b/c/src/lib/libbsp/powerpc/mvme5500/make/custom/mvme5500.cfg @@ -19,7 +19,7 @@ CFLAGS_OPTIMIZE_V = -O2 -g define bsp-post-link $(default-bsp-post-link) - $(OBJCOPY) -O binary $(basename $@).exe $(basename $@)$(DOWNEXT) + $(OBJCOPY) -O binary $(basename $@)$(EXEEXT) $(basename $@)$(DOWNEXT) endef # diff --git a/c/src/lib/libbsp/powerpc/qemuppc/make/custom/qemuppc.cfg b/c/src/lib/libbsp/powerpc/qemuppc/make/custom/qemuppc.cfg index 177f88fe86..b768855588 100644 --- a/c/src/lib/libbsp/powerpc/qemuppc/make/custom/qemuppc.cfg +++ b/c/src/lib/libbsp/powerpc/qemuppc/make/custom/qemuppc.cfg @@ -16,5 +16,5 @@ CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions define bsp-post-link $(default-bsp-post-link) - $(OBJCOPY) -O binary $(basename $@).exe $(basename $@)$(DOWNEXT) + $(OBJCOPY) -O binary $(basename $@)$(EXEEXT) $(basename $@)$(DOWNEXT) endef diff --git a/c/src/lib/libbsp/powerpc/score603e/make/custom/score603e.cfg b/c/src/lib/libbsp/powerpc/score603e/make/custom/score603e.cfg index 7b03438673..a657bb347f 100644 --- a/c/src/lib/libbsp/powerpc/score603e/make/custom/score603e.cfg +++ b/c/src/lib/libbsp/powerpc/score603e/make/custom/score603e.cfg @@ -22,7 +22,7 @@ CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions define bsp-post-link $(default-bsp-post-link) - $(OBJCOPY) -O srec $(basename $@).exe $(basename $@).s1 + $(OBJCOPY) -O srec $(basename $@)$(EXEEXT) $(basename $@).s1 sed -e 's/.$$//' $(basename $@).s1 | \ $(PACKHEX) >$(basename $@)$(DOWNEXT) rm -f $(basename $@).s1 diff --git a/c/src/lib/libbsp/powerpc/ss555/make/custom/ss555.cfg b/c/src/lib/libbsp/powerpc/ss555/make/custom/ss555.cfg index 22ae7fba0b..cde7f4a08e 100644 --- a/c/src/lib/libbsp/powerpc/ss555/make/custom/ss555.cfg +++ b/c/src/lib/libbsp/powerpc/ss555/make/custom/ss555.cfg @@ -23,6 +23,6 @@ CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions define bsp-post-link $(default-bsp-post-link) - cp $(basename $@).exe $(basename $@)$(DOWNEXT) + cp $(basename $@)$(EXEEXT) $(basename $@)$(DOWNEXT) $(STRIP) $(basename $@)$(DOWNEXT) endef diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/make/custom/tqm8xx.inc b/c/src/lib/libbsp/powerpc/tqm8xx/make/custom/tqm8xx.inc index 119bc2859e..da32441831 100644 --- a/c/src/lib/libbsp/powerpc/tqm8xx/make/custom/tqm8xx.inc +++ b/c/src/lib/libbsp/powerpc/tqm8xx/make/custom/tqm8xx.inc @@ -15,7 +15,7 @@ CPU_CFLAGS = -mcpu=860 -Dmpc860 \ CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions define bsp-post-link - cp $(basename $@).exe $(basename $@)$(DOWNEXT) + cp $(basename $@)$(EXEEXT) $(basename $@)$(DOWNEXT) $(STRIP) $(basename $@)$(DOWNEXT) $(default-bsp-post-link) endef diff --git a/c/src/lib/libbsp/powerpc/virtex/make/custom/virtex.cfg b/c/src/lib/libbsp/powerpc/virtex/make/custom/virtex.cfg index a91530cfd3..96aa7cc558 100644 --- a/c/src/lib/libbsp/powerpc/virtex/make/custom/virtex.cfg +++ b/c/src/lib/libbsp/powerpc/virtex/make/custom/virtex.cfg @@ -19,5 +19,5 @@ CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions define bsp-post-link $(default-bsp-post-link) - $(OBJCOPY) -O srec $(basename $@).exe $(basename $@)$(DOWNEXT) + $(OBJCOPY) -O srec $(basename $@)$(EXEEXT) $(basename $@)$(DOWNEXT) endef diff --git a/c/src/lib/libbsp/powerpc/virtex4/make/custom/virtex4.cfg b/c/src/lib/libbsp/powerpc/virtex4/make/custom/virtex4.cfg index 333b144b43..713c297c3a 100644 --- a/c/src/lib/libbsp/powerpc/virtex4/make/custom/virtex4.cfg +++ b/c/src/lib/libbsp/powerpc/virtex4/make/custom/virtex4.cfg @@ -14,6 +14,6 @@ CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions # Miscellaneous additions go here define bsp-post-link $(default-bsp-post-link) - $(OBJCOPY) -O srec $(basename $@).exe $(basename $@)$(DOWNEXT) + $(OBJCOPY) -O srec $(basename $@)$(EXEEXT) $(basename $@)$(DOWNEXT) endef diff --git a/c/src/lib/libbsp/powerpc/virtex5/make/custom/virtex5.cfg b/c/src/lib/libbsp/powerpc/virtex5/make/custom/virtex5.cfg index b4a7bd3836..9601fbc01d 100644 --- a/c/src/lib/libbsp/powerpc/virtex5/make/custom/virtex5.cfg +++ b/c/src/lib/libbsp/powerpc/virtex5/make/custom/virtex5.cfg @@ -14,6 +14,6 @@ CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions # Miscellaneous additions go here define bsp-post-link $(default-bsp-post-link) - $(OBJCOPY) -O srec $(basename $@).exe $(basename $@)$(DOWNEXT) + $(OBJCOPY) -O srec $(basename $@)$(EXEEXT) $(basename $@)$(DOWNEXT) endef diff --git a/c/src/make/leaf.cfg b/c/src/make/leaf.cfg index dd0defe576..8d3f52ecde 100644 --- a/c/src/make/leaf.cfg +++ b/c/src/make/leaf.cfg @@ -8,11 +8,8 @@ ifndef LINKCMDS LINKCMDS=$(PROJECT_RELEASE)/lib/linkcmds endif -## what to do about $(EXEEXT) --> $(EXEEXT) -## -o $(basename $@)$(EXEEXT) OR -## -o $(basename $@)$(EXEEXT) OR - -DOWNEXT=.ralf +EXEEXT?=.exe +DOWNEXT?=.ralf define bsp-link-c $(LINK.c) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \ diff --git a/make/leaf.cfg b/make/leaf.cfg index 90cda37fad..6ebf4bdc41 100644 --- a/make/leaf.cfg +++ b/make/leaf.cfg @@ -78,20 +78,17 @@ clean: clean-am .PHONY: clean clean-am endif -## what to do about $(EXEEXT) --> $(EXEEXT) -## -o $(basename $@)$(EXEEXT) OR -## -o $(basename $@)$(EXEEXT) OR - -DOWNEXT=.ralf +EXEEXT?=.exe +DOWNEXT?=.ralf define bsp-link-c $(LINK.c) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \ - -o $(basename $@).exe $(LINK_OBJS) $(LINK_LIBS) + -o $(basename $@)$(EXEEXT) $(LINK_OBJS) $(LINK_LIBS) endef define bsp-link-cxx $(LINK.cc) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \ - -o $(basename $@).exe $(LINK_OBJS) $(LINK_LIBS) + -o $(basename $@)$(EXEEXT) $(LINK_OBJS) $(LINK_LIBS) endef define default-bsp-post-link @@ -102,7 +99,7 @@ endef ifndef bsp-post-link define bsp-post-link $(default-bsp-post-link) - cp $(basename $@).exe $(basename $@)$(DOWNEXT) + cp $(basename $@)$(EXEEXT) $(basename $@)$(DOWNEXT) endef endif -- cgit v1.2.3