darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* rescoff.c (write_coff_file): Use 64-bit alignment for resource

Browse source 
data.
	(coff_res_to_bin): Likewise.
This commit is contained in:
Nick Clifton 2013-11-13 12:54:29 +00:00
parent c42bd95ac2
commit e2729ebe25
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
binutils/ChangeLog
View file

@ -1,3 +1,9 @@
2013-11-13 Martin Mitas <mity@morous.org>
* rescoff.c (write_coff_file): Use 64-bit alignment for resource
data.
(coff_res_to_bin): Likewise.
2013-11-07 Doug Evans <dje@google.com>
Add pretty-printing of .debug_gnu_pubnames, .debug_gnu_pubtypes.

25
binutils/rescoff.c
View file

@ -1,6 +1,5 @@
/* rescoff.c -- read and write resources in Windows COFF files.
Copyright 1997, 1998, 1999, 2000, 2003, 2005, 2007, 2008
Free Software Foundation, Inc.
Copyright 1997-2013 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Cygnus Support.
Rewritten by Kai Tietz, Onevision.
@ -501,22 +500,22 @@ write_coff_file (const char *filename, const char *target,
know the various offsets we will need. */
coff_bin_sizes (resources, &cwi);
/* Force the directory strings to be 32 bit aligned. Every other
structure is 32 bit aligned anyhow. */
cwi.dirstrsize = (cwi.dirstrsize + 3) &~ 3;
/* Force the directory strings to be 64 bit aligned. Every other
structure is 64 bit aligned anyhow. */
cwi.dirstrsize = (cwi.dirstrsize + 7) & ~7;
/* Actually convert the resources to binary. */
coff_to_bin (resources, &cwi);
/* Add another 2 bytes to the directory strings if needed for
/* Add another few bytes to the directory strings if needed for
alignment. */
if ((cwi.dirstrs.length & 3) != 0)
if ((cwi.dirstrs.length & 7) != 0)
{
rc_uint_type pad = 8 - (cwi.dirstrs.length & 7);
bfd_byte *ex;
ex = coff_alloc (&cwi.dirstrs, 2);
ex[0] = 0;
ex[1] = 0;
ex = coff_alloc (& cwi.dirstrs, pad);
memset (ex, 0, pad);
}
/* Make sure that the data we built came out to the same size as we
@ -741,10 +740,10 @@ coff_res_to_bin (const rc_res_resource *res, struct coff_write_info *cwi)
cwi->resources.last->next = d;
cwi->resources.last = d;
cwi->resources.length += (d->length + 3) & ~3;
cwi->resources.length += (d->length + 7) & ~7;
windres_put_32 (cwi->wrbfd, erd->size, d->length);
/* Force the next resource to have 32 bit alignment. */
d->length = (d->length + 3) & ~3;
/* Force the next resource to have 64 bit alignment. */
d->length = (d->length + 7) & ~7;
}