espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-30 00:52:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

PR gas/3456:

Browse Source 
* config/obj-elf.c (obj_elf_version): Do not include the name field's padding in the namesz value.
This commit is contained in:
Nick Clifton
2006-11-10 07:47:14 +00:00
parent d66dff9480
commit 6afdfa61bd
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gas/ChangeLog
View File

@ -1,3 +1,9 @@
2006-11-10 Nick Clifton <nickc@redhat.com>
PR gas/3456:
* config/obj-elf.c (obj_elf_version): Do not include the name
field's padding in the namesz value.
2006-11-09 Thiemo Seufer <ths@mips.com> 2006-11-09 Thiemo Seufer <ths@mips.com>
* config/tc-mips.c: Fix outdated comment. * config/tc-mips.c: Fix outdated comment.

22
gas/config/obj-elf.c
View File

@ -1419,11 +1419,12 @@ obj_elf_version (int ignore ATTRIBUTE_UNUSED)
Elf_Internal_Note i_note; Elf_Internal_Note i_note;
Elf_External_Note e_note; Elf_External_Note e_note;
asection *note_secp = NULL; asection *note_secp = NULL;
int len;
SKIP_WHITESPACE (); SKIP_WHITESPACE ();
if (*input_line_pointer == '\"') if (*input_line_pointer == '\"')
{ {
unsigned int len;
++input_line_pointer; /* -> 1st char of string. */ ++input_line_pointer; /* -> 1st char of string. */
name = input_line_pointer; name = input_line_pointer;
@ -1434,19 +1435,19 @@ obj_elf_version (int ignore ATTRIBUTE_UNUSED)
*(input_line_pointer - 1) = '\0'; *(input_line_pointer - 1) = '\0';
*input_line_pointer = c; *input_line_pointer = c;
/* create the .note section */ /* Create the .note section. */
note_secp = subseg_new (".note", 0); note_secp = subseg_new (".note", 0);
bfd_set_section_flags (stdoutput, bfd_set_section_flags (stdoutput,
note_secp, note_secp,
SEC_HAS_CONTENTS | SEC_READONLY); SEC_HAS_CONTENTS | SEC_READONLY);
/* process the version string */ /* Process the version string. */
len = strlen (name) + 1;
len = strlen (name); /* PR 3456: Although the name field is padded out to an 4-byte
boundary, the namesz field should not be adjusted. */
i_note.namesz = ((len + 1) + 3) & ~3; /* round this to word boundary */ i_note.namesz = len;
i_note.descsz = 0; /* no description */ i_note.descsz = 0; /* No description. */
i_note.type = NT_VERSION; i_note.type = NT_VERSION;
p = frag_more (sizeof (e_note.namesz)); p = frag_more (sizeof (e_note.namesz));
md_number_to_chars (p, i_note.namesz, sizeof (e_note.namesz)); md_number_to_chars (p, i_note.namesz, sizeof (e_note.namesz));
@ -1454,7 +1455,7 @@ obj_elf_version (int ignore ATTRIBUTE_UNUSED)
md_number_to_chars (p, i_note.descsz, sizeof (e_note.descsz)); md_number_to_chars (p, i_note.descsz, sizeof (e_note.descsz));
p = frag_more (sizeof (e_note.type)); p = frag_more (sizeof (e_note.type));
md_number_to_chars (p, i_note.type, sizeof (e_note.type)); md_number_to_chars (p, i_note.type, sizeof (e_note.type));
p = frag_more (len + 1); p = frag_more (len);
strcpy (p, name); strcpy (p, name);
frag_align (2, 0, 0); frag_align (2, 0, 0);
@ -1462,9 +1463,8 @@ obj_elf_version (int ignore ATTRIBUTE_UNUSED)
subseg_set (seg, subseg); subseg_set (seg, subseg);
} }
else else
{
as_bad (_("expected quoted string")); as_bad (_("expected quoted string"));
}
demand_empty_rest_of_line (); demand_empty_rest_of_line ();
} }