From 19f4540ee57bb66d35d788b3fd04ae6e32c97533 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Fri, 2 Jun 2000 20:13:51 +0000
Subject: [PATCH] Updated patch versions.

---
 scripts/Makefile.am  |  2 +-
 scripts/buildall.in  | 24 +++++++++++++++++++-----
 scripts/configure.in |  2 +-
 scripts/setup.def    |  2 +-
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index b3137e28f5..48ca7bb7a0 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -13,7 +13,7 @@ TEMPLATES =
 
 noinst_DATA = setup.def $(TEMPLATES)
 
-EXTRA_DIST = $(noinst_DATA) $(noinst_SCRIPTS)
+EXTRA_DIST = config.sub config.guess $(noinst_DATA) $(noinst_SCRIPTS)
 
 CONFIGURE_DEPENDENCIES = setup.cache
 setup.cache: setup.def
diff --git a/scripts/buildall.in b/scripts/buildall.in
index e2221043b9..cac75f6d4e 100755
--- a/scripts/buildall.in
+++ b/scripts/buildall.in
@@ -13,13 +13,26 @@ usage()
 {
   echo "$0 [options] <target_alias>"
   echo "  options:"
+  echo "    -b                  -- build binutils"
+  echo "    -g                  -- build gcc/newlib"
+  echo "    -d                  -- build gdb"
+  echo "    -t                  -- enable test/debug mode"
   echo "    -cfg <setup.cache>"
   echo "    -o <rpm-spec-dir>"
   exit 1 ;
 }
 
+testing=no
+do_binutils=no
+do_gccnewlib=no
+do_gdb=no
+
 while test $# -ge 1; do
   case $1 in
+    -b) do_binutils=yes  ; shift;;
+    -g) do_gccnewlib=yes ; shift;; 
+    -d) do_gdb=yes       ; shift;; 
+    -t) do_test=yes      ; shift;; 
     -cfg)
       test $# -ge 2 || usage
       shift
@@ -43,6 +56,12 @@ while test $# -ge 1; do
   esac
 done
 
+if test ${do_binutils} = no -a ${do_gccnewlib} = no -a ${do_gdb} = no ; then
+  echo "You must request building binutils, gcc/newlib, or gdb."
+  usage
+fi
+
+
 # This is the full list .. hppa1.1 does not build now.
 #ALL_TARGETS="hppa1.1-rtems i386-rtems i960-rtems m68k-rtems \
 #  m68k-rtemself mips64orion-rtems \
@@ -63,11 +82,6 @@ newlib=${newlib_version}
 # also use binutils_rpm_release
 buildroot=/tmp
 
-testing=no
-do_binutils=yes
-do_gccnewlib=yes
-do_gdb=yes
-
 #
 #  Now get started
 #
diff --git a/scripts/configure.in b/scripts/configure.in
index c81a6d85cb..e76e7163a4 100644
--- a/scripts/configure.in
+++ b/scripts/configure.in
@@ -1,7 +1,7 @@
 ## $Id$
 
 AC_INIT(binutils)
-AM_INIT_AUTOMAKE(rtems-scripts,20000526-0,no)
+AM_INIT_AUTOMAKE(rtems-scripts,20000531-0,no)
 
 AC_EXEEXT
 
diff --git a/scripts/setup.def b/scripts/setup.def
index ccbef74e56..a971c58b20 100644
--- a/scripts/setup.def
+++ b/scripts/setup.def
@@ -9,7 +9,7 @@ binutils_rpm_release=1
 newlib_version=1.8.2
 newlib_patch_version=20000525
 gcc_version=2.95.2
-gcc_patch_version=20000525
+gcc_patch_version=20000531
 gccnewlib_rpm_release=7
 gdb_version=4.18
 gdb_patch_version=20000524