2005-01-05 Ralf Corsepius <ralf.corsepius@rtems.org>

* aclocal/env-rtemscpu.m4: Remove CFLAGS_OPTIMIZE_V.
	Remove CPU_CFLAGS.
	* aclocal/prog-cc.m4: Don't invoke _RTEMS_FLAGS to set up
	RTEMS_CFLAGS.
	* automake/compile.am: AM_CFLAGS = RTEMS_CFLAGS.
	Remove CPPFLAGS, CFLAGS, CPU_CFLAGS, CFLAGS_OPTIMIZE.
	Cleanup comments.
This commit is contained in:
Ralf Corsepius
2005-01-05 16:07:20 +00:00
parent 20cef00f23
commit 7ddfdb25e4
4 changed files with 12 additions and 25 deletions

View File

@@ -1,3 +1,13 @@
2005-01-05 Ralf Corsepius <ralf.corsepius@rtems.org>
* aclocal/env-rtemscpu.m4: Remove CFLAGS_OPTIMIZE_V.
Remove CPU_CFLAGS.
* aclocal/prog-cc.m4: Don't invoke _RTEMS_FLAGS to set up
RTEMS_CFLAGS.
* automake/compile.am: AM_CFLAGS = RTEMS_CFLAGS.
Remove CPPFLAGS, CFLAGS, CPU_CFLAGS, CFLAGS_OPTIMIZE.
Cleanup comments.
2005-01-05 Ralf Corsepius <ralf.corsepius@rtems.org> 2005-01-05 Ralf Corsepius <ralf.corsepius@rtems.org>
* aclocal/env-rtemscpu.m4: Remove CFLAGS_DEBUG_V. * aclocal/env-rtemscpu.m4: Remove CFLAGS_DEBUG_V.

View File

@@ -4,9 +4,5 @@ AC_DEFUN([RTEMS_ENV_RTEMSCPU],
[ [
AC_REQUIRE([RTEMS_ENABLE_MULTILIB]) AC_REQUIRE([RTEMS_ENABLE_MULTILIB])
AC_ARG_VAR([CPU_CFLAGS],[])
AC_ARG_VAR([CFLAGS_OPTIMIZE_V],
[CFLAGS for building the optimized variant])
AM_CONDITIONAL([MULTILIB],[test x"$multilib" = x"yes"]) AM_CONDITIONAL([MULTILIB],[test x"$multilib" = x"yes"])
]) ])

View File

@@ -10,9 +10,6 @@ AC_BEFORE([$0], [AC_PROG_CPP])dnl
AC_BEFORE([$0], [AC_PROG_CC])dnl AC_BEFORE([$0], [AC_PROG_CC])dnl
AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])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) RTEMS_CHECK_TOOL(CC,gcc)
test -z "$CC" && \ test -z "$CC" && \
AC_MSG_ERROR([no acceptable cc found in \$PATH]) AC_MSG_ERROR([no acceptable cc found in \$PATH])
@@ -34,6 +31,7 @@ if test "$GCC" = yes; then
RTEMS_CFLAGS="$RTEMS_CFLAGS -Wall" RTEMS_CFLAGS="$RTEMS_CFLAGS -Wall"
m4_if([$1],,[],[RTEMS_CFLAGS="$RTEMS_CFLAGS $1"]) m4_if([$1],,[],[RTEMS_CFLAGS="$RTEMS_CFLAGS $1"])
fi fi
AC_SUBST(RTEMS_CFLAGS)
AS_IF([test x"$rtems_cv_gcc_isystem" = x"yes"],[ AS_IF([test x"$rtems_cv_gcc_isystem" = x"yes"],[
RTEMS_CPPFLAGS="-isystem \$(PROJECT_INCLUDE)"],[ RTEMS_CPPFLAGS="-isystem \$(PROJECT_INCLUDE)"],[

View File

@@ -2,25 +2,8 @@
## $Id$ ## $Id$
## ##
## -------------------------------------------------------------------------
## NOTE: This file is rather immature and has to be considered to be
## almost experimental.
##
## Expect frequent changes -- It deserves to be cleaned up :(
## -------------------------------------------------------------------------
CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) $(DEFINES)
CFLAGS = @RTEMS_CFLAGS@
depend: depend:
## -------------------------------------------------------------------------
## These are supposed to be set in make/custom/<bsp>.cfg
CPU_CFLAGS = @CPU_CFLAGS@
CFLAGS_OPTIMIZE_V = @CFLAGS_OPTIMIZE_V@
## -------------------------------------------------------------------------
AM_CPPFLAGS = $(RTEMS_CPPFLAGS) AM_CPPFLAGS = $(RTEMS_CPPFLAGS)
AM_CFLAGS = AM_CFLAGS = $(RTEMS_CFLAGS)
AM_CCASFLAGS = $(RTEMS_CPPFLAGS) $(RTEMS_ASFLAGS) AM_CCASFLAGS = $(RTEMS_CPPFLAGS) $(RTEMS_ASFLAGS)