summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-09-14 17:30:22 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-09-14 17:30:22 +0000
commit37b5d78153e68ccf08db8a6eb4e9848f83aec8e3 (patch)
treeff0a244a57ed65f0d2b1cfdf0dd68d0d480475b6
parent0f466f7e1731bfbddfe2580f2ef7421bc4f9bb91 (diff)
downloadrtems-37b5d78153e68ccf08db8a6eb4e9848f83aec8e3.tar.bz2
2001-09-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/canonical-target-name.m4: Use AC_CANONICAL_TARGET instead of AC_CANONICAL_SYSTEM. * aclocal/config-subdirs.m4: Use AS_MKDIR_P instead of mkinstalldirs and mkdir. * aclocal/target.m4: Obsolete RTEMS_OUTPUT_BUILD_SUBDIRS, hack RTEMS_CONFIG_BUILD_SUBDIRS, introduce _RTEMS_OUTPUT_BUILD_SUBDIRS.
-rw-r--r--ChangeLog10
-rw-r--r--aclocal/canonical-target-name.m42
-rw-r--r--aclocal/config-subdirs.m421
-rw-r--r--aclocal/target.m454
-rw-r--r--make/custom/mbx8xx.cfg2
5 files changed, 54 insertions, 35 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d0c1b662b..3449c6ea94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-09-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * aclocal/canonical-target-name.m4: Use AC_CANONICAL_TARGET instead
+ of AC_CANONICAL_SYSTEM.
+ * aclocal/config-subdirs.m4: Use AS_MKDIR_P instead of
+ mkinstalldirs and mkdir.
+ * aclocal/target.m4: Obsolete RTEMS_OUTPUT_BUILD_SUBDIRS,
+ hack RTEMS_CONFIG_BUILD_SUBDIRS, introduce
+ _RTEMS_OUTPUT_BUILD_SUBDIRS.
+
2001-09-13 Joel Sherrill <joel@OARcorp.com>
* missing: Updated to latest version.
diff --git a/aclocal/canonical-target-name.m4 b/aclocal/canonical-target-name.m4
index 0fb1fd777d..1b491c0b15 100644
--- a/aclocal/canonical-target-name.m4
+++ b/aclocal/canonical-target-name.m4
@@ -10,7 +10,7 @@ dnl and we have to fix it for rtems ourselves
AC_DEFUN(RTEMS_CANONICAL_TARGET_CPU,
[
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_TARGET
AC_MSG_CHECKING(rtems target cpu)
case "${target}" in
# hpux unix port should go here
diff --git a/aclocal/config-subdirs.m4 b/aclocal/config-subdirs.m4
index f5f1af3f43..719e44e40f 100644
--- a/aclocal/config-subdirs.m4
+++ b/aclocal/config-subdirs.m4
@@ -15,16 +15,9 @@ AC_DEFUN(_RTEMS_PUSH_BUILDDIR,
[
# _RTEMS_PUSH_BUILDDIR
echo configuring in $1
-## We use mkinstalldirs below as a workaround to mkdir -p not being
-## available everywhere, but us wanting to support deep directories.
case "$srcdir" in
.) ;;
- *)
- if ${ac_aux_dir}/mkinstalldirs $1;
- then :;
- else
- AC_MSG_ERROR([can not create `pwd`/$1])
- fi
+ *) AS_MKDIR_P([$1])
;;
esac
@@ -130,7 +123,11 @@ if test "$no_recursion" != yes; then
esac
done
- test -n "$target_configdirs" && test -d $target_subdir || mkdir $target_subdir
+ if test -n "$target_configdirs" && test -d $target_subdir;
+ then :;
+ else
+ AS_MKDIR_P(["$target_subdir"])
+ fi
for ac_config_dir in $target_configdirs; do
# Do not complain, so a configure script can configure whichever
@@ -207,7 +204,11 @@ if test "$no_recursion" != yes; then
esac
done
- test -n "$host_configdirs" && test -d $host_subdir || mkdir $host_subdir
+ if test -n "$host_configdirs" && test -d $host_subdir;
+ then :;
+ else
+ AS_MKDIR_P(["$host_subdir"])
+ fi
for ac_config_dir in $host_configdirs; do
# Do not complain, so a configure script can configure whichever
diff --git a/aclocal/target.m4 b/aclocal/target.m4
index d72122d4d0..b79698439a 100644
--- a/aclocal/target.m4
+++ b/aclocal/target.m4
@@ -3,63 +3,65 @@ dnl $Id$
## HACK: Work-around to structural issue with RTEMS
## The macros below violate most autoconf and canonicalization standards
AC_DEFUN(RTEMS_CONFIG_BUILD_SUBDIRS,
-[
-define([RTEMS_BUILD_SUBDIRS],
-ifdef([RTEMS_BUILD_SUBDIRS], [RTEMS_BUILD_SUBDIRS ],)[$1])dnl
-build_subdirs="RTEMS_BUILD_SUBDIRS"
-AC_SUBST(build_subdirs)
+[AC_REQUIRE([_RTEMS_OUTPUT_BUILD_SUBDIRS])
+RTEMS_BUILD_SUBDIRS="$RTEMS_BUILD_SUBDIRS [$1]"
])
dnl Derived from automake-1.4's AC_OUTPUT_SUBDIRS
-AC_DEFUN(RTEMS_OUTPUT_BUILD_SUBDIRS,
+AC_DEFUN([_RTEMS_OUTPUT_BUILD_SUBDIRS],
+[AC_CONFIG_COMMANDS([bsp-tools],
[
+# HACK: This is a blantant hack and breaks Canadian crosses
+build_alias="$build_alias"
+host_alias="$build_alias"
if test "$no_recursion" != yes; then
- if test $build_alias != $host_alias; then
+ if test x"$build_alias" != x"$host_alias"; then
target_subdir="$host_alias"
else
target_subdir="."
fi
# Remove --cache-file and --srcdir arguments so they do not pile up.
ac_sub_configure_args=
- ac_prev=
- for ac_arg in $ac_configure_args; do
- if test -n "$ac_prev"; then
- ac_prev=
+ rtems_prev=
+ for rtems_arg in $ac_configure_args; do
+ if test -n "$rtems_prev"; then
+ rtems_prev=
continue
fi
- case "$ac_arg" in
+ case "$rtems_arg" in
-cache-file | --cache-file | --cache-fil | --cache-fi \
| --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
- ac_prev=cache_file ;;
+ rtems_prev=cache_file ;;
-cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
| --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
;;
-srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
- ac_prev=srcdir ;;
+ rtems_prev=srcdir ;;
-srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
;;
--target*) ;;
--build*) ;;
--host*) ;;
- *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
+ *_alias* ) ;; # HACK: Workaround to autoconf passing *_alias
+ *) ac_sub_configure_args="$ac_sub_configure_args $rtems_arg" ;;
esac
done
- for ac_config_dir in $1; do
-
+ for rtems_config_dir in $RTEMS_BUILD_SUBDIRS; do
# Do not complain, so a configure script can configure whichever
# parts of a large source tree are present.
- if test ! -d $srcdir/$ac_config_dir; then
+ if test ! -d $srcdir/$rtems_config_dir; then
continue
fi
- _RTEMS_PUSH_BUILDDIR([$ac_config_dir])
+ _RTEMS_PUSH_BUILDDIR([$rtems_config_dir])
- _RTEMS_SUB_SRCDIR([$ac_config_dir])
+ _RTEMS_SUB_SRCDIR([$rtems_config_dir])
# The recursion is here.
if test -n "$ac_sub_configure"; then
- ac_sub_cache_file=./config.cache
+# ac_sub_cache_file=./config.cache
+ ac_sub_cache_file=/dev/null
_RTEMS_GIVEN_INSTALL
echo "[running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file] --srcdir=$ac_sub_srcdir"
@@ -71,11 +73,17 @@ if test "$no_recursion" != yes; then
--cache-file=$ac_sub_cache_file
then :
else
- AC_MSG_ERROR([$ac_sub_configure failed for $ac_config_dir])
+ AC_MSG_ERROR([$ac_sub_configure failed for $rtems_config_dir])
fi
fi
_RTEMS_POP_BUILDDIR
done
-fi
+fi],
+[
+RTEMS_BUILD_SUBDIRS="$RTEMS_BUILD_SUBDIRS"
])
+])
+
+## FIXME: This is obsolete. Only kept for backward compatibility
+AU_DEFUN([RTEMS_OUTPUT_BUILD_SUBDIRS],[])
diff --git a/make/custom/mbx8xx.cfg b/make/custom/mbx8xx.cfg
index b4566046e1..3e9b74431b 100644
--- a/make/custom/mbx8xx.cfg
+++ b/make/custom/mbx8xx.cfg
@@ -192,7 +192,7 @@ define make-exe
-u atexit -u __vectors -u start \
$(START_FILE) $(LINK_OBJS) --start-group $(LINK_LIBS) --end-group
$(NM) -g -n $(basename $@)_sym.exe> $(basename $@).nm
- $(STRIP) -o $(basename $@).exe $(basename $@)_sym-exe
+ $(STRIP) -O $(basename $@).exe $(basename $@)_sym-exe
$(SIZE) $(basename $@)_sym.exe
endef
else