2011-12-05 Tristan Gingold <gingold@adacore.com>
* mach-o.c (bfd_mach_o_read_command): Add the bfd in the error message. (bfd_mach_o_openr_next_archived_file): Use arch name as member name. (bfd_mach_o_fat_extract): Ditto.
This commit is contained in:
parent
fbbd034ec5
commit
c0d9d05149
|
@ -1,3 +1,10 @@
|
||||||
|
2011-12-05 Tristan Gingold <gingold@adacore.com>
|
||||||
|
|
||||||
|
* mach-o.c (bfd_mach_o_read_command): Add the bfd in the error
|
||||||
|
message.
|
||||||
|
(bfd_mach_o_openr_next_archived_file): Use arch name as member name.
|
||||||
|
(bfd_mach_o_fat_extract): Ditto.
|
||||||
|
|
||||||
2011-12-03 Alan Modra <amodra@gmail.com>
|
2011-12-03 Alan Modra <amodra@gmail.com>
|
||||||
|
|
||||||
PR ld/13468
|
PR ld/13468
|
||||||
|
|
23
bfd/mach-o.c
23
bfd/mach-o.c
|
@ -2734,8 +2734,8 @@ bfd_mach_o_read_command (bfd *abfd, bfd_mach_o_load_command *command)
|
||||||
return -1;
|
return -1;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
(*_bfd_error_handler) (_("unable to read unknown load command 0x%lx"),
|
(*_bfd_error_handler)(_("%B: unable to read unknown load command 0x%lx"),
|
||||||
(unsigned long) command->type);
|
abfd, (unsigned long) command->type);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3209,22 +3209,9 @@ bfd_mach_o_openr_next_archived_file (bfd *archive, bfd *prev)
|
||||||
|
|
||||||
bfd_mach_o_convert_architecture (entry->cputype, entry->cpusubtype,
|
bfd_mach_o_convert_architecture (entry->cputype, entry->cpusubtype,
|
||||||
&arch_type, &arch_subtype);
|
&arch_type, &arch_subtype);
|
||||||
/* Create the member filename.
|
|
||||||
Use FILENAME:ARCH_NAME. */
|
|
||||||
{
|
|
||||||
char *s = NULL;
|
|
||||||
const char *arch_name;
|
|
||||||
size_t arch_file_len = strlen (bfd_get_filename (archive));
|
|
||||||
|
|
||||||
arch_name = bfd_printable_arch_mach (arch_type, arch_subtype);
|
/* Create the member filename. Use ARCH_NAME. */
|
||||||
s = bfd_malloc (arch_file_len + 1 + strlen (arch_name) + 1);
|
nbfd->filename = bfd_printable_arch_mach (arch_type, arch_subtype);
|
||||||
if (s == NULL)
|
|
||||||
return NULL;
|
|
||||||
memcpy (s, bfd_get_filename (archive), arch_file_len);
|
|
||||||
s[arch_file_len] = ':';
|
|
||||||
strcpy (s + arch_file_len + 1, arch_name);
|
|
||||||
nbfd->filename = s;
|
|
||||||
}
|
|
||||||
nbfd->iostream = NULL;
|
nbfd->iostream = NULL;
|
||||||
bfd_set_arch_mach (nbfd, arch_type, arch_subtype);
|
bfd_set_arch_mach (nbfd, arch_type, arch_subtype);
|
||||||
|
|
||||||
|
@ -3277,7 +3264,7 @@ bfd_mach_o_fat_extract (bfd *abfd,
|
||||||
|
|
||||||
res->origin = e->offset;
|
res->origin = e->offset;
|
||||||
|
|
||||||
res->filename = strdup (abfd->filename);
|
res->filename = bfd_printable_arch_mach (cpu_type, cpu_subtype);
|
||||||
res->iostream = NULL;
|
res->iostream = NULL;
|
||||||
|
|
||||||
if (bfd_check_format (res, format))
|
if (bfd_check_format (res, format))
|
||||||
|
|
Loading…
Reference in New Issue