On some platforms, upstream provides a dummy (no-op) version of
convert_addresses in adaint.c, which collides with the good version
provided by ada-symbolic-tracebacks.dpatch in convert_addresses.c.
Remove the dummy version.
Apply this patch on top of patch #2; it does not collide with any of
my later patches.
--
Ludovic Brenta.
Index: patches/ada-symbolic-tracebacks.dpatch
===================================================================
RCS file: /var/lib/cvs/gcc-debian/F-AA448E5F3264338CABEFC2B93B6FAFAA.dpatch,v
retrieving revision 1.6
diff -u -r1.6 patches/ada-symbolic-tracebacks.dpatch
--- patches/ada-symbolic-tracebacks.dpatch 12 Apr 2006 07:34:48 -0000
1.6
+++ patches/ada-symbolic-tracebacks.dpatch 23 Apr 2006 12:46:01 -0000
@@ -1,6 +1,7 @@
#! /bin/sh -e
-# DP: - Enable support for symbolic tracebacks in exceptions.
+# DP: - Enable support for symbolic tracebacks in exceptions (delete the dummy
+# DP: convert_addresses from adaint.c, and provide a real one separately.)
dir=
if [ $# -eq 3 -a "$2" = '-d' ]; then
@@ -40,6 +41,42 @@
Ludovic Brenta.
+--- gcc/ada/adaint.c~ 2005-11-15 14:52:31.000000000 +0100
++++ gcc/ada/adaint.c 2006-04-23 14:43:55.000000000 +0200
+@@ -2541,33 +2541,6 @@
+ }
+ #endif
+
+-#if defined (CROSS_COMPILE) \
+- || (! ((defined (sparc) || defined (i386)) && defined (sun) \
+- && defined (__SVR4)) \
+- && ! (defined (linux) && (defined (i386) || defined (__x86_64__))) \
+- && ! (defined (linux) && defined (__ia64__)) \
+- && ! defined (__FreeBSD__) \
+- && ! defined (__hpux__) \
+- && ! defined (__APPLE__) \
+- && ! defined (_AIX) \
+- && ! (defined (__alpha__) && defined (__osf__)) \
+- && ! defined (__MINGW32__) \
+- && ! (defined (__mips) && defined (__sgi)))
+-
+-/* Dummy function to satisfy g-trasym.o. See the preprocessor conditional
+- just above for a list of native platforms that provide a non-dummy
+- version of this procedure in libaddr2line.a. */
+-
+-void
+-convert_addresses (void *addrs ATTRIBUTE_UNUSED,
+- int n_addr ATTRIBUTE_UNUSED,
+- void *buf ATTRIBUTE_UNUSED,
+- int *len ATTRIBUTE_UNUSED)
+-{
+- *len = 0;
+-}
+-#endif
+-
+ #if defined (_WIN32)
+ int __gnat_argument_needs_quote = 1;
+ #else
--- gcc/ada/g-trasym.adb~ Thu Oct 24 11:02:18 2002
+++ gcc/ada/g-trasym.adb Fri Jul 4 16:16:30 2003
@@ -33,16 +33,16 @@
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
