From 5fa9b7069d440878bb5e3c8cbb19cfaa619786e7 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Thu, 8 Dec 2011 21:40:23 +0000
Subject: 2011-12-08	Joel Sherrill <joel.sherrill@oarcorp.com>

	PR 1589/build
	* leaf.cfg, target.cfg.in, compilers/gcc-target-default.cfg: Remove
	obsolete optional manager capability.
---
 c/src/make/ChangeLog                        |  6 +++++
 c/src/make/compilers/gcc-target-default.cfg |  4 +--
 c/src/make/leaf.cfg                         | 38 -----------------------------
 c/src/make/target.cfg.in                    | 14 -----------
 4 files changed, 7 insertions(+), 55 deletions(-)

diff --git a/c/src/make/ChangeLog b/c/src/make/ChangeLog
index f3aec54763..7c5f557144 100644
--- a/c/src/make/ChangeLog
+++ b/c/src/make/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-08	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	PR 1589/build
+	* leaf.cfg, target.cfg.in, compilers/gcc-target-default.cfg: Remove
+	obsolete optional manager capability.
+
 2011-06-16	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Don't generate host.cfg.in.
diff --git a/c/src/make/compilers/gcc-target-default.cfg b/c/src/make/compilers/gcc-target-default.cfg
index db29f4ab9e..93a5457085 100644
--- a/c/src/make/compilers/gcc-target-default.cfg
+++ b/c/src/make/compilers/gcc-target-default.cfg
@@ -169,13 +169,11 @@ depend: depend-am
 
 LINK_OBJS =\
     $(CONSTRUCTOR) \
-    $(OBJS) \
-    $(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel)
+    $(OBJS)
 
 LINK_FILES =\
     $(CONSTRUCTOR) \
     $(OBJS) \
-    $(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel) \
     $(PROJECT_RELEASE)/lib/librtemsbsp$(LIBSUFFIX_VA) \
     $(PROJECT_RELEASE)/lib/librtemscpu$(LIBSUFFIX_VA)
 
diff --git a/c/src/make/leaf.cfg b/c/src/make/leaf.cfg
index 82f87a41d4..84bce09976 100644
--- a/c/src/make/leaf.cfg
+++ b/c/src/make/leaf.cfg
@@ -6,44 +6,6 @@
 #   Make(1) configuration file include'd by all leaf-node Makefiles
 #
 
-#
-# list of all known managers
-# This list is used, along with $(MANAGERS) (set by app makefile)
-#   to build the list of *not wanted* drivers.
-#
-# ref: target compiler config file for usage
-#
-
-MANAGER_LIST=barrier dpmem event io msg mp part 
-MANAGER_LIST+=region sem signal timer rtmon ext
-
-# Convert *real* spellings in $(MANAGERS) (set
-#   in application makefile) to their "correct" name.
-# (I hate abbreviations :-)
-
-MANAGERS := $(patsubst message,            msg,   $(MANAGERS))
-MANAGERS := $(patsubst multi_processor,    mp,    $(MANAGERS))
-MANAGERS := $(patsubst partition,          part,  $(MANAGERS))
-MANAGERS := $(patsubst rate_monotonic,     rtmon, $(MANAGERS))
-MANAGERS := $(patsubst semaphore,          sem,   $(MANAGERS))
-MANAGERS := $(patsubst dual_ported_memory, dpmem, $(MANAGERS))
-MANAGERS := $(patsubst extension,          ext,   $(MANAGERS))
-
-# allow 'all' to mean all managers
-MANAGERS := $(patsubst all, $(MANAGER_LIST), $(MANAGERS))
-
-# and finally rip out duplicates
-MANAGERS := $(sort $(MANAGERS))
-
-# List (possibly empty) of required managers
-MANAGERS_REQUIRED=
-
-# Create a RTEMS executable based on MANAGERS which was set in
-#  app's Makefile
-
-MANAGERS_NOT_WANTED=$(filter-out $(MANAGERS) \
-	$(MANAGERS_REQUIRED), $(MANAGER_LIST))
-
 # Allow user to override link commands (to build a prom image, perhaps)
 ifndef LINKCMDS
 LINKCMDS=$(PROJECT_RELEASE)/lib/linkcmds
diff --git a/c/src/make/target.cfg.in b/c/src/make/target.cfg.in
index f06a9b4609..550f3dff4a 100644
--- a/c/src/make/target.cfg.in
+++ b/c/src/make/target.cfg.in
@@ -45,17 +45,3 @@ XCFLAGS=$(CFLAGS_FOR_TARGET)
 export RTEMS_BSP
 export RTEMS_CUSTOM
 export PROJECT_ROOT
-
-# List (possibly empty) of required managers
-# We require:
-#    region  -- used by lib/libcsupport for malloc()
-#    ext     -- used by libc for libc reentrancy hooks
-
-MANAGERS_REQUIRED=
-
-# Create a RTEMS executable based on MANAGERS which was set in
-#  app's Makefile
-
-MANAGERS_NOT_WANTED=$(filter-out $(MANAGERS) \
-	$(MANAGERS_REQUIRED), $(MANAGER_LIST))
-
-- 
cgit v1.2.3