|
yann@96
|
1 |
Status: committed upstream after 6.3.
|
|
yann@96
|
2 |
|
|
yann@96
|
3 |
Fix a crash triggered by Kylix libraries.
|
|
yann@96
|
4 |
|
|
yann@96
|
5 |
2004-12-06 Daniel Jacobowitz <dan@debian.org>
|
|
yann@96
|
6 |
|
|
yann@96
|
7 |
Suggested by Fergal Daly <fergal@esatclear.ie>:
|
|
yann@96
|
8 |
* simple.c (simple_dummy_multiple_definition): New function.
|
|
yann@96
|
9 |
(bfd_simple_get_relocated_section_contents): Use it.
|
|
yann@96
|
10 |
|
|
yann@96
|
11 |
Index: src/bfd/simple.c
|
|
yann@96
|
12 |
===================================================================
|
|
yann@96
|
13 |
RCS file: /cvs/src/src/bfd/simple.c,v
|
|
yann@96
|
14 |
retrieving revision 1.19
|
|
yann@96
|
15 |
retrieving revision 1.20
|
|
yann@96
|
16 |
Index: gdb-6.3/bfd/simple.c
|
|
yann@96
|
17 |
===================================================================
|
|
yann@96
|
18 |
--- gdb-6.3.orig/bfd/simple.c 2004-09-24 03:07:19.000000000 -0400
|
|
yann@96
|
19 |
+++ gdb-6.3/bfd/simple.c 2004-12-08 18:25:58.415216808 -0500
|
|
yann@96
|
20 |
@@ -78,6 +78,19 @@ simple_dummy_unattached_reloc (struct bf
|
|
yann@96
|
21 |
return TRUE;
|
|
yann@96
|
22 |
}
|
|
yann@96
|
23 |
|
|
yann@96
|
24 |
+static bfd_boolean
|
|
yann@96
|
25 |
+simple_dummy_multiple_definition (struct bfd_link_info *link_info ATTRIBUTE_UNUSED,
|
|
yann@96
|
26 |
+ const char *name ATTRIBUTE_UNUSED,
|
|
yann@96
|
27 |
+ bfd *obfd ATTRIBUTE_UNUSED,
|
|
yann@96
|
28 |
+ asection *osec ATTRIBUTE_UNUSED,
|
|
yann@96
|
29 |
+ bfd_vma oval ATTRIBUTE_UNUSED,
|
|
yann@96
|
30 |
+ bfd *nbfd ATTRIBUTE_UNUSED,
|
|
yann@96
|
31 |
+ asection *nsec ATTRIBUTE_UNUSED,
|
|
yann@96
|
32 |
+ bfd_vma nval ATTRIBUTE_UNUSED)
|
|
yann@96
|
33 |
+{
|
|
yann@96
|
34 |
+ return TRUE;
|
|
yann@96
|
35 |
+}
|
|
yann@96
|
36 |
+
|
|
yann@96
|
37 |
struct saved_output_info
|
|
yann@96
|
38 |
{
|
|
yann@96
|
39 |
bfd_vma offset;
|
|
yann@96
|
40 |
@@ -172,6 +185,7 @@ bfd_simple_get_relocated_section_content
|
|
yann@96
|
41 |
callbacks.reloc_overflow = simple_dummy_reloc_overflow;
|
|
yann@96
|
42 |
callbacks.reloc_dangerous = simple_dummy_reloc_dangerous;
|
|
yann@96
|
43 |
callbacks.unattached_reloc = simple_dummy_unattached_reloc;
|
|
yann@96
|
44 |
+ callbacks.multiple_definition = simple_dummy_multiple_definition;
|
|
yann@96
|
45 |
|
|
yann@96
|
46 |
memset (&link_order, 0, sizeof (link_order));
|
|
yann@96
|
47 |
link_order.next = NULL;
|