This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Re: PATCH: Don't display bits only used for BFD in abfd->flags.
On Fri, Nov 05, 2010 at 08:43:35PM -0700, H.J. Lu wrote:
> bfd_make_section_anyway_with_flags uses section name as ash value
> for section hash table. If you want to do this, you should change the section
> name before calling bfd_make_section_anyway. Otherwise, linker may
> run into strange problems.
Yes, that could be a problem. Cured like this.
bfd/
* hash.c (bfd_hash_hash): Extract from..
(bfd_hash_lookup): ..here.
(bfd_hash_rename): New function.
* section.c (bfd_rename_section): New function.
* bfd-in.h (bfd_hash_rename): Declare.
* bfd-in2.h: Regenerate.
* elf.c (_bfd_elf_make_section_from_shdr): Rename input sections
when compressing or decompressing. Don't assert name match.
* elf64-hppa.c (get_reloc_section): Don't assert name match.
* elfxx-ia64.c (get_reloc_section): Likewise.
binutils/
* objcopy.c (copy_main): No need to rename sections when compressing
or decompressing.
binutils/testsuite/
* binutils-all/objdump.W: Adjust expected result for debug section
rename.
Index: bfd/bfd-in.h
===================================================================
RCS file: /cvs/src/src/bfd/bfd-in.h,v
retrieving revision 1.151
diff -u -p -r1.151 bfd-in.h
--- bfd/bfd-in.h 21 Apr 2010 16:32:26 -0000 1.151
+++ bfd/bfd-in.h 8 Nov 2010 01:12:29 -0000
@@ -404,6 +404,10 @@ extern struct bfd_hash_entry *bfd_hash_l
extern struct bfd_hash_entry *bfd_hash_insert
(struct bfd_hash_table *, const char *, unsigned long);
+/* Rename an entry in a hash table. */
+extern void bfd_hash_rename
+ (struct bfd_hash_table *, const char *, struct bfd_hash_entry *);
+
/* Replace an entry in a hash table. */
extern void bfd_hash_replace
(struct bfd_hash_table *, struct bfd_hash_entry *old,
Index: bfd/hash.c
===================================================================
RCS file: /cvs/src/src/bfd/hash.c,v
retrieving revision 1.31
diff -u -p -r1.31 hash.c
--- bfd/hash.c 11 Dec 2009 13:42:04 -0000 1.31
+++ bfd/hash.c 8 Nov 2010 01:12:52 -0000
@@ -412,20 +412,13 @@ bfd_hash_table_free (struct bfd_hash_tab
table->memory = NULL;
}
-/* Look up a string in a hash table. */
-
-struct bfd_hash_entry *
-bfd_hash_lookup (struct bfd_hash_table *table,
- const char *string,
- bfd_boolean create,
- bfd_boolean copy)
+static inline unsigned long
+bfd_hash_hash (const char *string, unsigned int *lenp)
{
const unsigned char *s;
unsigned long hash;
- unsigned int c;
- struct bfd_hash_entry *hashp;
unsigned int len;
- unsigned int _index;
+ unsigned int c;
hash = 0;
len = 0;
@@ -438,7 +431,25 @@ bfd_hash_lookup (struct bfd_hash_table *
len = (s - (const unsigned char *) string) - 1;
hash += len + (len << 17);
hash ^= hash >> 2;
+ if (lenp != NULL)
+ *lenp = len;
+ return hash;
+}
+
+/* Look up a string in a hash table. */
+
+struct bfd_hash_entry *
+bfd_hash_lookup (struct bfd_hash_table *table,
+ const char *string,
+ bfd_boolean create,
+ bfd_boolean copy)
+{
+ unsigned long hash;
+ struct bfd_hash_entry *hashp;
+ unsigned int len;
+ unsigned int _index;
+ hash = bfd_hash_hash (string, &len);
_index = hash % table->size;
for (hashp = table->table[_index];
hashp != NULL;
@@ -535,6 +546,31 @@ bfd_hash_insert (struct bfd_hash_table *
return hashp;
}
+/* Rename an entry in a hash table. */
+
+void
+bfd_hash_rename (struct bfd_hash_table *table,
+ const char *string,
+ struct bfd_hash_entry *ent)
+{
+ unsigned int _index;
+ struct bfd_hash_entry **pph;
+
+ _index = ent->hash % table->size;
+ for (pph = &table->table[_index]; *pph != NULL; pph = &(*pph)->next)
+ if (*pph == ent)
+ break;
+ if (*pph == NULL)
+ abort ();
+
+ *pph = ent->next;
+ ent->string = string;
+ ent->hash = bfd_hash_hash (string, NULL);
+ _index = ent->hash % table->size;
+ ent->next = table->table[_index];
+ table->table[_index] = ent;
+}
+
/* Replace an entry in a hash table. */
void
Index: bfd/section.c
===================================================================
RCS file: /cvs/src/src/bfd/section.c,v
retrieving revision 1.107
diff -u -p -r1.107 section.c
--- bfd/section.c 29 Oct 2010 12:10:24 -0000 1.107
+++ bfd/section.c 8 Nov 2010 01:12:53 -0000
@@ -1215,6 +1215,29 @@ bfd_set_section_flags (bfd *abfd ATTRIBU
/*
FUNCTION
+ bfd_rename_section
+
+SYNOPSIS
+ void bfd_rename_section
+ (bfd *abfd, asection *sec, const char *newname);
+
+DESCRIPTION
+ Rename section @var{sec} in @var{abfd} to @var{newname}.
+*/
+
+void
+bfd_rename_section (bfd *abfd, sec_ptr sec, const char *newname)
+{
+ struct section_hash_entry *sh;
+
+ sh = (struct section_hash_entry *)
+ ((char *) sec - offsetof (struct section_hash_entry, section));
+ sh->section.name = newname;
+ bfd_hash_rename (&abfd->section_htab, newname, &sh->root);
+}
+
+/*
+FUNCTION
bfd_map_over_sections
SYNOPSIS
Index: bfd/elf.c
===================================================================
RCS file: /cvs/src/src/bfd/elf.c,v
retrieving revision 1.524
diff -u -p -r1.524 elf.c
--- bfd/elf.c 29 Oct 2010 12:10:24 -0000 1.524
+++ bfd/elf.c 8 Nov 2010 01:12:34 -0000
@@ -822,11 +822,7 @@ _bfd_elf_make_section_from_shdr (bfd *ab
const struct elf_backend_data *bed;
if (hdr->bfd_section != NULL)
- {
- BFD_ASSERT (strcmp (name,
- bfd_get_section_name (abfd, hdr->bfd_section)) == 0);
- return TRUE;
- }
+ return TRUE;
newsect = bfd_make_section_anyway (abfd, name);
if (newsect == NULL)
@@ -1016,6 +1012,7 @@ _bfd_elf_make_section_from_shdr (bfd *ab
|| (name[1] == 'z' && name[7] == '_')))
{
enum { nothing, compress, decompress } action = nothing;
+ char *new_name;
if (bfd_is_section_compressed (abfd, newsect))
{
@@ -1030,6 +1027,7 @@ _bfd_elf_make_section_from_shdr (bfd *ab
action = compress;
}
+ new_name = NULL;
switch (action)
{
case nothing:
@@ -1042,6 +1040,17 @@ _bfd_elf_make_section_from_shdr (bfd *ab
abfd, name);
return FALSE;
}
+ if (name[1] != 'z')
+ {
+ unsigned int len = strlen (name);
+
+ new_name = bfd_alloc (abfd, len + 2);
+ if (new_name == NULL)
+ return FALSE;
+ new_name[0] = '.';
+ new_name[1] = 'z';
+ memcpy (new_name + 2, name + 1, len);
+ }
break;
case decompress:
if (!bfd_init_section_decompress_status (abfd, newsect))
@@ -1051,8 +1060,20 @@ _bfd_elf_make_section_from_shdr (bfd *ab
abfd, name);
return FALSE;
}
+ if (name[1] == 'z')
+ {
+ unsigned int len = strlen (name);
+
+ new_name = bfd_alloc (abfd, len);
+ if (new_name == NULL)
+ return FALSE;
+ new_name[0] = '.';
+ memcpy (new_name + 1, name + 2, len - 1);
+ }
break;
}
+ if (new_name != NULL)
+ bfd_rename_section (abfd, newsect, new_name);
}
return TRUE;
Index: bfd/elf64-hppa.c
===================================================================
RCS file: /cvs/src/src/bfd/elf64-hppa.c,v
retrieving revision 1.101
diff -u -p -r1.101 elf64-hppa.c
--- bfd/elf64-hppa.c 25 Oct 2010 15:54:15 -0000 1.101
+++ bfd/elf64-hppa.c 8 Nov 2010 01:12:42 -0000
@@ -411,13 +411,6 @@ get_reloc_section (bfd *abfd,
if (srel_name == NULL)
return FALSE;
- BFD_ASSERT ((CONST_STRNEQ (srel_name, ".rela")
- && strcmp (bfd_get_section_name (abfd, sec),
- srel_name + 5) == 0)
- || (CONST_STRNEQ (srel_name, ".rel")
- && strcmp (bfd_get_section_name (abfd, sec),
- srel_name + 4) == 0));
-
dynobj = hppa_info->root.dynobj;
if (!dynobj)
hppa_info->root.dynobj = dynobj = abfd;
Index: bfd/elfxx-ia64.c
===================================================================
RCS file: /cvs/src/src/bfd/elfxx-ia64.c,v
retrieving revision 1.228
diff -u -p -r1.228 elfxx-ia64.c
--- bfd/elfxx-ia64.c 25 Oct 2010 15:54:16 -0000 1.228
+++ bfd/elfxx-ia64.c 8 Nov 2010 01:12:48 -0000
@@ -2602,13 +2602,6 @@ get_reloc_section (bfd *abfd,
if (srel_name == NULL)
return NULL;
- BFD_ASSERT ((CONST_STRNEQ (srel_name, ".rela")
- && strcmp (bfd_get_section_name (abfd, sec),
- srel_name+5) == 0)
- || (CONST_STRNEQ (srel_name, ".rel")
- && strcmp (bfd_get_section_name (abfd, sec),
- srel_name+4) == 0));
-
dynobj = ia64_info->root.dynobj;
if (!dynobj)
ia64_info->root.dynobj = dynobj = abfd;
Index: binutils/objcopy.c
===================================================================
RCS file: /cvs/src/src/binutils/objcopy.c,v
retrieving revision 1.147
diff -u -p -r1.147 objcopy.c
--- binutils/objcopy.c 29 Oct 2010 12:10:25 -0000 1.147
+++ binutils/objcopy.c 5 Nov 2010 03:03:11 -0000
@@ -3196,7 +3196,6 @@ copy_main (int argc, char *argv[])
struct section_list *p;
struct stat statbuf;
const bfd_arch_info_type *input_arch = NULL;
- struct dwarf_debug_section *d;
while ((c = getopt_long (argc, argv, "b:B:i:I:j:K:N:s:O:d:F:L:G:R:SpgxXHhVvW:w",
copy_options, (int *) 0)) != EOF)
@@ -3912,22 +3911,6 @@ copy_main (int argc, char *argv[])
fatal (_("warning: could not create temporary file whilst copying '%s', (error: %s)"),
input_filename, strerror (errno));
- switch (do_debug_sections)
- {
- case compress:
- for (d = dwarf_debug_sections; d->uncompressed_name; d++)
- add_section_rename (d->uncompressed_name, d->compressed_name,
- (flagword) -1);
- break;
- case decompress:
- for (d = dwarf_debug_sections; d->uncompressed_name; d++)
- add_section_rename (d->compressed_name, d->uncompressed_name,
- (flagword) -1);
- break;
- default:
- break;
- }
-
copy_file (input_filename, tmpname, input_target, output_target, input_arch);
if (status == 0)
{
Index: binutils/testsuite/binutils-all/objdump.W
===================================================================
RCS file: /cvs/src/src/binutils/testsuite/binutils-all/objdump.W,v
retrieving revision 1.7
diff -u -p -r1.7 objdump.W
--- binutils/testsuite/binutils-all/objdump.W 3 Sep 2010 15:54:31 -0000 1.7
+++ binutils/testsuite/binutils-all/objdump.W 5 Nov 2010 03:03:13 -0000
@@ -73,7 +73,7 @@ Raw dump of debug contents of section .d
Extended opcode 1: End of Sequence
-Contents of the .zdebug_abbrev section:
+Contents of the .debug_abbrev section:
Number TAG
1 DW_TAG_compile_unit \[has children\]
? bfd/elf-debug-info.c
--
Alan Modra
Australia Development Lab, IBM