2003-06-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* bsp.mak: Remove support for profile-variant.
	* configure.ac: Ditto.
	* directory.cfg: Ditto.
	* compilers/gcc-target-default.cfg: Ditto.
	* make/README: Remove references to profile-variant.
This commit is contained in:
Ralf Corsepius
2003-06-06 02:59:13 +00:00
parent b52d7bc73d
commit 0707bd2060
5 changed files with 24 additions and 35 deletions

View File

@@ -1,3 +1,11 @@
2003-06-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* bsp.mak: Remove support for profile-variant.
* configure.ac: Ditto.
* directory.cfg: Ditto.
* compilers/gcc-target-default.cfg: Ditto.
* make/README: Remove references to profile-variant.
2003-04-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2003-04-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* bsp.mak: Use var="$val" instead of var=${var=$val}. to satisfy * bsp.mak: Use var="$val" instead of var=${var=$val}. to satisfy

View File

@@ -30,8 +30,8 @@
Makefiles) one developer can develop and test under SVR4, Makefiles) one developer can develop and test under SVR4,
another under 4.x, another under HPUX. another under 4.x, another under HPUX.
. Builtin support for compiling "variants" such as debug, . Builtin support for compiling "variants" such as debug
profile, and tcov versions. These variants can be built versions. These variants can be built
recursively. recursively.
. Control of system dependencies. "hidden" dependencies on . Control of system dependencies. "hidden" dependencies on
@@ -110,7 +110,6 @@
o-optimize/ -- optimized binaries o-optimize/ -- optimized binaries
o-debug/ -- debug binaries o-debug/ -- debug binaries
o-profile/ -- profiling binaries
Using the template Makefiles, this will all happen automatically. Using the template Makefiles, this will all happen automatically.
The contents of these directories are specific to a BSP. The contents of these directories are specific to a BSP.
@@ -123,13 +122,12 @@
Typing 'make' will place objects in o-optimize. Typing 'make' will place objects in o-optimize.
'make debug' will place objects in o-debug. 'make debug' will place objects in o-debug.
'make profile' will place objects in o-profile.
The debug and profile targets are equivalent to 'all' except that The debug targets are equivalent to 'all' except that
CFLAGS and/or LDFLAGS are modified as per the compiler config file for CFLAGS and/or LDFLAGS are modified as per the compiler config file for
debug and profile support. debug and profile support.
The targets debug, profile, etc., can be invoked recursively at The targets debug etc., can be invoked recursively at
the directory make level. So from the top of a tree, one could the directory make level. So from the top of a tree, one could
install a debug version of everything under that point by: install a debug version of everything under that point by:
@@ -141,7 +139,7 @@
appropriate version of the library will be linked in. appropriate version of the library will be linked in.
For example, the following fragments link the normal, debug, or For example, the following fragments link the normal, debug, or
profile version of "libmine.a" as appropriate: version of "libmine.a" as appropriate:
LD_LIBS += $(LIBMINE) LD_LIBS += $(LIBMINE)
LIBMINE = ../libmine/${ARCH}/libmine.a LIBMINE = ../libmine/${ARCH}/libmine.a
@@ -250,7 +248,7 @@
Names in here should be fully qualified, and NOT depend on $PATH. Names in here should be fully qualified, and NOT depend on $PATH.
Also specifies compiler flags to be used to generate optimized, Also specifies compiler flags to be used to generate optimized,
debugging and profile versions, as well as rules to compile debugging versions, as well as rules to compile
assembly language and make makefile dependencies. assembly language and make makefile dependencies.
@@ -314,11 +312,10 @@
VARIANTS -- full list of all possible values for $(ARCH); VARIANTS -- full list of all possible values for $(ARCH);
used mainly for 'make clean' used mainly for 'make clean'
[ eg: "o-optimize o-debug o-profile" ] [ eg: "o-optimize o-debug" ]
VARIANT_VA -- Variant name. VARIANT_VA -- Variant name.
Normally "", but for 'make debug' it is "debug", Normally "", but for 'make debug' it is "debug".
for 'make profile', "profile, etc.
see make/leaf.cfg for more info. see make/leaf.cfg for more info.
@@ -335,15 +332,11 @@
CFLAGS_DEBUG_V -- value of debug flag for compiler CFLAGS_DEBUG_V -- value of debug flag for compiler
[ eg: -g ] [ eg: -g ]
CFLAGS_PROFILE_V -- compiler profile flags
[ eg: -pg ]
CFLAGS_DEBUG_OPTIMIZE_V CFLAGS_DEBUG_OPTIMIZE_V
-- optimize flag if compiling for debug -- optimize flag if compiling for debug
[ eg: "" ] [ eg: "" ]
CFLAGS_DEBUG CFLAGS_DEBUG
CFLAGS_PROFILE
CFLAGS_OPTIMIZE -- current values for each depending CFLAGS_OPTIMIZE -- current values for each depending
on make variant. on make variant.

