4 files changed, 21 insertions, 45 deletions
diff --git a/make/custom/HPUX9-posix.cfg b/make/custom/HPUX9-posix.cfg
index 6ea3be15ec..d29080c7d6 100644
--- a/make/custom/HPUX9-posix.cfg
+++ b/make/custom/HPUX9-posix.cfg
@@ -90,27 +90,6 @@ else
 endif
 
 # Miscellaneous additions go here
-# Setting formerly contained in gcc-hpux9.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
-# Usage ref: src/tests/sptest/sp1/Makefile
-#
-# 'NODE' is set to 1 or 2 for multi cpu tests (ref: mptests/mp01/node1/Makefile)
-# If NODE is set as an environment variable, don't trust it, zero it out.
-# (NODE turns out to be a very common environment variable)
-ifeq (,$(NODE))
-NODE=0
-else
-ifeq "$(origin NODE)" "environment"
-NODE=0
-endif
-endif
 
 # Workaround for missing ranlib support in RTEMS
 MKLIB=$(AR) s $(@) ; echo library is complete:
diff --git a/make/custom/Linux-posix.cfg b/make/custom/Linux-posix.cfg
index 2ae236da5f..ea0877d87a 100644
--- a/make/custom/Linux-posix.cfg
+++ b/make/custom/Linux-posix.cfg
@@ -40,7 +40,6 @@ ifeq ($(RTEMS_HAS_CPLUSPLUS),yes)
 HAS_CPLUSPLUS=yes
 # No need to set it, gcc knows about them
 # LIBCC_INCLUDE=/usr/include/g++
-CPLUS_LD_LIBS=-lstdc++
 CPLUS_LD_LIBS += $(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA)
 else
 HAS_CPLUSPLUS=no
@@ -101,27 +100,5 @@ endif
 # *****************************************************************
 # Miscellaneous additions go here
 
-# Setting formerly contained in gcc-linux1.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
-# Usage ref: src/tests/sptest/sp1/Makefile
-#
-# 'NODE' is set to 1 or 2 for multi cpu tests (ref: mptests/mp01/node1/Makefile)
-# If NODE is set as an environment variable, don't trust it, zero it out.
-# (NODE turns out to be a very common environment variable)
-ifeq (,$(NODE))
-NODE=0
-else
-ifeq "$(origin NODE)" "environment"
-NODE=0
-endif
-endif
-
 # Workaround for missing ranlib support in RTEMS
 MKLIB=$(AR) s $(@) ; echo library is complete:
diff --git a/make/custom/Solaris-posix.cfg b/make/custom/Solaris-posix.cfg
index d6899969bd..1389a83a2e 100644
--- a/make/custom/Solaris-posix.cfg
+++ b/make/custom/Solaris-posix.cfg
@@ -34,7 +34,6 @@ ifeq ($(RTEMS_HAS_CPLUSPLUS),yes)
 HAS_CPLUSPLUS=yes
 # no standard C++ libs provided by default
 LIBCC_INCLUDE=$(GNUTOOLS)/include/g++
-CPLUS_LD_LIBS=-lstdc++
 CPLUS_LD_LIBS=$(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA)
 else
 HAS_CPLUSPLUS=no
diff --git a/make/custom/posix.cfg b/make/custom/posix.cfg
index 05f6a56cdd..b0ca92d9c2 100644
--- a/make/custom/posix.cfg
+++ b/make/custom/posix.cfg
@@ -9,4 +9,25 @@ include $(PROJECT_ROOT)/make/host.cfg
 
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_HOST)-posix.cfg
 
+# Setting formerly contained in gcc-<TARGET_ARCH>.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
+# Usage ref: src/tests/sptest/sp1/Makefile
+#
+# 'NODE' is set to 1 or 2 for multi cpu tests (ref: mptests/mp01/node1/Makefile)
+# If NODE is set as an environment variable, don't trust it, zero it out.
+# (NODE turns out to be a very common environment variable)
+ifeq (,$(NODE))
+NODE=0
+else
+ifeq "$(origin NODE)" "environment"
+NODE=0
+endif
+endif