2005-03-17 Ralf Corsepius <ralf.corsepius@rtems.org>

	* gdb/Makefile.am: Add avr, mips64.
	Cosmetics.
	* gdb/base-gdb.add: Reflect gdb-6.3 not shipping mmalloc.info*.
	* gdb/target-gdb.add: Add support for gcc-6.3's gdbtui.
	* gdb/mkspec.in: Add PATCH-magic.
	Add gdb_suffix.

5 files changed, 38 insertions, 2 deletions

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 8859d67022..79417858dd 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,12 @@
+2005-03-17	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* gdb/Makefile.am: Add avr, mips64.
+	Cosmetics.
+	* gdb/base-gdb.add: Reflect gdb-6.3 not shipping mmalloc.info*.
+	* gdb/target-gdb.add: Add support for gcc-6.3's gdbtui.
+	* gdb/mkspec.in: Add PATCH-magic.
+	Add gdb_suffix.
+
 2005-03-12	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* binutils/binutils.add, binutils/mkspec.in, setup.def:
diff --git a/scripts/gdb/Makefile.am b/scripts/gdb/Makefile.am
index 8ace9ffce0..6c1279460d 100644
--- a/scripts/gdb/Makefile.am
+++ b/scripts/gdb/Makefile.am
@@ -26,13 +26,17 @@ arm-rtems@osversion@-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
 	$(MKSPEC) -cfg $(top_builddir)/setup.cache arm-rtems@osversion@ > $@
 RPM_SPECS_DATA += arm-rtems@osversion@-$(GDBVERS).spec
 
+avr-rtems@osversion@-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKSPEC) -cfg $(top_builddir)/setup.cache avr-rtems@osversion@ > $@
+RPM_SPECS_DATA += avr-rtems@osversion@-$(GDBVERS).spec
+
 h8300-rtems@osversion@-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
 	$(MKSPEC) -cfg $(top_builddir)/setup.cache h8300-rtems@osversion@ > $@
 RPM_SPECS_DATA += h8300-rtems@osversion@-$(GDBVERS).spec
 
-RPM_SPECS_DATA += i386-rtems@osversion@-$(GDBVERS).spec
 i386-rtems@osversion@-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
 	$(MKSPEC) -cfg $(top_builddir)/setup.cache i386-rtems@osversion@ > $@
+RPM_SPECS_DATA += i386-rtems@osversion@-$(GDBVERS).spec
 
 # does not build with 5.2
 # i386-RTEMS-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
@@ -47,6 +51,10 @@ mips-rtems@osversion@-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
 	$(MKSPEC) -cfg $(top_builddir)/setup.cache mips-rtems@osversion@ > $@
 RPM_SPECS_DATA += mips-rtems@osversion@-$(GDBVERS).spec
 
+mips64-rtems@osversion@-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKSPEC) -cfg $(top_builddir)/setup.cache mips64-rtems@osversion@ > $@
+RPM_SPECS_DATA += mips64-rtems@osversion@-$(GDBVERS).spec
+
 mipstx39-rtems@osversion@-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
 	$(MKSPEC) -cfg $(top_builddir)/setup.cache mipstx39-rtems@osversion@ > $@
 RPM_SPECS_DATA += mipstx39-rtems@osversion@-$(GDBVERS).spec
diff --git a/scripts/gdb/base-gdb.add b/scripts/gdb/base-gdb.add
index 3e7cc4a632..ba97543536 100644
--- a/scripts/gdb/base-gdb.add
+++ b/scripts/gdb/base-gdb.add
@@ -17,7 +17,10 @@ This is the base for gdb regardless of target CPU.
 
 %dir %{_prefix}/info
 %doc %{_prefix}/info/gdb.info*
+# FIXME: When had mmalloc.info been removed?
+%if "%{gdb_version}" < "6.3"
 %doc %{_prefix}/info/mmalloc.info*
+%endif
 # FIXME: When had gdbint and stabs been introduced?
 %if "%{gdb_version}" >= "5.0"
 %doc %{_prefix}/info/gdbint.info*
diff --git a/scripts/gdb/mkspec.in b/scripts/gdb/mkspec.in
index 39cfa6df0f..7aac46d811 100644
--- a/scripts/gdb/mkspec.in
+++ b/scripts/gdb/mkspec.in
@@ -48,7 +48,16 @@ target_alias=$1
 
 . ./$CFG
 
-sed -e "s%@Release\@%${gdb_rpm_release}%g" \
+patchn=-1
+if test -n "${gdb_patch_version}"; then
+patchn=`expr $patchn + 1`
+PATCH1="Patch${patchn}: gdb-${gdb_version}-rtems-${gdb_patch_version}.diff"
+PATCH2="%patch${patchn} -p0"
+fi
+
+sed -e "s,@PATCH1\@,${PATCH1}," \
+    -e "s,@PATCH2\@,${PATCH2}," \
+    -e "s%@Release\@%${gdb_rpm_release}%g" \
     -e "s,@rpm_build_root\@,${rpm_build_root},g" \
     -e "s%@prefix\@%@prefix@%g" \
     -e "s%@target_alias\@%${target_alias}%g" \
@@ -57,5 +66,6 @@ sed -e "s%@Release\@%${gdb_rpm_release}%g" \
     -e "s%@osversion\@%@osversion@%g" \
     -e "s%@gdb_version\@%${gdb_version}%g" \
     -e "s%@gdb_patch_version\@%${gdb_patch_version}%g" \
+    -e "s%@gdb_suffix\@%${gdb_suffix}%g" \
     -e "s%@extra_configure_arguments\@%${extra_configure_arguments}%g" \
 < ${specsrc}
diff --git a/scripts/gdb/target-gdb.add b/scripts/gdb/target-gdb.add
index eff9807ea0..ad14e44c34 100644
--- a/scripts/gdb/target-gdb.add
+++ b/scripts/gdb/target-gdb.add
@@ -19,6 +19,9 @@ This is the GNU gdb for RTEMS targetting %{gdb_target}.
 %if "%_sim" == "1"
 %doc %{_prefix}/man/man1/%{gdb_target}-run.1*
 %endif
+%if "%{gdb_version}" >= "6.3"
+%{_prefix}/man/man1/%{gdb_target}-gdbtui.1*
+%endif
 
 %dir %{_prefix}/bin
 %{_prefix}/bin/%{gdb_target}-gdb%{_exeext}
@@ -28,3 +31,6 @@ This is the GNU gdb for RTEMS targetting %{gdb_target}.
 %if "%{gdb_target}" == "sparc-rtems@osversion@"
 %{_prefix}/bin/%{gdb_target}-sis%{_exeext}
 %endif
+%if "%{gdb_version}" >= "6.3"
+%{_prefix}/bin/%{gdb_target}-gdbtui
+%endif