The unified diff between revisions [054c6cba..] and [43419105..] is displayed below. It can also be downloaded as a raw diff.
#
#
# add_file "debian/326497.patch"
# content [41a8d04d5baed893a3903baec216b913a648eb69]
#
# add_file "debian/326499.patch"
# content [b3e0dcd097fac4be9d92a4ed07985d1923605518]
#
# patch "debian/README.Debian"
# from [15b15cdebc728437d675fc41881c94deeaa22947]
# to [1dfba862a2ecfbee9f4c295596bf454b8f8ac8e4]
#
# patch "debian/changelog"
# from [65e1848dd8a0d9d965edc5e25329ba9875ca47eb]
# to [bcd7c37a3df0666e06272bcb5b083c4236dbb480]
#
# patch "debian/control"
# from [6f63e2e72f89731baefa8dad522964d4e598cfb9]
# to [e65ae92458ef8339f40aa3c7e00bee772e7958f1]
#
# patch "debian/rules"
# from [f2a234941d1850c2dc882e960b28bdca00995ce5]
# to [dfda2cdc5d9e82a194df7cf73be8fac22d8e5a7b]
#
============================================================
--- debian/326497.patch 41a8d04d5baed893a3903baec216b913a648eb69
+++ debian/326497.patch 41a8d04d5baed893a3903baec216b913a648eb69
@@ -0,0 +1,31 @@
+This should fix the FTBFS (there might be a better way to get the same
+result, though)
+
+--
+Frank Lichtenheld <djpig@debian.org>
+www: http://www.djpig.de/
+
+diff -ur gnat-gdb-5.3.gnat.0.0.20030225.bak/bfd/coff-alpha.c gnat-gdb-5.3.gnat.0.0.20030225/bfd/coff-alpha.c
+--- bfd/coff-alpha.c~ 2003-01-16 09:44:56.000000000 +0000
++++ bfd/coff-alpha.c 2005-09-04 20:33:03.000000000 +0000
+@@ -1452,7 +1452,7 @@
+ amt = sizeof (struct ecoff_section_tdata);
+ lita_sec_data = ((struct ecoff_section_tdata *)
+ bfd_zalloc (input_bfd, amt));
+- ecoff_section_data (input_bfd, lita_sec) = lita_sec_data;
++ ecoff_section_data_lvalue (input_bfd, lita_sec) = lita_sec_data;
+ }
+
+ if (lita_sec_data->gp != 0)
+diff -ur gnat-gdb-5.3.gnat.0.0.20030225.bak/bfd/libecoff.h gnat-gdb-5.3.gnat.0.0.20030225/bfd/libecoff.h
+--- bfd/libecoff.h~ 2003-01-16 09:45:25.000000000 +0000
++++ bfd/libecoff.h 2005-09-04 19:48:58.000000000 +0000
+@@ -223,6 +223,8 @@
+ /* An accessor macro for the ecoff_section_tdata structure. */
+ #define ecoff_section_data(abfd, sec) \
+ ((struct ecoff_section_tdata *) (sec)->used_by_bfd)
++#define ecoff_section_data_lvalue(abfd, sec) \
++ ((sec)->used_by_bfd)
+
+ /* ECOFF linker hash table entries. */
+
============================================================
--- debian/326499.patch b3e0dcd097fac4be9d92a4ed07985d1923605518
+++ debian/326499.patch b3e0dcd097fac4be9d92a4ed07985d1923605518
@@ -0,0 +1,38 @@
+This patch should fix the build on mipsel but I didn't tested it yet...
+
+--
+Frank Lichtenheld.
+
+diff -ur gnat-gdb-5.3.gnat.0.0.20030225/sim/mips/interp.c gnat-gdb-5.3.gnat.0.0.20030225.new/sim/mips/interp.c
+--- sim/mips/interp.c~ 2003-01-16 10:52:51.000000000 +0100
++++ sim/mips/interp.c 2005-09-04 23:46:06.045197120 +0200
+@@ -2323,7 +2323,7 @@
+ sim_io_eprintf (sd, "mips-core: %d byte %s to unmapped address 0x%lx at 0x%lx\n",
+ nr_bytes, copy,
+ (unsigned long) addr, (unsigned long) ip);
+- COP0_BADVADDR = addr;
++ COP0_BADVADDR_LV = addr;
+ SignalExceptionDataReference();
+ break;
+
+@@ -2331,7 +2331,7 @@
+ sim_io_eprintf (sd, "mips-core: %d byte %s to unaligned address 0x%lx at 0x%lx\n",
+ nr_bytes, copy,
+ (unsigned long) addr, (unsigned long) ip);
+- COP0_BADVADDR = addr;
++ COP0_BADVADDR_LV = addr;
+ if(transfer == read_transfer)
+ SignalExceptionAddressLoad();
+ else
+diff -ur gnat-gdb-5.3.gnat.0.0.20030225/sim/mips/sim-main.h gnat-gdb-5.3.gnat.0.0.20030225.new/sim/mips/sim-main.h
+--- sim/mips/sim-main.h~ 2003-01-16 11:40:16.000000000 +0100
++++ sim/mips/sim-main.h 2005-09-04 23:45:30.108660304 +0200
+@@ -384,6 +384,7 @@
+ unsigned_word cop0_gpr[NR_COP0_GPR];
+ #define COP0_GPR ((CPU)->cop0_gpr)
+ #define COP0_BADVADDR ((unsigned32)(COP0_GPR[8]))
++#define COP0_BADVADDR_LV (COP0_GPR[8])
+
+ /* While space is allocated for the floating point registers in the
+ main registers array, they are stored separatly. This is because
+
============================================================
--- debian/README.Debian 15b15cdebc728437d675fc41881c94deeaa22947
+++ debian/README.Debian 1dfba862a2ecfbee9f4c295596bf454b8f8ac8e4
@@ -8,17 +8,17 @@ changed from STABS to DWARF2. This impl
Starting with GCC 3.4, the default format for debugging information
changed from STABS to DWARF2. This implies that Ada programs compiled
-with gnat-3.4 will use DWARF2 by default. GDB 5.3 does not support
-this format; if you want to use it to debug Ada programs compiled with
-gnat-3.4, you must pass the option -gstabs+ to gcc when compiling.
-This causes GCC to use the older format for debugging information.
-For example:
+with gnat-3.4 or gnat-4.0 will use DWARF2 by default. GDB 5.3 does
+not support this format; if you want to use it to debug Ada programs
+compiled with gnat-3.4 or gnat-4.0, you must pass the option -gstabs+
+to gcc when compiling. This causes GCC to use the older format for
+debugging information. For example:
$ gnatmake -g -gstabs+ program
$ gnatgdb program
-The Ada compilers in packages gnat, gnat-3.2 and gnat-3.3 work out of
-the box without the need for -gstabs+.
+The Ada compilers in packages gnat and gnat-3.3 work out of the box
+without the need for -gstabs+.
GDB 5.3 also does not support the New POSIX Thread Library (NPTL),
which is enabled by default on linux >= 2.6 and glibc >= 2.3. If you
@@ -28,5 +28,5 @@ $ LD_ASSUME_KERNEL=2.4.1 gnatgdb program
$ gnatmake -g program
$ LD_ASSUME_KERNEL=2.4.1 gnatgdb program
---
-Ludovic Brenta, Sun, 3 Oct 2004 19:37:27 +0200.
+--
+Ludovic Brenta Mon, 5 Sep 2005 21:12:22 +0200
============================================================
--- debian/changelog 65e1848dd8a0d9d965edc5e25329ba9875ca47eb
+++ debian/changelog bcd7c37a3df0666e06272bcb5b083c4236dbb480
@@ -1,3 +1,20 @@
+gnat-gdb (5.3.gnat.0.0.20030225-10) unstable; urgency=low
+
+ * Frank Lichtenheld contributed several fixes:
+ - debian/326497.patch: new. Fix FTBFS with gcc-4.0 on alpha.
+ - debian/326499.patch: new. Fix FTBFS with gcc-4.0 on mips and mipsel.
+ - Closes: #326497, #326499.
+
+ * He also reported a future FTBFS:
+ - debian/control: do not use architecture qualifiers in the Recommends
+ field; use variable ${recommended:gnat} instead.
+ - debian/rules: fill the variable depending on the target platform.
+ - Closes: #326667.
+
+ * debian/control: build-depend on gettext.
+
+ -- Ludovic Brenta <ludovic@ludovic-brenta.org> Mon, 5 Sep 2005 20:40:45 +0200
+
gnat-gdb (5.3.gnat.0.0.20030225-9) unstable; urgency=low
* Change maintainer's email address.
============================================================
--- debian/control 6f63e2e72f89731baefa8dad522964d4e598cfb9
+++ debian/control e65ae92458ef8339f40aa3c7e00bee772e7958f1
@@ -3,12 +3,12 @@ Uploaders: Matthias Klose <doko@debian.o
Priority: optional
Maintainer: Ludovic Brenta <ludovic@ludovic-brenta.org>
Uploaders: Matthias Klose <doko@debian.org>
-Build-Depends: debhelper (>> 4.1.0), libncurses5-dev, bison, texinfo
+Build-Depends: debhelper (>> 4.1.0), libncurses5-dev, bison, texinfo, gettext
Standards-Version: 3.6.1.1
Package: gnat-gdb
Architecture: alpha amd64 arm i386 ia64 mips mipsel powerpc s390 sparc
-Recommends: gnat [i386 powerpc sparc] | gnat-3.4 [alpha amd64 arm ia64 mips mipsel s390], gnat-gdb-doc
+Recommends: ${recommended:gnat}, gnat-gdb-doc
Depends: ${shlibs:Depends} ${misc:Depends}
Description: Ada-aware version of GDB
This is a version of GDB 5.3 that allows debugging of programs written in Ada
@@ -16,9 +16,9 @@ Description: Ada-aware version of GDB
the company behind GNAT. Note that ACT considers this version to be
beta-quality.
.
- You can use this debugger against programs compiled with gnat, gnat-3.2,
- gnat-3.3 or gnat-3.4 (but see the README.Debian for caveats related to
- gnat-3.4).
+ You can use this debugger against programs compiled with gnat, gnat-3.3,
+ gnat-3.4, or gnat-4.0 (but see the README.Debian for caveats related to
+ gnat-3.4 and gnat-4.0).
Package: gnat-gdb-doc
Architecture: all
============================================================
--- debian/rules f2a234941d1850c2dc882e960b28bdca00995ce5
+++ debian/rules dfda2cdc5d9e82a194df7cf73be8fac22d8e5a7b
@@ -10,7 +10,17 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-arch
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+ifneq (,$(findstring $(ARCH),i386 powerpc sparc))
+ recommended_gnat := gnat
+endif
+ifneq (,$(findstring $(ARCH),alpha amd64 hppa ia64 mips mipsel s390))
+ recommended_gnat := gnat-3.4
+endif
+ifneq (,$(findstring $(ARCH),arm m68k))
+ recommended_gnat :=
+endif
patch-stamp:
for i in debian/*.patch; do \
@@ -96,7 +106,7 @@ binary-arch: build-stamp install
dh_fixperms
dh_installdeb
dh_shlibdeps
- dh_gencontrol
+ dh_gencontrol -Vrecommended:gnat=$(recommended_gnat)
dh_md5sums
dh_builddeb