From 15043ea98a8f0d8be106703c79514044f4d8e36c Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 18 Sep 2008 17:33:55 +0000 Subject: 2008-09-18 Joel Sherrill * compilers/gcc-no_bsp.cfg, compilers/gcc-target-default.cfg, custom/bare.cfg, custom/c3xsim.cfg, custom/c4xsim.cfg, custom/default.cfg, custom/haleakala.cfg, custom/mbx8xx.cfg, custom/mvme2307.cfg, custom/mvme3100.cfg, custom/mvme5500.cfg, custom/posix.cfg, custom/ss555.cfg, custom/virtex.cfg: Eliminate START_BASE and START_FILE. --- make/ChangeLog | 9 +++++++++ make/compilers/gcc-no_bsp.cfg | 6 +----- make/compilers/gcc-target-default.cfg | 12 ------------ make/custom/bare.cfg | 3 --- make/custom/c3xsim.cfg | 3 --- make/custom/c4xsim.cfg | 3 --- make/custom/default.cfg | 3 --- make/custom/haleakala.cfg | 3 --- make/custom/mbx8xx.cfg | 3 --- make/custom/mvme2307.cfg | 3 --- make/custom/mvme3100.cfg | 3 --- make/custom/mvme5500.cfg | 3 --- make/custom/posix.cfg | 2 -- make/custom/ss555.cfg | 4 ---- make/custom/virtex.cfg | 3 --- 15 files changed, 10 insertions(+), 53 deletions(-) (limited to 'make') diff --git a/make/ChangeLog b/make/ChangeLog index 9b65875746..631d88bb86 100644 --- a/make/ChangeLog +++ b/make/ChangeLog @@ -1,3 +1,12 @@ +2008-09-18 Joel Sherrill + + * compilers/gcc-no_bsp.cfg, compilers/gcc-target-default.cfg, + custom/bare.cfg, custom/c3xsim.cfg, custom/c4xsim.cfg, + custom/default.cfg, custom/haleakala.cfg, custom/mbx8xx.cfg, + custom/mvme2307.cfg, custom/mvme3100.cfg, custom/mvme5500.cfg, + custom/posix.cfg, custom/ss555.cfg, custom/virtex.cfg: Eliminate + START_BASE and START_FILE. + 2008-09-18 Joel Sherrill PR 1314/bsps diff --git a/make/compilers/gcc-no_bsp.cfg b/make/compilers/gcc-no_bsp.cfg index 9c54a2723c..92b3b84c61 100644 --- a/make/compilers/gcc-no_bsp.cfg +++ b/make/compilers/gcc-no_bsp.cfg @@ -204,15 +204,11 @@ MANAGERS_REQUIRED= MANAGERS_NOT_WANTED=$(filter-out $(MANAGERS), $(MANAGER_LIST)) MANAGERS_NOT_WANTED:=$(filter-out $(MANAGERS_REQUIRED), $(MANAGERS_NOT_WANTED)) -# Start file must be one of -# Note: Normally RTEMS provides a start file... -START_FILE= - CONSTRUCTOR= LIBGCC = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name $(GCCSED)) -LINK_FILES= $(START_FILE) \ +LINK_FILES= \ $(CONSTRUCTOR) \ $(OBJS) \ $(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel) \ diff --git a/make/compilers/gcc-target-default.cfg b/make/compilers/gcc-target-default.cfg index 3fd7bf3828..d278bbee39 100644 --- a/make/compilers/gcc-target-default.cfg +++ b/make/compilers/gcc-target-default.cfg @@ -158,17 +158,6 @@ depend: depend-am # spell out all the LINK_FILE's, rather than using -lbsp, so # that $(LINK_FILES) can be a dependency -# Start file must be one of -# $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o -# $(PROJECT_RELEASE)/lib/asmiface$(LIB_VARIANT).o -# It defaults to start.o, but an app can override it. - -ifeq ($(START_BASE),) - START_FILE= -else - START_FILE=$(PROJECT_RELEASE)/lib/$(START_BASE)$(LIB_VARIANT).o -endif - # # NOTE: a rule to link an rtems' application should look similar to this # (cf. "make-exe" in make/custom/*.cfg): @@ -184,7 +173,6 @@ LINK_OBJS =\ $(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel) LINK_FILES =\ - $(START_FILE) \ $(CONSTRUCTOR) \ $(OBJS) \ $(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel) \ diff --git a/make/custom/bare.cfg b/make/custom/bare.cfg index 1c3c641018..8f44437b3c 100644 --- a/make/custom/bare.cfg +++ b/make/custom/bare.cfg @@ -20,9 +20,6 @@ include $(RTEMS_ROOT)/make/custom/default.cfg # optimize flag: typically -O2 CFLAGS_OPTIMIZE_V = -O2 -g -fomit-frame-pointer -# this target has no start file -START_BASE= - # The following are definitions of make-exe which will work using ld as # is currently required. diff --git a/make/custom/c3xsim.cfg b/make/custom/c3xsim.cfg index 6a8fd86e20..872cfe24c3 100644 --- a/make/custom/c3xsim.cfg +++ b/make/custom/c3xsim.cfg @@ -19,6 +19,3 @@ RTEMS_BSP_FAMILY=c4xsim # -O2 is broken for the moment on the C4x gcc #CFLAGS_OPTIMIZE_V = -O2 CFLAGS_OPTIMIZE_V = -O1 -g - -# this target has no start file -START_BASE= diff --git a/make/custom/c4xsim.cfg b/make/custom/c4xsim.cfg index 907be7b1ae..68749de8d1 100644 --- a/make/custom/c4xsim.cfg +++ b/make/custom/c4xsim.cfg @@ -19,6 +19,3 @@ RTEMS_BSP_FAMILY=c4xsim # -O2 is broken for the moment on the C4x gcc #CFLAGS_OPTIMIZE_V = -O2 CFLAGS_OPTIMIZE_V = -O1 -g - -# this target has no start file -START_BASE= diff --git a/make/custom/default.cfg b/make/custom/default.cfg index 9aad5f8c6d..89327f38ce 100644 --- a/make/custom/default.cfg +++ b/make/custom/default.cfg @@ -16,6 +16,3 @@ include $(exec_prefix)/$(RTEMS_BSP)/make/bsp.cfg ## Target compiler config file, if any CONFIG.CC = $(RTEMS_ROOT)/make/compilers/gcc-target-default.cfg - -# Base name of start file -START_BASE=start diff --git a/make/custom/haleakala.cfg b/make/custom/haleakala.cfg index a26df72565..af567d3cac 100644 --- a/make/custom/haleakala.cfg +++ b/make/custom/haleakala.cfg @@ -21,9 +21,6 @@ CPU_CFLAGS = -mcpu=405 -Dppc405 # NOTE: some level of -O may be actually required by inline assembler CFLAGS_OPTIMIZE_V = -O1 -g -# No start file -START_BASE= - define bsp-post-link $(default-bsp-post-link) $(OBJCOPY) -O srec $(basename $@).exe $(basename $@)$(DOWNEXT) diff --git a/make/custom/mbx8xx.cfg b/make/custom/mbx8xx.cfg index dc67fa4c28..00f55050d8 100644 --- a/make/custom/mbx8xx.cfg +++ b/make/custom/mbx8xx.cfg @@ -48,9 +48,6 @@ CPU_CFLAGS = -mcpu=$(8XX_CPU_TYPE) -Dmpc$(8XX_CPU_TYPE) -D$(RTEMS_MBX_MODEL) # optimize flag: typically -O2 CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions -# Override default start file -START_BASE= - LDFLAGS += $(MBX8xx_LDFLAGS) define bsp-post-link diff --git a/make/custom/mvme2307.cfg b/make/custom/mvme2307.cfg index 636c76749f..cf180b3287 100644 --- a/make/custom/mvme2307.cfg +++ b/make/custom/mvme2307.cfg @@ -30,6 +30,3 @@ define bsp-post-link -Map $(basename $@).map && chmod 755 $@ rm -f rtems.gz endef - -# No start file -START_BASE= diff --git a/make/custom/mvme3100.cfg b/make/custom/mvme3100.cfg index a8abf42c0c..6ba211e9df 100644 --- a/make/custom/mvme3100.cfg +++ b/make/custom/mvme3100.cfg @@ -22,6 +22,3 @@ define bsp-post-link $(default-bsp-post-link) $(OBJCOPY) -O binary $(basename $@).exe $(basename $@)$(DOWNEXT) endef - -# Miscellaneous additions go here -START_BASE = motld_start diff --git a/make/custom/mvme5500.cfg b/make/custom/mvme5500.cfg index 0c415753f9..6305559661 100644 --- a/make/custom/mvme5500.cfg +++ b/make/custom/mvme5500.cfg @@ -26,6 +26,3 @@ define bsp-post-link $(default-bsp-post-link) $(OBJCOPY) -O binary $(basename $@).exe $(basename $@)$(DOWNEXT) endef - -# No start file -START_BASE=mvme5500start diff --git a/make/custom/posix.cfg b/make/custom/posix.cfg index cf1cebd09f..805427f8ed 100644 --- a/make/custom/posix.cfg +++ b/make/custom/posix.cfg @@ -14,8 +14,6 @@ include $(RTEMS_ROOT)/make/custom/$(RTEMS_HOST)-posix.cfg # Not applicable - let's override 'em LINKCMDS= -START_FILE= -START_BASE= # Here is the rule to actually build a $(ARCH)/foo.exe # It also builds $(ARCH)/foo.sr and $(ARCH)/foo.nm diff --git a/make/custom/ss555.cfg b/make/custom/ss555.cfg index 2ab5f44e8e..1bedae4a7c 100644 --- a/make/custom/ss555.cfg +++ b/make/custom/ss555.cfg @@ -32,7 +32,3 @@ define bsp-post-link cp $(basename $@).exe $(basename $@)$(DOWNEXT) $(STRIP) $(basename $@)$(DOWNEXT) endef - -# Override default start file -START_BASE= - diff --git a/make/custom/virtex.cfg b/make/custom/virtex.cfg index 9580a0dff6..3f8cf8c032 100644 --- a/make/custom/virtex.cfg +++ b/make/custom/virtex.cfg @@ -22,9 +22,6 @@ CPU_CFLAGS = -mcpu=403 -Dppc405 -Dvirtex # NOTE: some level of -O may be actually required by inline assembler CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions -# No start file -START_BASE= - define bsp-post-link $(default-bsp-post-link) $(OBJCOPY) -O srec $(basename $@).exe $(basename $@)$(DOWNEXT) -- cgit v1.2.3