From 888622c431f5444b54d0fc4c85d1f194414bbc1b Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 6 Jun 2003 04:39:43 +0000 Subject: 2003-06-06 Ralf Corsepius PR 321: * leaf.cfg: Remove support for profile-variant. * main.cfg: Ditto. * compilers/gcc-no_bsp.cfg: Ditto. * compilers/gcc-portsw.cfg: Ditto. * compilers/gcc-target-default.cfg: Ditto. --- make/ChangeLog | 9 +++++++++ make/compilers/gcc-no_bsp.cfg | 18 +++++++----------- make/compilers/gcc-portsw.cfg | 18 +++++++----------- make/compilers/gcc-target-default.cfg | 19 +++++++------------ make/leaf.cfg | 12 +++--------- make/main.cfg | 7 ++----- 6 files changed, 35 insertions(+), 48 deletions(-) (limited to 'make') diff --git a/make/ChangeLog b/make/ChangeLog index 44e9a9480f..3aac2a6aae 100644 --- a/make/ChangeLog +++ b/make/ChangeLog @@ -1,3 +1,12 @@ +2003-06-06 Ralf Corsepius + + PR 321: + * leaf.cfg: Remove support for profile-variant. + * main.cfg: Ditto. + * compilers/gcc-no_bsp.cfg: Ditto. + * compilers/gcc-portsw.cfg: Ditto. + * compilers/gcc-target-default.cfg: Ditto. + 2003-05-27 Ralf Corsepius * custom/mvme2307.cfg: Remove CFLAGS_PROFILE_V. diff --git a/make/compilers/gcc-no_bsp.cfg b/make/compilers/gcc-no_bsp.cfg index 97952f4bdd..34539b4565 100644 --- a/make/compilers/gcc-no_bsp.cfg +++ b/make/compilers/gcc-no_bsp.cfg @@ -9,7 +9,7 @@ # Just use the native tools GNU_TOOLS_PREFIX= -# Additional target names (other than debug, profile) +# Additional target names (other than debug) TARGET_VARIANTS += # @@ -54,11 +54,11 @@ endef # # -# 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. # -# CFLAGS_OPTIMIZE, CFLAGS_DEBUG, CFLAGS_PROFILE are set in the leaf -# Makefiles by the 'debug:' and 'profile:' targets to their _V values. +# CFLAGS_OPTIMIZE, CFLAGS_DEBUG are set in the leaf +# Makefiles by the 'debug:' targets to their _V values. # # default flags @@ -78,9 +78,6 @@ CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer # debug flag; typically -g CFLAGS_DEBUG_V=-g -Wno-unused -# profile flag; use gprof(1) -CFLAGS_PROFILE_V=-pg - # default is to optimize CFLAGS_OPTIMIZE=$(CFLAGS_OPTIMIZE_V) @@ -88,7 +85,7 @@ CFLAGS_OPTIMIZE=$(CFLAGS_OPTIMIZE_V) CFLAGS_DYNAMIC_V=-fpic # ASFLAGS_DYNAMIC_V= -CFLAGS=$(CFLAGS_DEFAULT) $(CFLAGS_OPTIMIZE) $(CFLAGS_DEBUG) $(CFLAGS_PROFILE) \ +CFLAGS=$(CFLAGS_DEFAULT) $(CFLAGS_OPTIMIZE) $(CFLAGS_DEBUG) \ -I $(PROJECT_INCLUDE) # List of library paths without -L @@ -115,10 +112,9 @@ LDFLAGS_DYNAMIC_V = ?? LDFLAGS_DYNAMIC_LIBNAME_V = -h $(DYNAMIC_VERSION_LIBNAME) # ld flags for profiling, debugging -LDFLAGS_PROFILE_V = LDFLAGS_DEBUG_V = -LDFLAGS=$(LDFLAGS_PROFILE) $(LDFLAGS_DEBUG) $(LD_PATHS:%=-L %) +LDFLAGS=$(LDFLAGS_DEBUG) $(LD_PATHS:%=-L %) # # Stuff to clean and clobber for the compiler and its tools @@ -222,7 +218,7 @@ ifneq ($(words $(C_FILES) $(CC_FILES) $(S_FILES)), 0) # Use gcc -M to generate dependencies # Replace foo.o with $(ARCH)/foo.o # Replace $(ARCH) value with string $(ARCH) -# so that it will for debug and profile cases +# so that it will for debug cases $(COMPILE.c) -M $^ | \ $(SED) -e 's?^\(.*\)\.o[ ]*:?$$(ARCH)/\1.o:?' \ -e 's?$(ARCH)/?$$(ARCH)/?' >$(DEPEND).tmp diff --git a/make/compilers/gcc-portsw.cfg b/make/compilers/gcc-portsw.cfg index 497ddeabd7..ece83237e2 100644 --- a/make/compilers/gcc-portsw.cfg +++ b/make/compilers/gcc-portsw.cfg @@ -10,7 +10,7 @@ # Just use the native tools GNU_TOOLS_PREFIX= -# Additional target names (other than debug, profile) +# Additional target names (other than debug) TARGET_VARIANTS += # @@ -40,11 +40,11 @@ CPPFLAGS=$(XCPPFLAGS) $(DEFINES) \ # # -# 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. # -# CFLAGS_OPTIMIZE, CFLAGS_DEBUG, CFLAGS_PROFILE are set in the leaf -# Makefiles by the 'debug:' and 'profile:' targets to their _V values. +# CFLAGS_OPTIMIZE, CFLAGS_DEBUG are set in the leaf +# Makefiles by the 'debug:' targets to their _V values. # # default flags @@ -60,9 +60,6 @@ CFLAGS_OPTIMIZE_V=-Os # debug flag; typically -g CFLAGS_DEBUG_V=-g -O0 -DRTEMS_DEBUG -DSTACK_CHECKER_ON -# profile flag; use gprof(1) -CFLAGS_PROFILE_V= - # default is to optimize CFLAGS_OPTIMIZE=$(CFLAGS_OPTIMIZE_V) @@ -70,7 +67,7 @@ CFLAGS_OPTIMIZE=$(CFLAGS_OPTIMIZE_V) CFLAGS_DYNAMIC_V=-fpic #ASFLAGS_DYNAMIC_V= -CFLAGS=$(CFLAGS_DEFAULT) $(CFLAGS_OPTIMIZE) $(CFLAGS_DEBUG) $(CFLAGS_PROFILE) +CFLAGS=$(CFLAGS_DEFAULT) $(CFLAGS_OPTIMIZE) $(CFLAGS_DEBUG) # List of library paths without -L LD_PATHS= $(PROJECT_RELEASE)/lib @@ -96,10 +93,9 @@ LDFLAGS_DYNAMIC_V = ?? LDFLAGS_DYNAMIC_LIBNAME_V = -h $(DYNAMIC_VERSION_LIBNAME) # ld flags for profiling, debugging -LDFLAGS_PROFILE_V = LDFLAGS_DEBUG_V = -LDFLAGS=$(LDFLAGS_PROFILE) $(LDFLAGS_DEBUG) $(LD_PATHS:%=-L %) +LDFLAGS=$(LDFLAGS_DEBUG) $(LD_PATHS:%=-L %) # # Stuff to clean and clobber for the compiler and its tools @@ -210,7 +206,7 @@ ifneq ($(words $(C_FILES) $(CC_FILES) $(S_FILES)), 0) # Use gcc -M to generate dependencies # Replace foo.o with $(ARCH)/foo.o # Replace $(ARCH) value with string $(ARCH) -# so that it will for debug and profile cases +# so that it will for debug cases $(COMPILE.c) -Hmake $^ | \ $(SED) -e 's?^\(.*\)\.o[ ]*:?$$(ARCH)/\1.o:?' \ -e 's?$(ARCH)/?$$(ARCH)/?' >$(DEPEND).tmp diff --git a/make/compilers/gcc-target-default.cfg b/make/compilers/gcc-target-default.cfg index f09f57515b..44133e6da9 100644 --- a/make/compilers/gcc-target-default.cfg +++ b/make/compilers/gcc-target-default.cfg @@ -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. # -# CFLAGS_OPTIMIZE, CFLAGS_DEBUG, CFLAGS_PROFILE are set in the leaf -# Makefiles by the 'debug:' and 'profile:' targets to their _V values. +# CFLAGS_OPTIMIZE, CFLAGS_DEBUG are set in the leaf +# Makefiles by the 'debug:' targets to their _V values. # # default flags @@ -55,18 +55,14 @@ CXXFLAGS_DEBUG_V+=-qrtems_debug CFLAGS_OPTIMIZE_V+=-g CXXFLAGS_OPTIMIZE_V+=-g -# profile flag; use gprof(1) -CFLAGS_PROFILE_V+=-pg -CXXFLAGS_PROFILE_V+=-pg - ifndef AUTOMAKE CFLAGS_$(VARIANT) =$(CFLAGS_$(VARIANT)_V) CXXFLAGS_$(VARIANT)=$(CXXFLAGS_$(VARIANT)_V) endif ifndef AUTOMAKE -CFLAGS += $(CFLAGS_OPTIMIZE) $(CFLAGS_DEBUG) $(CFLAGS_PROFILE) -CXXFLAGS += $(CXXFLAGS_OPTIMIZE) $(CXXFLAGS_DEBUG) $(CXXFLAGS_PROFILE) +CFLAGS += $(CFLAGS_OPTIMIZE) $(CFLAGS_DEBUG) +CXXFLAGS += $(CXXFLAGS_OPTIMIZE) $(CXXFLAGS_DEBUG) endif # List of library paths without -L @@ -93,10 +89,9 @@ LDFLAGS_DYNAMIC_V = ?? LDFLAGS_DYNAMIC_LIBNAME_V = -h $(DYNAMIC_VERSION_LIBNAME) # ld flags for profiling, debugging -LDFLAGS_PROFILE_V = LDFLAGS_DEBUG_V = -qrtems_debug -LDFLAGS=$(LDFLAGS_PROFILE) $(LDFLAGS_DEBUG) $(LD_PATHS:%=-L %) +LDFLAGS=$(LDFLAGS_DEBUG) $(LD_PATHS:%=-L %) # # Stuff to clean and clobber for the compiler and its tools @@ -169,7 +164,7 @@ ifneq ($(words $(C_FILES) $(CC_FILES) $(S_FILES)), 0) # Use gcc -M to generate dependencies # Replace foo.o with $(ARCH)/foo.o # 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 $^ | \ $(SED) -e 's?^\(.*\)\.o[ ]*:?$$(ARCH)/\1.o:?' \ -e 's?$(ARCH)/?$$(ARCH)/?' >$(DEPEND).tmp diff --git a/make/leaf.cfg b/make/leaf.cfg index 4df4d09ace..2cab5adfef 100644 --- a/make/leaf.cfg +++ b/make/leaf.cfg @@ -36,13 +36,12 @@ MANAGERS := $(sort $(MANAGERS)) # # LIBSUFFIX_VA, will "index" into LIBSUFF-*-v macros and -# convert our ${ARCH} back into .a or _g.a or _p.a based on debug or profile. +# convert our ${ARCH} back into .a or _g.a or _p.a based on debug. # Useful for installing libraries. # LIBSUFFIX_OPTIMIZE_V= LIBSUFFIX_DEBUG_V=_g -LIBSUFFIX_PROFILE_V=_p LIB_VARIANT=$(LIBSUFFIX_$(VARIANT_V)_V) LIBSUFFIX_VA = $(LIB_VARIANT).a @@ -61,31 +60,26 @@ ifndef AUTOMAKE # debug: $(MAKE) -f $(MAKEFILE) MAKEFILE=$(MAKEFILE) VARIANT=DEBUG - -profile: - $(MAKE) -f $(MAKEFILE) MAKEFILE=$(MAKEFILE) VARIANT=PROFILE endif # -# VARIANT_VA will convert our ${ARCH} back into "" or "debug" or "profile". +# VARIANT_VA will convert our ${ARCH} back into "" or "debug". # Handy when one makefile wants to hop over into a peer's tree and # build something "the same" way. # VARIANT-OPTIMIZE-v = VARIANT-DEBUG-v = debug -VARIANT-PROFILE-v = profile VARIANT_VA = $(VARIANT-$(VARIANT_V)-v) # -# TARGET_VA will convert $@ (expected to be 'debug' or 'profile' etc.) +# TARGET_VA will convert $@ (expected to be 'debug' etc.) # into "" or "install" as appropriate. # Used for variant recursion. # TARGET_debug_V = all -TARGET_profile_V = all TARGET_VA = $(TARGET_$@_V) diff --git a/make/main.cfg b/make/main.cfg index 86937fb91a..0e7e2317f2 100644 --- a/make/main.cfg +++ b/make/main.cfg @@ -31,17 +31,14 @@ endif VARIANT_OPTIMIZE_V = OPTIMIZE VARIANT_DEBUG_V = DEBUG -VARIANT_PROFILE_V = PROFILE VARIANT_optimize_V = OPTIMIZE VARIANT_debug_V = DEBUG -VARIANT_profile_V = PROFILE VARIANT_V = $(VARIANT_$(VARIANT)_V) ## Setup the variant build subdirectory ARCH_OPTIMIZE_V = o-optimize ARCH_DEBUG_V = o-debug -ARCH_PROFILE_V = o-profile ARCH__V = $(ARCH_OPTIMIZE_V) ARCH = $(ARCH_$(VARIANT_V)_V) @@ -58,10 +55,10 @@ MAKEFILE=Makefile # # Target variant names # -TARGET_VARIANTS = optimize debug profile +TARGET_VARIANTS = optimize debug # -# Generate list of object directories: o-optimize, o-debug, o-profile +# Generate list of object directories: o-optimize, o-debug # VARIANTS=${TARGET_VARIANTS:%=o-%} -- cgit v1.2.3