summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-03-10 16:46:32 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-03-10 16:46:32 +0000
commit89b51f479583a97de7ed67b61231f05ae1360408 (patch)
tree101bf6edfdcd8f0065a952e9295631405ea50b39
parent5372f167a971764ea518fcaee5b0559e73d5b0a6 (diff)
downloadrtems-89b51f479583a97de7ed67b61231f05ae1360408.tar.bz2
Merger from rtems-4-6-branch
-rw-r--r--aclocal/rtems-top.m48
-rw-r--r--make/ChangeLog11
-rw-r--r--make/custom/arm_bare_bsp.cfg2
-rw-r--r--make/custom/armulator.cfg2
-rw-r--r--make/custom/edb7312.cfg2
-rw-r--r--make/custom/ppcn_60x.cfg2
-rw-r--r--make/custom/vegaplus.cfg2
7 files changed, 17 insertions, 12 deletions
diff --git a/aclocal/rtems-top.m4 b/aclocal/rtems-top.m4
index 82da20edd5..bdb79ed5e6 100644
--- a/aclocal/rtems-top.m4
+++ b/aclocal/rtems-top.m4
@@ -8,8 +8,8 @@ dnl
AC_DEFUN(RTEMS_TOP,
[dnl
AC_REQUIRE([RTEMS_VERSIONING])
+AC_CONFIG_AUX_DIR([$1])
AC_CHECK_PROGS(MAKE, gmake make)
-AC_BEFORE([$0], [AC_CONFIG_AUX_DIR])dnl
AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl
AC_PREFIX_DEFAULT([/opt/rtems])
@@ -35,13 +35,7 @@ PROJECT_TOPdir=${dots}${RTEMS_TOPdir}/'$(top_builddir)'
fi
AC_SUBST(PROJECT_TOPdir)
-if test "$with_target_subdir" = "." ; then
-# Native
-PROJECT_ROOT="${RTEMS_TOPdir}/\$(top_builddir)"
-else
-# Cross
PROJECT_ROOT="${RTEMS_TOPdir}/\$(top_builddir)"
-fi
AC_SUBST(PROJECT_ROOT)
AC_MSG_CHECKING([for RTEMS Version])
diff --git a/make/ChangeLog b/make/ChangeLog
index f00f8709cc..3eb3df822e 100644
--- a/make/ChangeLog
+++ b/make/ChangeLog
@@ -1,3 +1,14 @@
+2003-03-10 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * custom/ppcn_60x.cfg: Fix mal-formed CVS-Id.
+
+2003-02-26 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * custom/armulator.cfg: CPU_CFLAGS = -msoft-float.
+ * custom/vegaplus.cfg: CPU_CFLAGS = -msoft-float.
+ * custom/ebd7312.cfg: CPU_CFLAGS = -msoft-float.
+ * custom/arm_bare_bsp.cfg: CPU_CFLAGS += -msoft-float.
+
2003-02-14 Joel Sherrill <joel@OARcorp.com>
AMD a29k obsolete.
diff --git a/make/custom/arm_bare_bsp.cfg b/make/custom/arm_bare_bsp.cfg
index e9c6bdb316..9050056590 100644
--- a/make/custom/arm_bare_bsp.cfg
+++ b/make/custom/arm_bare_bsp.cfg
@@ -16,7 +16,7 @@ RTEMS_BSP_FAMILY=arm_bare_bsp
# and (hopefully) optimize for it.
#
#CPU_CFLAGS = -mcpu=arm7tdmi
-CPU_CFLAGS =
+CPU_CFLAGS = -msoft-float
# optimize flag: typically -0, could use -O4 or -fast
# -O4 is ok for RTEMS
diff --git a/make/custom/armulator.cfg b/make/custom/armulator.cfg
index e76aab763b..6f063eb163 100644
--- a/make/custom/armulator.cfg
+++ b/make/custom/armulator.cfg
@@ -16,7 +16,7 @@ RTEMS_BSP_FAMILY=armulator
# and (hopefully) optimize for it.
#
#CPU_CFLAGS = -mcpu=arm7tdmi
-CPU_CFLAGS =
+CPU_CFLAGS = -msoft-float
# optimize flag: typically -0, could use -O4 or -fast
# -O4 is ok for RTEMS
diff --git a/make/custom/edb7312.cfg b/make/custom/edb7312.cfg
index cae53db469..6a34659dfb 100644
--- a/make/custom/edb7312.cfg
+++ b/make/custom/edb7312.cfg
@@ -15,7 +15,7 @@ RTEMS_BSP_FAMILY=edb7312
# This contains the compiler options necessary to select the CPU model
# and (hopefully) optimize for it.
#
-CPU_CFLAGS = -mcpu=$(RTEMS_CPU_MODEL) -mstructure-size-boundary=8
+CPU_CFLAGS = -mcpu=$(RTEMS_CPU_MODEL) -mstructure-size-boundary=8 -msoft-float
# optimize flag: typically -0, could use -O4 or -fast
# -O4 is ok for RTEMS
diff --git a/make/custom/ppcn_60x.cfg b/make/custom/ppcn_60x.cfg
index 6302018ff3..bf37fef669 100644
--- a/make/custom/ppcn_60x.cfg
+++ b/make/custom/ppcn_60x.cfg
@@ -1,7 +1,7 @@
#
# Config file for a Radstone Technology Plc. PowerPC 60x based VME board
#
-# $Id: ppcn_60x.cfg
+# $Id$
#
include $(RTEMS_ROOT)/make/custom/default.cfg
diff --git a/make/custom/vegaplus.cfg b/make/custom/vegaplus.cfg
index e7487a1433..98011d2aa4 100644
--- a/make/custom/vegaplus.cfg
+++ b/make/custom/vegaplus.cfg
@@ -16,7 +16,7 @@ RTEMS_BSP_FAMILY=vegaplus
# and (hopefully) optimize for it.
#
#CPU_CFLAGS = -mcpu=arm7tdmi
-CPU_CFLAGS =
+CPU_CFLAGS = -msoft-float
# optimize flag: typically -0, could use -O4 or -fast
# -O4 is ok for RTEMS