Merger from rtems-4-6-branch.

Makefile.am

@@ -8,7 +8,7 @@
 
 ACLOCAL_AMFLAGS = -I aclocal
 
-SUBDIRS = tools make $(BUILD_SUBDIRS) $(HOST_SUBDIRS) $(TARGET_SUBDIRS)
+SUBDIRS = make $(build_SUBDIRS) $(host_SUBDIRS) $(target_SUBDIRS)
 
 AUTOMAKE_FILES = automake/compile.am automake/host.am automake/lib.am \
     automake/local.am automake/subdirs.am \

bootstrap

@@ -12,9 +12,6 @@
 # to be run from the toplevel directory of RTEMS'
 # source tree
 
-AUTOCONF_VERS=2\.57
-AUTOMAKE_VERS=1\.7\.2
-
 progname=`basename $0`
 top_srcdir=`dirname $0`
 
@@ -98,29 +95,27 @@ generate)
   AUTOCONF=${AUTOCONF-autoconf}
   if test -z "$AUTOCONF"; then
     echo "You must have autoconf installed to run $program"
+    exit 1
   fi
-  if test -z "`$AUTOCONF --version 2>/dev/null | grep -e \" $AUTOCONF_VERS\"`"; then
-cat << EOF
-RTEMS requires autoconf version $AUTOCONF_VERS.
-
-You are trying to use $AUTOCONF which does not seem to be sufficient
-EOF
-  exit 1
+  
+  AUTOHEADER=${AUTOHEADER-autoheader}
+  if test -z "$AUTOHEADER"; then
+    echo "You must have autoconf installed to run $program"
+    exit 1
   fi
   
   AUTOMAKE=${AUTOMAKE-automake}
   if test -z "$AUTOMAKE"; then
     echo "You must have automake installed to run $program"
-  fi
-  if test -z "`$AUTOMAKE --version 2>/dev/null | grep -e \" $AUTOMAKE_VERS\"`"; then
-cat << EOF
-RTEMS requires automake version $AUTOMAKE_VERS.
-
-You are trying to use $AUTOMAKE which does not seem to be sufficient
-EOF
-  exit 1
+    exit 1
   fi
   
+  ACLOCAL=${ACLOCAL-aclocal}
+  if test -z "$ACLOCAL"; then
+    echo "You must have automake installed to run $program"
+    exit 1
+  fi
+
   case $top_srcdir in
   /* ) aclocal_dir=$top_srcdir
     ;;
@@ -139,14 +134,14 @@ EOF
     pat="s,\$(RTEMS_TOPdir),${aclocal_dir},g"
     aclocal_args=`grep '^[ ]*ACLOCAL_AMFLAGS' Makefile.am | \
       sed -e 's%.*ACLOCAL_AMFLAGS.*\=[ ]*%%g' -e $pat ` ;
-    test "$verbose" = "-v" && echo "aclocal $aclocal_args"
-    aclocal $aclocal_args;
-    test -n "`grep CONFIG_HEADER ${configure}`" && autoheader \
-      && test "$verbose" = "-v" && echo "autoheader";
-    test -n "`grep RTEMS_BSP_CONFIGURE ${configure}`" && autoheader \
-      && test "$verbose" = "-v" && echo "autoheader";
-    test -f Makefile.am && automake -a -c $verbose ;
-    autoconf;
+    test "$verbose" = "-v" && echo "${ACLOCAL} $aclocal_args"
+    ${ACLOCAL} $aclocal_args;
+    test -n "`grep CONFIG_HEADER ${configure}`" && ${AUTOHEADER} \
+      && test "$verbose" = "-v" && echo "${AUTOHEADER}";
+    test -n "`grep RTEMS_BSP_CONFIGURE ${configure}`" && ${AUTOHEADER} \
+      && test "$verbose" = "-v" && echo "${AUTOHEADER}";
+    test -f Makefile.am && ${AUTOMAKE} -a -c $verbose ;
+    ${AUTOCONF};
     test -f Makefile.am && test -n "`grep 'stamp-h\.in' Makefile.in`" \
       && echo timestamp > stamp-h.in
   )

config-ml.in

@@ -217,7 +217,8 @@ arm-*-rtems*)
 	  multidirs=""
 	  for x in ${old_multidirs}; do
 	    case "${x}" in
-	      *thumb*) : ;;
+	      *thumb* ) : ;;
+	      *fpu* ) : ;;
 	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
@@ -228,6 +229,8 @@ sh-*-rtems*)
 	  multidirs=""
 	  for x in ${old_multidirs}; do
 	    case "${x}" in
+	      *ml ) : ;;
+	      *ml/m2 ) : ;;
 	      *m3e*) : ;;
 	      *m4-single*) : ;;
 	      m4*) : ;;

configure.ac

@@ -49,17 +49,16 @@ AC_MSG_WARN([]
 fi
 
 ## NOTES:
-## The tools/*-directories situation is unclear
 ## * tools/build are host-native tools to be installed on the host.
 ## * tools/cpu are host-native or host-cross-target-tools
-## * tools/update are build-host-native tools
 
-# these tools are built for the build environment
-#
-RTEMS_BUILD_CONFIG_SUBDIRS([tools/update])
+RTEMS_BUILD_CONFIG_SUBDIRS([tools/build])
+RTEMS_BUILD_CONFIG_SUBDIRS([tools/cpu])
 
+# Some BSPs carelessly apply these tools as build-tools
+AS_IF([test $host != $build],[
 RTEMS_HOST_CONFIG_SUBDIRS([tools/build])
-RTEMS_HOST_CONFIG_SUBDIRS([tools/cpu])
+])
 
 AS_IF([test x"${enable_docs}" = x"yes"],
   [RTEMS_HOST_CONFIG_SUBDIRS([doc])])
@@ -70,7 +69,6 @@ AS_IF([test x"$enable_multilib" = x"yes"],[
 RTEMS_TARGET_CONFIG_SUBDIRS([c])
 
 AC_CONFIG_FILES([Makefile
-tools/Makefile
 make/Makefile
 make/custom/Makefile
 ])