summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cpukit/ChangeLog6
-rw-r--r--cpukit/aclocal/env-rtemscpu.m42
-rw-r--r--cpukit/aclocal/prog-cc.m42
-rw-r--r--cpukit/automake/compile.am22
4 files changed, 6 insertions, 26 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index af5785bf80..95b85eaf3d 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-05 Ralf Corsepius <ralf.corsepius@rtems.org>
+
+ * aclocal/env-rtemscpu.m4: Remove CFLAGS_DEBUG_V.
+ * aclocal/prog-cc.m4: Remove RTEMS_USE_GCC.
+ * automake/compile.am: Cleanup comments. Remove ASFLAGS.
+
2005-01-01 Ralf Corsepius <ralf.corsepius@rtems.org>
* automake/compile.am, httpd/Makefile.am, itron/Makefile.am,
diff --git a/cpukit/aclocal/env-rtemscpu.m4 b/cpukit/aclocal/env-rtemscpu.m4
index eee3c5dd5f..9f723b7c7c 100644
--- a/cpukit/aclocal/env-rtemscpu.m4
+++ b/cpukit/aclocal/env-rtemscpu.m4
@@ -7,8 +7,6 @@ AC_DEFUN([RTEMS_ENV_RTEMSCPU],
AC_ARG_VAR([CPU_CFLAGS],[])
AC_ARG_VAR([CFLAGS_OPTIMIZE_V],
[CFLAGS for building the optimized variant])
- AC_ARG_VAR([CFLAGS_DEBUG_V],
- [CFLAGS for building the debugging variant])
AM_CONDITIONAL([MULTILIB],[test x"$multilib" = x"yes"])
])
diff --git a/cpukit/aclocal/prog-cc.m4 b/cpukit/aclocal/prog-cc.m4
index 344081f98c..6a4a0d11ac 100644
--- a/cpukit/aclocal/prog-cc.m4
+++ b/cpukit/aclocal/prog-cc.m4
@@ -18,8 +18,6 @@ test -z "$CC" && \
AC_MSG_ERROR([no acceptable cc found in \$PATH])
AC_PROG_CC
AC_PROG_CPP
-
-AM_CONDITIONAL(RTEMS_USE_GCC,test x"$GCC" = x"yes")
])
AC_DEFUN([RTEMS_PROG_CC_FOR_TARGET],
diff --git a/cpukit/automake/compile.am b/cpukit/automake/compile.am
index bb74191609..59182f4106 100644
--- a/cpukit/automake/compile.am
+++ b/cpukit/automake/compile.am
@@ -9,30 +9,8 @@
## Expect frequent changes -- It deserves to be cleaned up :(
## -------------------------------------------------------------------------
-## The section below is based on make/compilers/gcc-target-default.cfg
-## used in former versions of RTEMS.
-
-##
-## Set up the flags for the toolchains:
-##
-## We are considering 3 different building schemes here:
-## * Using gcc's being able to accept -specs (aka gcc-2.8 building scheme)
-## * Using gcc's not being able to accept -specs (aka gcc-2.7.2 building
-## scheme)
-## * Using third party toolchains (aka non-gcc building scheme)
-##
-## Automake conditionals in use:
-## RTEMS_USE_GCC .. if we are using GCC
-
-## CFLAGS_OPTIMIZE_V, CFLAGS_DEBUG_V are the values we
-## would want the corresponding macros to be set to.
-##
-## CFLAGS_OPTIMIZE, CFLAGS_DEBUG are set by the
-## 'VARIANT=<OPTIMIZE|DEBUG>' targets to their _V values.
-
CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) $(DEFINES)
CFLAGS = @RTEMS_CFLAGS@
-ASFLAGS = $(CPU_ASFLAGS) $(CPU_CFLAGS)
depend: