diff options
| -rw-r--r-- | c/src/make/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/make/compilers/gcc-target-default.cfg | 12 | ||||
| -rw-r--r-- | c/src/make/custom/default.cfg.in | 2 | ||||
| -rw-r--r-- | c/src/make/leaf.cfg | 10 |
4 files changed, 5 insertions, 24 deletions
diff --git a/c/src/make/ChangeLog b/c/src/make/ChangeLog index 1b88cd8f0f..fd81e043b6 100644 --- a/c/src/make/ChangeLog +++ b/c/src/make/ChangeLog @@ -1,3 +1,8 @@ +2008-09-18 Joel Sherrill <joel.sherrill@OARcorp.com> + + * leaf.cfg, compilers/gcc-target-default.cfg, custom/default.cfg.in: + Eliminate START_BASE and START_FILE. + 2008-09-15 Joel Sherrill <joel.sherrill@oarcorp.com> * leaf.cfg: LINK.c and LINK.cc include LDFLAGS so do not include it in diff --git a/c/src/make/compilers/gcc-target-default.cfg b/c/src/make/compilers/gcc-target-default.cfg index e4e8172bb5..224c8bfbbd 100644 --- a/c/src/make/compilers/gcc-target-default.cfg +++ b/c/src/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/c/src/make/custom/default.cfg.in b/c/src/make/custom/default.cfg.in index 1316a3e149..9b3e1dc970 100644 --- a/c/src/make/custom/default.cfg.in +++ b/c/src/make/custom/default.cfg.in @@ -2,5 +2,3 @@ # $Id$ # -# Base name of start file -START_BASE=start diff --git a/c/src/make/leaf.cfg b/c/src/make/leaf.cfg index 1e5f0cbbd5..105c9e8b5a 100644 --- a/c/src/make/leaf.cfg +++ b/c/src/make/leaf.cfg @@ -44,16 +44,6 @@ MANAGERS_REQUIRED= MANAGERS_NOT_WANTED=$(filter-out $(MANAGERS) \ $(MANAGERS_REQUIRED), $(MANAGER_LIST)) -# 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 - # Allow user to override link commands (to build a prom image, perhaps) ifndef LINKCMDS LINKCMDS=$(PROJECT_RELEASE)/lib/linkcmds |