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

	* automake/multilib.am: Don't include @RTEMS_BSP@.cfg.
	* automake/compile.am: Remove hard-coded CFLAGS_PROFILE_V.
	Add autoconf-supplied CPU_CFLAGS, CFLAGS_OPTIMIZE_V, CFLAGS_DEBUG_V,
	CFLAGS_PROFILE_V.
	Hard-code RTEMS_CFLAGS_PROFILE = -pg
	* aclocal/prog-cc.m4: Sync with toplevel/aclocal/prog-cc.m4.
	Remove GCCSED.
	* aclocal/env-rtemsbsp.m4: Add AC_ARG_VAR for CPU_CFLAGS,
	CFLAGS_OPTIMIZE_V, CFLAGS_DEBUG_V, CFLAGS_PROFILE_V.

5 files changed, 27 insertions, 20 deletions

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 6279d0fb45..99b177448e 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,17 @@
 2002-12-06	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
+	* automake/multilib.am: Don't include @RTEMS_BSP@.cfg.
+	* automake/compile.am: Remove hard-coded CFLAGS_PROFILE_V.
+	Add autoconf-supplied CPU_CFLAGS, CFLAGS_OPTIMIZE_V, CFLAGS_DEBUG_V, 
+	CFLAGS_PROFILE_V.
+	Hard-code RTEMS_CFLAGS_PROFILE = -pg
+	* aclocal/prog-cc.m4: Sync with toplevel/aclocal/prog-cc.m4.
+	Remove GCCSED.
+	* aclocal/env-rtemsbsp.m4: Add AC_ARG_VAR for CPU_CFLAGS,
+	CFLAGS_OPTIMIZE_V, CFLAGS_DEBUG_V, CFLAGS_PROFILE_V.
+
+2002-12-06	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
 	* aclocal/rtems-flags.m4: New.
 
 2002-11-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
diff --git a/cpukit/aclocal/env-rtemsbsp.m4 b/cpukit/aclocal/env-rtemsbsp.m4
index fbb60caf3f..990a4c7936 100644
--- a/cpukit/aclocal/env-rtemsbsp.m4
+++ b/cpukit/aclocal/env-rtemsbsp.m4
@@ -8,6 +8,11 @@ AC_BEFORE([$0], [RTEMS_ENABLE_RTEMSBSP])dnl
 AC_BEFORE([$0], [RTEMS_PROJECT_ROOT])dnl
 AC_BEFORE([$0], [RTEMS_CHECK_CUSTOM_BSP])dnl
 
+AC_ARG_VAR([CPU_CFLAGS],[])
+AC_ARG_VAR([CFLAGS_OPTIMIZE_V],[])
+AC_ARG_VAR([CFLAGS_DEBUG_V],[])
+AC_ARG_VAR([CFLAGS_PROFILE_V],[])
+
 AC_ARG_VAR([RTEMS_BSP],[RTEMS_BSP to build])
 AC_MSG_CHECKING([for RTEMS_BSP])
 AC_CACHE_VAL(rtems_cv_RTEMS_BSP,
diff --git a/cpukit/aclocal/prog-cc.m4 b/cpukit/aclocal/prog-cc.m4
index 67689c6ccc..4ed2f5730c 100644
--- a/cpukit/aclocal/prog-cc.m4
+++ b/cpukit/aclocal/prog-cc.m4
@@ -10,6 +10,9 @@ AC_BEFORE([$0], [AC_PROG_CPP])dnl
 AC_BEFORE([$0], [AC_PROG_CC])dnl
 AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl
 
+_RTEMS_FLAGS([CFLAGS],
+  ["\$(CPU_CFLAGS) \$(RTEMS_CFLAGS_\$(VARIANT_V)_V) \$(CFLAGS_\$(VARIANT_V)_V) -g"])
+
 RTEMS_CHECK_TOOL(CC,gcc)
 test -z "$CC" && \
   AC_MSG_ERROR([no acceptable cc found in \$PATH])
@@ -30,16 +33,7 @@ RTEMS_GCC_PIPE
 test "$rtems_cv_gcc_pipe" = "yes" && CC="$CC --pipe"
 
 if test "$GCC" = yes; then
-]
-m4_if([$1],,[],[CPPFLAGS="$CPPFLAGS $1"])
-[
-CFLAGS=${CFLAGS--g -Wall}
+RTEMS_CFLAGS="$RTEMS_CFLAGS -Wall"
+m4_if([$1],,[],[RTEMS_CFLAGS="$RTEMS_CFLAGS $1"])
 fi
-
-dnl FIXME: HACK for egcs/cygwin mixing '\\' and '/' in gcc -print-*
-#case $build_os in
-#*cygwin*)     GCCSED="| sed 's%\\\\%/%g'" ;;
-#*) ;;
-#esac
-AC_SUBST(GCCSED)
 ])
diff --git a/cpukit/automake/compile.am b/cpukit/automake/compile.am
index d51956f958..f51621b113 100644
--- a/cpukit/automake/compile.am
+++ b/cpukit/automake/compile.am
@@ -57,9 +57,6 @@ CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) \
 CFLAGS   = @CFLAGS@ $(CPU_CFLAGS) $(XCFLAGS)
 ASFLAGS  = $(CPU_ASFLAGS) $(CPU_CFLAGS) $(XASFLAGS)
 
-# profile flag; use gprof(1)
-CFLAGS_PROFILE_V=-pg
-
 #
 # How to compile stuff into ${ARCH} subdirectory
 #
@@ -144,9 +141,10 @@ LIB_VARIANT = $(LIBSUFFIX_$(VARIANT_V)_V)
 LIBSUFFIX_VA = $(LIB_VARIANT).a
 
 ## These are supposed to be set in make/custom/<bsp>.cfg
-## CFLAGS_OPTIMIZE_V = 
-## CFLAGS_DEBUG_V =
-## CFLAGS_PROFILE_V =
+CPU_CFLAGS = @CPU_CFLAGS@
+CFLAGS_OPTIMIZE_V = @CFLAGS_OPTIMIZE_V@
+CFLAGS_DEBUG_V = @CFLAGS_DEBUG_V@
+CFLAGS_PROFILE_V = @CFLAGS_PROFILE_V@
 CFLAGS__V = $(CFLAGS_OPTIMIZE_V)
 
 ## ------------------------------------------------------------------------
@@ -155,7 +153,7 @@ if RTEMS_USE_GCC
 ## gcc >= gcc-2.8
 RTEMS_CFLAGS_OPTIMIZE_V =
 RTEMS_CFLAGS_DEBUG_V = -Wno-unused
-RTEMS_CFLAGS_PROFILE_V =
+RTEMS_CFLAGS_PROFILE_V = -pg
 
 ## non-gcc
 ## We can't guess what flags might be required here.
diff --git a/cpukit/automake/multilib.am b/cpukit/automake/multilib.am
index a94c31b094..9f2024f8d9 100644
--- a/cpukit/automake/multilib.am
+++ b/cpukit/automake/multilib.am
@@ -33,6 +33,4 @@ distclean-multi:
 	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean
 maintainer-clean-multi:
 	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean
-else
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 endif