aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>1996-05-03 17:48:41 +0000
committerIan Lance Taylor <ian@airs.com>1996-05-03 17:48:41 +0000
commit4ad842aa28950c3422d5e2927eef83195a232642 (patch)
treed67e4d38838b49f559c3ab04c8c4fd00d9d9d49b /bfd
parent13d7cbe208049295ef133d3a5365fc9caf09dd55 (diff)
downloadgdb-4ad842aa28950c3422d5e2927eef83195a232642.zip
gdb-4ad842aa28950c3422d5e2927eef83195a232642.tar.gz
gdb-4ad842aa28950c3422d5e2927eef83195a232642.tar.bz2
* cofflink.c (_bfd_coff_link_input_bfd): Correct setting of
last_bf_index.
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/cofflink.c84
2 files changed, 77 insertions, 12 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index fe4e120..ba212b8 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+Fri May 3 10:47:41 1996 Ian Lance Taylor <ian@cygnus.com>
+
+ * cofflink.c (_bfd_coff_link_input_bfd): Correct setting of
+ last_bf_index.
+
Wed May 1 18:39:32 1996 Doug Evans <dje@canuck.cygnus.com>
* coffcode.h (coff_write_object_contents): In comdat section lookup,
diff --git a/bfd/cofflink.c b/bfd/cofflink.c
index 98753f0..e100025 100644
--- a/bfd/cofflink.c
+++ b/bfd/cofflink.c
@@ -81,6 +81,7 @@ _bfd_coff_link_hash_table_init (table, abfd, newfunc)
struct bfd_hash_table *,
const char *));
{
+ table->stab_info = NULL;
return _bfd_link_hash_table_init (&table->root, abfd, newfunc);
}
@@ -412,6 +413,46 @@ coff_link_add_symbols (abfd, info)
sym_hash += sym.n_numaux + 1;
}
+ /* If this is a non-traditional, non-relocateable link, try to
+ optimize the handling of any .stab/.stabstr sections. */
+ if (! info->relocateable
+ && ! info->traditional_format
+ && info->hash->creator->flavour == bfd_get_flavour (abfd)
+ && (info->strip != strip_all && info->strip != strip_debugger))
+ {
+ asection *stab, *stabstr;
+
+ stab = bfd_get_section_by_name (abfd, ".stab");
+ if (stab != NULL)
+ {
+ stabstr = bfd_get_section_by_name (abfd, ".stabstr");
+
+ if (stabstr != NULL)
+ {
+ struct coff_link_hash_table *table;
+ struct coff_section_tdata *secdata;
+
+ secdata = coff_section_data (abfd, stab);
+ if (secdata == NULL)
+ {
+ stab->used_by_bfd =
+ (PTR) bfd_zalloc (abfd,
+ sizeof (struct coff_section_tdata));
+ if (stab->used_by_bfd == NULL)
+ return false;
+ secdata = coff_section_data (abfd, stab);
+ }
+
+ table = coff_hash_table (info);
+
+ if (! _bfd_link_section_stabs (abfd, &table->stab_info,
+ stab, stabstr,
+ &secdata->stab_info))
+ return false;
+ }
+ }
+ }
+
return true;
}
@@ -820,6 +861,13 @@ _bfd_coff_final_link (abfd, info)
finfo.section_info = NULL;
}
+ /* If we have optimized stabs strings, output them. */
+ if (coff_hash_table (info)->stab_info != NULL)
+ {
+ if (! _bfd_write_stab_strings (abfd, &coff_hash_table (info)->stab_info))
+ return false;
+ }
+
/* Write out the string table. */
if (obj_raw_syment_count (abfd) != 0)
{
@@ -1652,8 +1700,9 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
be updated with the symbol number of the
next .bf symbol. */
finfo->last_bf = *auxp;
- finfo->last_bf_index = ((outsym - finfo->outsyms)
- / osymesz);
+ finfo->last_bf_index = (((outsym - finfo->outsyms)
+ / osymesz)
+ + syment_base);
}
}
}
@@ -1825,6 +1874,7 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
for (o = input_bfd->sections; o != NULL; o = o->next)
{
bfd_byte *contents;
+ struct coff_section_tdata *secdata;
if (! o->linker_mark)
{
@@ -1832,7 +1882,8 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
continue;
}
- if ((o->flags & SEC_HAS_CONTENTS) == 0)
+ if ((o->flags & SEC_HAS_CONTENTS) == 0
+ || (o->_raw_size == 0 && (o->flags & SEC_RELOC) == 0))
{
if ((o->flags & SEC_RELOC) != 0
&& o->reloc_count != 0)
@@ -1848,9 +1899,9 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
continue;
}
- if (coff_section_data (input_bfd, o) != NULL
- && coff_section_data (input_bfd, o)->contents != NULL)
- contents = coff_section_data (input_bfd, o)->contents;
+ secdata = coff_section_data (input_bfd, o);
+ if (secdata != NULL && secdata->contents != NULL)
+ contents = secdata->contents;
else
{
if (! bfd_get_section_contents (input_bfd, o, finfo->contents,
@@ -1977,12 +2028,21 @@ _bfd_coff_link_input_bfd (finfo, input_bfd)
}
/* Write out the modified section contents. */
- if (! bfd_set_section_contents (output_bfd, o->output_section,
- contents, o->output_offset,
- (o->_cooked_size != 0
- ? o->_cooked_size
- : o->_raw_size)))
- return false;
+ if (secdata == NULL || secdata->stab_info == NULL)
+ {
+ if (! bfd_set_section_contents (output_bfd, o->output_section,
+ contents, o->output_offset,
+ (o->_cooked_size != 0
+ ? o->_cooked_size
+ : o->_raw_size)))
+ return false;
+ }
+ else
+ {
+ if (! _bfd_write_section_stabs (output_bfd, o, &secdata->stab_info,
+ contents))
+ return false;
+ }
}
if (! finfo->info->keep_memory)