summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2002-06-27 12:18:24 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2002-06-27 12:18:24 +0000
commit52614062c5ec70f44e229b36872cca30120de26b (patch)
treed3332d8c0b14811c00ad018bf9632c281f92dbfc /cpukit
parent2002-06-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-52614062c5ec70f44e229b36872cca30120de26b.tar.bz2
2002-06-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/prog-ccas.m4: New. * aclocal/canonicalize-tools.m4: Remove AS, OBJCOPY, NM, SIZE, STRIP. RTEMS_GCC_PRINT * aclocal/check-multiprocessing.m4: Fix typo. * automake/compile.am: Remove CXX support. Replace AS by CCAS. Remove LINK_LIBS, LINK_OBJS, LINK_FILES.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/ChangeLog2
-rw-r--r--cpukit/aclocal/canonicalize-tools.m412
-rw-r--r--cpukit/aclocal/prog-ccas.m48
-rw-r--r--cpukit/automake/compile.am59
4 files changed, 16 insertions, 65 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 9ca9e2e97a..9ad9357389 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -4,6 +4,8 @@
* aclocal/canonicalize-tools.m4: Remove AS, OBJCOPY, NM, SIZE, STRIP.
RTEMS_GCC_PRINT
* aclocal/check-multiprocessing.m4: Fix typo.
+ * automake/compile.am: Remove CXX support.
+ Replace AS by CCAS. Remove LINK_LIBS, LINK_OBJS, LINK_FILES.
2002-06-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
diff --git a/cpukit/aclocal/canonicalize-tools.m4 b/cpukit/aclocal/canonicalize-tools.m4
index 3868c76d71..b806cc2f85 100644
--- a/cpukit/aclocal/canonicalize-tools.m4
+++ b/cpukit/aclocal/canonicalize-tools.m4
@@ -4,25 +4,13 @@ dnl
dnl Set target tools
dnl
-AC_DEFUN(RTEMS_GCC_PRINT,
-[
- $1=`$CC --print-prog-name=$2`
-])
-
AC_DEFUN(RTEMS_CANONICALIZE_TOOLS,
[AC_REQUIRE([RTEMS_PROG_CC])dnl
dnl FIXME: What shall be done if these tools are not available?
RTEMS_CHECK_TOOL(AR,ar,no)
- RTEMS_CHECK_TOOL(AS,as,no)
RTEMS_CHECK_TOOL(LD,ld,no)
- RTEMS_CHECK_TOOL(NM,nm,no)
dnl special treatment of ranlib
RTEMS_CHECK_TOOL(RANLIB,ranlib,:)
-
-dnl NOTE: These may not be available if not using gnutools
- RTEMS_CHECK_TOOL(OBJCOPY,objcopy,no)
- RTEMS_CHECK_TOOL(SIZE,size,no)
- RTEMS_CHECK_TOOL(STRIP,strip,:)
])
diff --git a/cpukit/aclocal/prog-ccas.m4 b/cpukit/aclocal/prog-ccas.m4
new file mode 100644
index 0000000000..aeef25ec0c
--- /dev/null
+++ b/cpukit/aclocal/prog-ccas.m4
@@ -0,0 +1,8 @@
+## $Id$
+
+AC_DEFUN([RTEMS_PROG_CCAS],
+[
+AC_REQUIRE([RTEMS_PROG_CC])
+AC_SUBST(CCAS,["$CC \$(GCCSPECS)"])
+AC_SUBST(CCASFLAGS,["-DASM \$(CFLAGS) \$(INCLUDES)"])
+])
diff --git a/cpukit/automake/compile.am b/cpukit/automake/compile.am
index 22eb1bd2bc..7eb3cdd1b7 100644
--- a/cpukit/automake/compile.am
+++ b/cpukit/automake/compile.am
@@ -36,7 +36,7 @@
## CFLAGS_OPTIMIZE, CFLAGS_DEBUG, CFLAGS_PROFILE are set by the
## 'VARIANT=<OPTIMIZE|DEBUG|PROFILE>' targets to their _V values.
-## XCPPFLAGS, XCFLAGS, XCXXFLAGS, XASFLAGS
+## XCPPFLAGS, XCFLAGS, XASFLAGS
## are used to add flags from the shell
## cf. make.info ("Implicit rules/variables" for details)
@@ -57,21 +57,16 @@ DEFS = @DEFS@
CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) \
$(DEFINES) $(XCPPFLAGS) $(CPPFLAGS_GCC)
CFLAGS = $(CFLAGS_DEFAULT) $(CPU_CFLAGS) $(XCFLAGS)
-CXXFLAGS = $(CFLAGS_DEFAULT) $(CPU_CFLAGS) $(XCXXFLAGS)
ASFLAGS = $(CPU_ASFLAGS) $(CPU_CFLAGS) $(XASFLAGS)
-LINK_LIBS = $(LD_LIBS)
-
## FIXME: This doesn't seem to be correct
# when debugging, optimize flag: typically empty
# some compilers do allow optimization with their "-g"
CFLAGS_DEBUG_OPTIMIZE_V=-g
-CXXFLAGS_DEBUG_OPTIMIZE_V=-g
LDFLAGS_DEBUG_V =
# profile flag; use gprof(1)
CFLAGS_PROFILE_V=-pg
-CXXFLAGS_PROFILE_V=-pg
LDFLAGS_PROFILE_V =
# List of library paths without -L
@@ -84,10 +79,6 @@ LDFLAGS_INCOMPLETE = -r
LDFLAGS=$(LDFLAGS_PROFILE) $(LDFLAGS_DEBUG) $(LD_PATHS:%=-L %)
#
-# Client compiler and support tools
-#
-
-#
# How to compile stuff into ${ARCH} subdirectory
#
@@ -97,32 +88,13 @@ CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-
-AS = $(CC)
-ASCOMPILE = $(AS) $(AM_ASFLAGS) $(ASFLAGS)
+CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
${ARCH}/%.o: %.c
${COMPILE} -o $@ -c $<
-${ARCH}/%.o: %.cc
- ${CXXCOMPILE} -o $@ -c $<
-
-${ARCH}/%.o: %.cpp
- ${CXXCOMPILE} -o $@ -c $<
-
-${ARCH}/%.o: %.cxx
- ${CXXCOMPILE} -o $@ -c $<
-
-${ARCH}/%.o: %.C
- ${CXXCOMPILE} -o $@ -c $<
-
${ARCH}/%.o: %.S
- ${ASCOMPILE} -DASM -o $@ -c $<
+ ${CCASCOMPILE} -o $@ -c $<
# Make foo.rel from foo.o
${ARCH}/%.rel: ${ARCH}/%.o
@@ -160,19 +132,6 @@ ifeq (${DEPEND},$(wildcard ${DEPEND}))
include ${DEPEND}
@ENDIF@
-
-# spell out all the LINK_FILE's, rather than using -lbsp, so
-# that $(LINK_FILES) can be a dependency
-
-LINK_OBJS = \
- $(OBJS) \
- $(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel)
-
-LINK_FILES =\
- $(START_FILE) \
- $(OBJS) \
- $(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel)
-
if RTEMS_USE_GCC
## gcc >= 2.8
define make-rel
@@ -239,18 +198,12 @@ RTEMS_CFLAGS__V = $(RTEMS_CFLAGS_OPTIMIZE_V)
## -------------------------------------------------------------------------
CC = @CC@ $(GCCSPECS)
-CXX = @CXX@ $(GCCSPECS)
CPP = @CPP@ $(GCCSPECS)
-LD = @LD@
-OBJCOPY = @OBJCOPY@
-NM = @NM@
-SIZE = @SIZE@
-STRIP = @STRIP@
-
-
##
AM_CPPFLAGS = $(RTEMS_CPPFLAGS)
AM_CFLAGS = $(RTEMS_CFLAGS_$(VARIANT_V)_V) $(CFLAGS_$(VARIANT_V)_V)
-AM_CXXFLAGS = $(RTEMS_CFLAGS_$(VARIANT_V)_V) $(CFLAGS_$(VARIANT_V)_V)
+
+# AM_CFLAGS = $(RTEMS_BSP_CFLAGS) $(RTEMS_CFLAGS)
+AM_CCASFLAGS = $(RTEMS_BSP_CFLAGS) $(RTEMS_CPPFLAGS) $(RTEMS_ASFLAGS)