From d6c8352925bc2286b24f01b8cfababa16782b1f5 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 16 Nov 1999 15:48:11 +0000 Subject: Patch rtems-rc-19991105-1.diff.gz from Ralf Corsepius which does the following: This is the configuration cleanup patch: Main changes: * TARGET_ARCH removed * target.cfg.in moved to c/make/target.cfg.in (Only configured once for all BSPs of a target) * BARE_XXX variables appended to bsp.cfg.in * autogen renamed to bootstrap * removed stray variables from make/custom/*.cfg To apply: cd rm c/src/make/target.cfg.in cp autogen bootstrap mkdir c/make cp make/target.cfg.in c/make/target.cfg.in rm make/target.cfg.in rm autogen patch -p1 < rtems-rc-19991105-1.diff --- make/custom/FreeBSD-posix.cfg | 7 ------- make/custom/HPUX9-posix.cfg | 1 - make/custom/Linux-posix.cfg | 7 ------- make/custom/Solaris-posix.cfg | 7 ------- make/custom/bare.cfg | 2 -- make/custom/default.cfg | 7 +------ make/custom/gen68360.cfg | 2 -- make/custom/mvme162.cfg | 2 -- make/custom/ods68302.cfg | 9 +-------- 9 files changed, 2 insertions(+), 42 deletions(-) (limited to 'make/custom') diff --git a/make/custom/FreeBSD-posix.cfg b/make/custom/FreeBSD-posix.cfg index c0f79df4f5..99c111bf49 100644 --- a/make/custom/FreeBSD-posix.cfg +++ b/make/custom/FreeBSD-posix.cfg @@ -10,7 +10,6 @@ RTEMS_UNIX_FLAVOR=freebsd # This is the actual bsp directory used during the build process. RTEMS_BSP_FAMILY=posix -TARGET_ARCH=o-freebsd2 include $(RTEMS_ROOT)/make/custom/default.cfg @@ -24,12 +23,6 @@ LIBC_DEFINES += -DWORKSPACE_MB=2 LIBC_DEFINES += -DHEAPSPACE_MB=1 -# Define this to yes if C++ is included in the development environment -# This requires that at least the GNU C++ compiler and libg++ be installed. -ifeq ($(HAS_CPLUSPLUS),yes) -CPLUS_LD_LIBS += $(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA) -endif - # optimize flag: typically -0, could use -O4 or -fast # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V = -O2 diff --git a/make/custom/HPUX9-posix.cfg b/make/custom/HPUX9-posix.cfg index 554d673c90..700f5f48f6 100644 --- a/make/custom/HPUX9-posix.cfg +++ b/make/custom/HPUX9-posix.cfg @@ -12,7 +12,6 @@ RTEMS_UNIX_FLAVOR=hpux # This is the actual bsp directory used during the build process. RTEMS_BSP_FAMILY=posix -TARGET_ARCH=o-hpux9 include $(RTEMS_ROOT)/make/custom/default.cfg diff --git a/make/custom/Linux-posix.cfg b/make/custom/Linux-posix.cfg index 22597b84b9..4b84c2b3cb 100644 --- a/make/custom/Linux-posix.cfg +++ b/make/custom/Linux-posix.cfg @@ -11,7 +11,6 @@ RTEMS_UNIX_FLAVOR=linux # This is the actual bsp directory used during the build process. RTEMS_BSP_FAMILY=posix -TARGET_ARCH=o-linux1 include $(RTEMS_ROOT)/make/custom/default.cfg @@ -26,12 +25,6 @@ LIBC_DEFINES += -DHEAPSPACE_MB=1 DEFINES += -D_BSD_SOURCE -# Define this to yes if C++ is included in the development environment -# This requires that at least the GNU C++ compiler and libg++ be installed. -ifeq ($(HAS_CPLUSPLUS),yes) -CPLUS_LD_LIBS += $(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA) -endif - # optimize flag: typically -0, could use -O4 or -fast # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V = -O2 diff --git a/make/custom/Solaris-posix.cfg b/make/custom/Solaris-posix.cfg index 0547a9fd3f..3f3f1f29d2 100644 --- a/make/custom/Solaris-posix.cfg +++ b/make/custom/Solaris-posix.cfg @@ -11,7 +11,6 @@ RTEMS_UNIX_FLAVOR=solaris # This is the actual bsp directory used during the build process. RTEMS_BSP_FAMILY=posix -TARGET_ARCH=o-solaris2 include $(RTEMS_ROOT)/make/custom/default.cfg @@ -23,12 +22,6 @@ LIBC_DEFINES +=-DRTEMS_UNIXLIB -DRTEMS_UNIX -DMALLOC_PROVIDED -DRTEMS_DEBUG DEFINES += -D__EXTENSIONS__ -Dsolaris2 -# Define this to yes if C++ is included in the development environment -# This requires that at least the GNU C++ compiler and libg++ be installed. -ifeq ($(HAS_CPLUSPLUS),yes) -CPLUS_LD_LIBS=$(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA) -endif - # optimize flag: typically -0, could use -O4 or -fast # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V = -O2 diff --git a/make/custom/bare.cfg b/make/custom/bare.cfg index 8ad849e4be..a1b5381e68 100644 --- a/make/custom/bare.cfg +++ b/make/custom/bare.cfg @@ -11,8 +11,6 @@ RTEMS_BSP=bare RTEMS_CPU_MODEL=$(BARE_CPU_MODEL) -TARGET_ARCH=o-$(RTEMS_BSP_FAMILY)-$(BARE_CPU_MODEL) - CPU_CFLAGS=$(BARE_CPU_CFLAGS) include $(RTEMS_ROOT)/make/custom/default.cfg diff --git a/make/custom/default.cfg b/make/custom/default.cfg index 8084579c69..4e3452c8e0 100644 --- a/make/custom/default.cfg +++ b/make/custom/default.cfg @@ -11,11 +11,6 @@ include $(RTEMS_ROOT)/make/target.cfg include $(RTEMS_ROOT)/make/host.cfg -# Specify here the host and target "architectures" -ifndef TARGET_ARCH -TARGET_ARCH=o-$(RTEMS_BSP) -endif - include $(RTEMS_ROOT)/make/main.cfg include $(RTEMS_ROOT)/$(RTEMS_BSP)/make/bsp.cfg @@ -30,7 +25,7 @@ INLINE_UPCASE=INLINE endif ## Target compiler config file, if any -CONFIG.$(TARGET_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc-target-default.cfg +CONFIG.CC = $(RTEMS_ROOT)/make/compilers/gcc-target-default.cfg ## GCC specs extension file location RTEMS_BSP_SPECS = $(PROJECT_ROOT)/$(RTEMS_BSP)/lib/bsp_specs diff --git a/make/custom/gen68360.cfg b/make/custom/gen68360.cfg index e3efedcc93..f73c052888 100644 --- a/make/custom/gen68360.cfg +++ b/make/custom/gen68360.cfg @@ -7,10 +7,8 @@ RTEMS_CPU=m68k ifeq ($(RTEMS_GEN68360_COMPANION_MODE),yes) -TARGET_ARCH=o-gen68360_040 RTEMS_CPU_MODEL=m68040 else -TARGET_ARCH=o-gen68360 RTEMS_CPU_MODEL=mcpu32 endif diff --git a/make/custom/mvme162.cfg b/make/custom/mvme162.cfg index e770662b2e..66787178f6 100644 --- a/make/custom/mvme162.cfg +++ b/make/custom/mvme162.cfg @@ -10,14 +10,12 @@ RTEMS_CPU=m68k ifeq ($(RTEMS_MVME162_MODEL),mvme162lx) -TARGET_ARCH=o-mvme162lx RTEMS_CPU_MODEL=m68lc040 else ifeq ($(RTEMS_MVME162_MODEL),) RTEMS_MVME162_MODEL=mvme162 -TARGET_ARCH=o-mvme162 RTEMS_CPU_MODEL=m68040 endif # mvme162 - mc68040 diff --git a/make/custom/ods68302.cfg b/make/custom/ods68302.cfg index 325fc9170e..6a11e170a2 100644 --- a/make/custom/ods68302.cfg +++ b/make/custom/ods68302.cfg @@ -31,14 +31,7 @@ CPU_DEFINES = \ CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer # debugging please -CFLAGS_DEBUG_V+=-g - -# Define this to yes if C++ is included in the development environment. -# This requires that at least the GNU C++ compiler and libg++ be installed. -ifeq ($(RTEMS_HAS_CPLUSPLUS),yes) -HAS_CPLUSPLUS=yes -CPLUS_LD_LIBS=$(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA) -endif +CFLAGS_DEBUG_V = START_BASE=start302 -- cgit v1.2.3