View File

@@ -13,4 +13,3 @@ make/${RTEMS_BSP}.cache:
@echo ac_cv_env_CPU_CFLAGS=\"$(CPU_CFLAGS)\" >> $@ @echo ac_cv_env_CPU_CFLAGS=\"$(CPU_CFLAGS)\" >> $@
@echo ac_cv_env_CFLAGS_OPTIMIZE_V=\"$(CFLAGS_OPTIMIZE_V)\" >> $@ @echo ac_cv_env_CFLAGS_OPTIMIZE_V=\"$(CFLAGS_OPTIMIZE_V)\" >> $@
@echo ac_cv_env_CFLAGS_DEBUG_V=\"$(CFLAGS_DEBUG_V)\" >> $@ @echo ac_cv_env_CFLAGS_DEBUG_V=\"$(CFLAGS_DEBUG_V)\" >> $@
@echo ac_cv_env_CFLAGS_PROFILE_V=\"$(CFLAGS_PROFILE_V)\" >> $@

View File

@@ -5,11 +5,11 @@
# #
## ##
# CFLAGS_OPTIMIZE_V, CFLAGS_DEBUG_V, CFLAGS_PROFILE_V are the values we # CFLAGS_OPTIMIZE_V, CFLAGS_DEBUG_V are the values we
# would want the corresponding macros to be set to. # would want the corresponding macros to be set to.
# #
# CFLAGS_OPTIMIZE, CFLAGS_DEBUG, CFLAGS_PROFILE are set in the leaf # CFLAGS_OPTIMIZE, CFLAGS_DEBUG are set in the leaf
# Makefiles by the 'debug:' and 'profile:' targets to their _V values. # Makefiles by the 'debug:' targets to their _V values.
# #
# default flags # default flags
@@ -30,7 +30,6 @@ ASFLAGS = $(CPU_ASFLAGS) $(XASFLAGS)
# NOTE: GCCSPECS probably belongs to CPPFLAGS # NOTE: GCCSPECS probably belongs to CPPFLAGS
GCCSPECS_OPTIMIZE_V = GCCSPECS_OPTIMIZE_V =
GCCSPECS_DEBUG_V = -qrtems_debug GCCSPECS_DEBUG_V = -qrtems_debug
GCCSPECS_PROFILE_V =
GCCSPECS = -B$(PROJECT_RELEASE)/lib/ -specs bsp_specs -qrtems GCCSPECS = -B$(PROJECT_RELEASE)/lib/ -specs bsp_specs -qrtems
GCCSPECS += $(GCCSPECS_$(VARIANT_V)_V) GCCSPECS += $(GCCSPECS_$(VARIANT_V)_V)
@@ -58,18 +57,14 @@ CXXFLAGS_DEBUG_V+=-qrtems_debug
CFLAGS_OPTIMIZE_V+=-g CFLAGS_OPTIMIZE_V+=-g
CXXFLAGS_OPTIMIZE_V+=-g CXXFLAGS_OPTIMIZE_V+=-g
# profile flag; use gprof(1)
CFLAGS_PROFILE_V+=-pg
CXXFLAGS_PROFILE_V+=-pg
ifndef AUTOMAKE ifndef AUTOMAKE
CFLAGS_$(VARIANT) =$(CFLAGS_$(VARIANT)_V) CFLAGS_$(VARIANT) =$(CFLAGS_$(VARIANT)_V)
CXXFLAGS_$(VARIANT)=$(CXXFLAGS_$(VARIANT)_V) CXXFLAGS_$(VARIANT)=$(CXXFLAGS_$(VARIANT)_V)
endif endif
ifndef AUTOMAKE ifndef AUTOMAKE
CFLAGS += $(CFLAGS_OPTIMIZE) $(CFLAGS_DEBUG) $(CFLAGS_PROFILE) CFLAGS += $(CFLAGS_OPTIMIZE) $(CFLAGS_DEBUG)
CXXFLAGS += $(CXXFLAGS_OPTIMIZE) $(CXXFLAGS_DEBUG) $(CXXFLAGS_PROFILE) CXXFLAGS += $(CXXFLAGS_OPTIMIZE) $(CXXFLAGS_DEBUG)
endif endif
# List of library paths without -L # List of library paths without -L
@@ -94,12 +89,8 @@ LDFLAGS_DYNAMIC_V = ??
# Some dynamic linking systems want the preferred name recorded in the binary # Some dynamic linking systems want the preferred name recorded in the binary
LDFLAGS_DYNAMIC_LIBNAME_V = -h $(DYNAMIC_VERSION_LIBNAME) LDFLAGS_DYNAMIC_LIBNAME_V = -h $(DYNAMIC_VERSION_LIBNAME)
# ld flags for profiling, debugging # LDFLAGS=$(LDFLAGS_DEBUG) $(LD_PATHS:%=-L%)
LDFLAGS_PROFILE_V = LDFLAGS=$(LDFLAGS_DEBUG)
LDFLAGS_DEBUG_V = -qrtems_debug
# LDFLAGS=$(LDFLAGS_PROFILE) $(LDFLAGS_DEBUG) $(LD_PATHS:%=-L%)
LDFLAGS=$(LDFLAGS_PROFILE) $(LDFLAGS_DEBUG)
# #
# Stuff to clean and clobber for the compiler and its tools # Stuff to clean and clobber for the compiler and its tools
@@ -172,7 +163,7 @@ ifneq ($(words $(C_FILES) $(CC_FILES) $(S_FILES)), 0)
# Use gcc -M to generate dependencies # Use gcc -M to generate dependencies
# Replace foo.o with $(ARCH)/foo.o # Replace foo.o with $(ARCH)/foo.o
# Replace $(ARCH) value with string $(ARCH) # Replace $(ARCH) value with string $(ARCH)
# so that it will for debug and profile cases # so that it will for debug cases
$(COMPILE.c) $(AM_CPPFLAGS) $(AM_CFLAGS) -M $^ | \ $(COMPILE.c) $(AM_CPPFLAGS) $(AM_CFLAGS) -M $^ | \
$(SED) -e 's?^\(.*\)\.o[ ]*:?$$(ARCH)/\1.o:?' \ $(SED) -e 's?^\(.*\)\.o[ ]*:?$$(ARCH)/\1.o:?' \
-e 's?$(ARCH)/?$$(ARCH)/?' >$(DEPEND).tmp -e 's?$(ARCH)/?$$(ARCH)/?' >$(DEPEND).tmp

View File

@@ -79,8 +79,6 @@ AC_SUBST(BARE_CPU_MODEL)
AC_SUBST(program_prefix) AC_SUBST(program_prefix)
AC_SUBST(CC_CFLAGS_DEFAULT) AC_SUBST(CC_CFLAGS_DEFAULT)
AC_SUBST(CC_CFLAGS_DEBUG_V) AC_SUBST(CC_CFLAGS_DEBUG_V)
AC_SUBST(CC_CFLAGS_PROFILE_V)
AC_SUBST(CC_LDFLAGS_PROFILE_V)
cfg_dir="${RTEMS_TOPdir}/make" cfg_dir="${RTEMS_TOPdir}/make"
AC_SUBST(cfg_dir) AC_SUBST(cfg_dir)