summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-11-21 18:36:51 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-11-21 18:36:51 +0000
commit8e541868226dadff2cb56ce6bc61c3707726729b (patch)
tree597c652f7f328115e14bfc988fc2a8a81ede5955
parent81e5df8228279a92100dc552d23de56ae98e1177 (diff)
downloadrtems-8e541868226dadff2cb56ce6bc61c3707726729b.tar.bz2
2001-11-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/bsp-alias.m4: Remove score603e_g1. * aclocal/check-bsps.m4: Remove score603e_g1. * aclocal/prog-cc.m4: Apply m4_if.
-rw-r--r--ChangeLog7
-rw-r--r--aclocal/bsp-alias.m41
-rw-r--r--aclocal/check-bsps.m41
-rw-r--r--aclocal/prog-cc.m42
4 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index bc55e159c9..14aabaa61a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-11-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * aclocal/bsp-alias.m4: Remove score603e_g1.
+ * aclocal/check-bsps.m4: Remove score603e_g1.
+ * aclocal/prog-cc.m4: Apply m4_if.
+
+
2001-11-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* automake/force-preinstall.am: New file.
diff --git a/aclocal/bsp-alias.m4 b/aclocal/bsp-alias.m4
index 45aa4d54a8..3c1c835524 100644
--- a/aclocal/bsp-alias.m4
+++ b/aclocal/bsp-alias.m4
@@ -25,7 +25,6 @@ AC_DEFUN(_RTEMS_BSP_ALIAS,
erc32nfp) $2=erc32 ;; # erc32 without fpu
leon1) $2=leon ;; # leon without fpu
leon2) $2=leon ;; # leon with fpu
- score603e_g1) $2=score603e ;; # score603e generation 1
simsh7032) $2=shsim ;; # SH7032 simulator
simsh7045) $2=shsim ;; # SH7045 simulator
*) $2=$1;;
diff --git a/aclocal/check-bsps.m4 b/aclocal/check-bsps.m4
index 0f41e0a407..ff00589644 100644
--- a/aclocal/check-bsps.m4
+++ b/aclocal/check-bsps.m4
@@ -23,7 +23,6 @@ AC_MSG_CHECKING([for bsps])
pc386) $1="[$]$1 pc386 pc386dx pc486 pc586 pc686 pck6";;
erc32) $1="[$]$1 erc32 erc32nfp";;
leon) $1="[$]$1 leon1 leon2";;
- score603e) $1="[$]$1 score603e score603e_g1";;
sim68000) $1="[$]$1 sim68000 simcpu32";;
shsim) $1="[$]$1 simsh7032 simsh7045";;
*) $1="[$]$1 $file";;
diff --git a/aclocal/prog-cc.m4 b/aclocal/prog-cc.m4
index 868c411b21..4b6d70f071 100644
--- a/aclocal/prog-cc.m4
+++ b/aclocal/prog-cc.m4
@@ -40,7 +40,7 @@ test "$rtems_cv_gcc_pipe" = "yes" && CC="$CC --pipe"
if test "$GCC" = yes; then
]
-ifelse([$1],,[],[CPPFLAGS="$CPPFLAGS $1"])
+m4_if([$1],,[],[CPPFLAGS="$CPPFLAGS $1"])
[
CFLAGS="-g -Wall"
fi