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/Makefile.am | 3 +-- make/compilers/gcc-target-default.cfg | 23 +++++++++-------------- 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 +-------- make/leaf.cfg | 18 +++++++++--------- make/main.cfg | 10 +++++----- 13 files changed, 26 insertions(+), 72 deletions(-) (limited to 'make') diff --git a/make/Makefile.am b/make/Makefile.am index 7ff122f692..b463e14b0e 100644 --- a/make/Makefile.am +++ b/make/Makefile.am @@ -14,8 +14,7 @@ README \ directory.cfg \ host.cfg.in \ leaf.cfg \ -lib.cfg \ -target.cfg.in +lib.cfg SUBDIRS = \ Templates \ diff --git a/make/compilers/gcc-target-default.cfg b/make/compilers/gcc-target-default.cfg index 529bc4b742..f91c2a6e31 100644 --- a/make/compilers/gcc-target-default.cfg +++ b/make/compilers/gcc-target-default.cfg @@ -82,7 +82,7 @@ endif # 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) +ifeq ($(HAS_CPLUSPLUS),yes) CPLUS_LD_LIBS += $(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA) endif @@ -172,13 +172,15 @@ MKLIB=$(RANLIB) # # How to compile stuff into ${ARCH} subdirectory # +# OBSOLETE: we use make's default rules now +# # NOTE: we override COMPILE.[c|cc|S] # because gmake default rules use TARGET_ARCH for different purposes # - -COMPILE.c=$(CC) $(CPPFLAGS) $(CFLAGS) -c -COMPILE.cc=$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -COMPILE.S=$(CC) $(ASFLAGS) $(CPPFLAGS) -c +# +# COMPILE.c=$(CC) $(CPPFLAGS) $(CFLAGS) -c +# COMPILE.cc=$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c +# COMPILE.S=$(CC) $(ASFLAGS) $(CPPFLAGS) -c ${ARCH}/%.o: %.c ${COMPILE.c} -o $@ $< @@ -198,13 +200,6 @@ ${ARCH}/%.o: %.C ${ARCH}/%.o: %.S ${COMPILE.S} -DASM -o $@ $< -# OBSOLETE: the rule above should be equivalent. -# strip out C++ style comments. -# ${ARCH}/%.o: %.S -# sed -e 's/\/\/.*$$//' < $< | \ -# $(CPP) $(CPPFLAGS) -I. -I$(srcdir) -DASM - >$(ARCH)/$*.i -# $(AS) $(ASFLAGS) -o $@ $(ARCH)/$*.i - # Make foo.rel from foo.o ${ARCH}/%.rel: ${ARCH}/%.o ${LD} $(LDFLAGS_INCOMPLETE) -o $@ $^ @@ -216,10 +211,10 @@ ${ARCH}/%: %.sh $(CHMOD) +x $@ # Dependency files for use by gmake -# NOTE: we don't put in $(TARGET_ARCH) +# NOTE: we don't put them into $(ARCH) # so that 'make clean' doesn't blow it away -DEPEND=Depends-$(TARGET_ARCH:o-%=%) +DEPEND=Depends-${ARCH} CLEAN_DEPEND=$(DEPEND).tmp CLOBBER_DEPEND=$(DEPEND) 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 diff --git a/make/leaf.cfg b/make/leaf.cfg index 06407755ae..e96c68732b 100644 --- a/make/leaf.cfg +++ b/make/leaf.cfg @@ -37,7 +37,7 @@ MANAGERS := $(sort $(MANAGERS)) # Pull in the desired "target" compiler # Programs built on the host use automake generated rules. # This will not change $(ARCH) -- binaries will still be place as per target -include ${CONFIG.$(TARGET_ARCH).CC} +include ${CONFIG.CC} ifeq (${DEPEND},$(wildcard ${DEPEND})) include ${DEPEND} # pull in dependencies if they exist endif @@ -46,14 +46,14 @@ endif # Builtin targets for compilation variants # debug: - $(MAKE) -f $(MAKEFILE) MAKEFILE=$(MAKEFILE) "ARCH=${TARGET_ARCH}-debug" \ + $(MAKE) -f $(MAKEFILE) MAKEFILE=$(MAKEFILE) "ARCH=o-debug" \ "CFLAGS_DEBUG=$(CFLAGS_DEBUG_V)" \ "CFLAGS_OPTIMIZE=$(CFLAGS_DEBUG_OPTIMIZE_V)" \ "LDFLAGS_DEBUG=$(LDFLAGS_DEBUG_V)" $(TARGET_VA) profile: $(MAKE) -f $(MAKEFILE) \ - MAKEFILE=$(MAKEFILE) "ARCH=${TARGET_ARCH}-profile" \ + MAKEFILE=$(MAKEFILE) "ARCH=o-profile" \ "CFLAGS_PROFILE=$(CFLAGS_PROFILE_V)" \ "LDFLAGS_PROFILE=$(LDFLAGS_PROFILE_V)" $(TARGET_VA) @@ -63,9 +63,9 @@ profile: # build something "the same" way. # -VARIANT-$(TARGET_ARCH)-v = -VARIANT-$(TARGET_ARCH)-debug-v = debug -VARIANT-$(TARGET_ARCH)-profile-v = profile +VARIANT-o-optimize-v = +VARIANT-o-debug-v = debug +VARIANT-o-profile-v = profile VARIANT_VA = $(VARIANT-$(ARCH)-v) @@ -86,9 +86,9 @@ TARGET_VA = $(TARGET_$@_V) # Useful for installing libraries. # -LIBSUFFIX_$(TARGET_ARCH)_V= -LIBSUFFIX_$(TARGET_ARCH)-debug_V=_g -LIBSUFFIX_$(TARGET_ARCH)-profile_V=_p +LIBSUFFIX_o-optimize_V= +LIBSUFFIX_o-debug_V=_g +LIBSUFFIX_o-profile_V=_p LIB_VARIANT=$(LIBSUFFIX_$(ARCH)_V) LIBSUFFIX_VA = $(LIB_VARIANT).a diff --git a/make/main.cfg b/make/main.cfg index d40846b108..9808816a9d 100644 --- a/make/main.cfg +++ b/make/main.cfg @@ -17,11 +17,11 @@ PROJECT_INCLUDE=$(PROJECT_RELEASE)/lib/include PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools # -# Target architecture; may be changed as per 'make "ARCH=${TARGET_ARCH}-debug"' +# Target architecture; may be changed as per 'make "ARCH=debug"' # This is where the object files get put. # -ARCH=${TARGET_ARCH} +ARCH=o-optimize VARIANT= @@ -43,12 +43,12 @@ MAKEFILE=Makefile # # Target variant names # -TARGET_VARIANTS = debug profile +TARGET_VARIANTS = optimize debug profile # -# Generate list of object directories: sun4, sun4-debug, sun4-profile +# Generate list of object directories: o-optimize, o-debug, o-profile # -VARIANTS=${TARGET_ARCH} ${TARGET_VARIANTS:%=${TARGET_ARCH}-%} +VARIANTS=${TARGET_VARIANTS:%=o-%} # # List of "recursion-able" targets for directory Makefiles -- cgit v1.2.3