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.

5 files changed, 24 insertions, 35 deletions

diff --git a/c/src/make/ChangeLog b/c/src/make/ChangeLog
index 7c4d634766..7bf0cd041f 100644
--- a/c/src/make/ChangeLog
+++ b/c/src/make/ChangeLog
@@ -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>
 
 	* bsp.mak: Use var="$val" instead of var=${var=$val}. to satisfy
diff --git a/c/src/make/README b/c/src/make/README
index 8a3d599aef..4ee7d1be4c 100644
--- a/c/src/make/README
+++ b/c/src/make/README
@@ -30,8 +30,8 @@
             Makefiles) one developer can develop and test under SVR4,
             another under 4.x, another under HPUX.
 
-        .  Builtin support for compiling "variants" such as debug,
-            profile, and tcov versions.  These variants can be built
+        .  Builtin support for compiling "variants" such as debug
+            versions.  These variants can be built
             recursively.
 
         .  Control of system dependencies.  "hidden" dependencies on
@@ -110,7 +110,6 @@
 
             o-optimize/       -- optimized binaries
             o-debug/          -- debug binaries
-            o-profile/        -- profiling binaries
 
         Using the template Makefiles, this will all happen automatically. 
         The contents of these directories are specific to a BSP.
@@ -123,13 +122,12 @@
            
         Typing 'make' will place objects in o-optimize.
         '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
         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
         install a debug version of everything under that point by:
 
@@ -141,7 +139,7 @@
         appropriate version of the library will be linked in.
 
         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)
             LIBMINE = ../libmine/${ARCH}/libmine.a
@@ -250,7 +248,7 @@
             Names in here should be fully qualified, and NOT depend on $PATH.
 
             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.
 
 
@@ -314,11 +312,10 @@
 
             VARIANTS    -- full list of all possible values for $(ARCH);
                            used mainly for 'make clean'
-                           [ eg: "o-optimize o-debug o-profile" ]
+                           [ eg: "o-optimize o-debug" ]
 
             VARIANT_VA  -- Variant name.
-                           Normally "", but for 'make debug' it is "debug",
-                           for 'make profile', "profile, etc.
+                           Normally "", but for 'make debug' it is "debug".
 
                            see make/leaf.cfg for more info.
 
@@ -335,15 +332,11 @@
             CFLAGS_DEBUG_V      -- value of debug flag for compiler
                                    [ eg: -g ]
 
-            CFLAGS_PROFILE_V    -- compiler profile flags
-                                   [ eg: -pg ]
-
             CFLAGS_DEBUG_OPTIMIZE_V
                                 -- optimize flag if compiling for debug
                                      [ eg: "" ]
 
             CFLAGS_DEBUG
-            CFLAGS_PROFILE
             CFLAGS_OPTIMIZE     -- current values for each depending
                                     on make variant.
 
diff --git a/c/src/make/bsp.mak b/c/src/make/bsp.mak
index b343761853..9392f8bc91 100644
--- a/c/src/make/bsp.mak
+++ b/c/src/make/bsp.mak
@@ -13,4 +13,3 @@ make/${RTEMS_BSP}.cache:
 	@echo ac_cv_env_CPU_CFLAGS=\"$(CPU_CFLAGS)\" >> $@
 	@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_PROFILE_V=\"$(CFLAGS_PROFILE_V)\" >> $@
diff --git a/c/src/make/compilers/gcc-target-default.cfg b/c/src/make/compilers/gcc-target-default.cfg
index 2ffb1db78d..b2472c2cb9 100644
--- a/c/src/make/compilers/gcc-target-default.cfg
+++ b/c/src/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
@@ -30,7 +30,6 @@ ASFLAGS  = $(CPU_ASFLAGS) $(XASFLAGS)
 # NOTE: GCCSPECS probably belongs to CPPFLAGS
 GCCSPECS_OPTIMIZE_V =
 GCCSPECS_DEBUG_V = -qrtems_debug
-GCCSPECS_PROFILE_V =
 
 GCCSPECS = -B$(PROJECT_RELEASE)/lib/ -specs bsp_specs -qrtems 
 GCCSPECS += $(GCCSPECS_$(VARIANT_V)_V)
@@ -58,18 +57,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
@@ -94,12 +89,8 @@ LDFLAGS_DYNAMIC_V = ??
 # Some dynamic linking systems want the preferred name recorded in the binary
 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_PROFILE) $(LDFLAGS_DEBUG)
+# LDFLAGS=$(LDFLAGS_DEBUG) $(LD_PATHS:%=-L%)
+LDFLAGS=$(LDFLAGS_DEBUG)
 
 #
 # 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
 #       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/c/src/make/configure.ac b/c/src/make/configure.ac
index f2f9440541..e6b9ae31ff 100644
--- a/c/src/make/configure.ac
+++ b/c/src/make/configure.ac
@@ -79,8 +79,6 @@ AC_SUBST(BARE_CPU_MODEL)
 AC_SUBST(program_prefix)
 AC_SUBST(CC_CFLAGS_DEFAULT)
 AC_SUBST(CC_CFLAGS_DEBUG_V)
-AC_SUBST(CC_CFLAGS_PROFILE_V)
-AC_SUBST(CC_LDFLAGS_PROFILE_V)
 
 cfg_dir="${RTEMS_TOPdir}/make"
 AC_SUBST(cfg_dir)