aboutsummaryrefslogtreecommitdiff
path: root/ld/pe-dll.c
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2020-03-30 16:30:02 +0100
committerNick Clifton <nickc@redhat.com>2020-03-30 16:30:02 +0100
commit00386881a3d0f7ac89fcc5cc912da8cd69c04324 (patch)
tree49d19d14cdb49b7bf0c6fb7f292be780eb385ca3 /ld/pe-dll.c
parent227c0bf4b3dd0cf65dceb58e729e9da81b38b5a7 (diff)
downloadbinutils-00386881a3d0f7ac89fcc5cc912da8cd69c04324.zip
binutils-00386881a3d0f7ac89fcc5cc912da8cd69c04324.tar.gz
binutils-00386881a3d0f7ac89fcc5cc912da8cd69c04324.tar.bz2
Fix objcopy's --preserve-dates command line option so that it will work with PE format files.
PR binutils/pr25662 bfd * libcoff-in.h (struct pe_tdata): Rename the insert_timestamp field to timestamp and make it an integer. * libcoff.h: Regenerate. * peXXigen.c (_bfd_XXi_only_swap_filehdr_out): Test the timestamp field in the pe_data structure rather than the insert_timestamp field. binutils* objcopy.c (copy_object): When copying PE format files set the timestamp field in the pe_data structure if the preserve_dates flag is set. * testsuite/binutils-all/objcopy.exp (objcopy_test) Use --preserve-dates in place of the -p option, in order to make its effect more obvious. ld * emultempl/pe.em (after_open): Replace initialisation of the insert_timestamp field in the pe_data structure with an initialisation of the timestamp field. * emultemp/pep.em: Likewise. * pe-dll.c (fill_edata): Use the timestamp field in the pe_data structure instead of the insert_timestamp field.
Diffstat (limited to 'ld/pe-dll.c')
-rw-r--r--ld/pe-dll.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ld/pe-dll.c b/ld/pe-dll.c
index 397af87..0addde2 100644
--- a/ld/pe-dll.c
+++ b/ld/pe-dll.c
@@ -1211,8 +1211,10 @@ fill_edata (bfd *abfd, struct bfd_link_info *info ATTRIBUTE_UNUSED)
memset (edata_d, 0, edata_sz);
- if (pe_data (abfd)->insert_timestamp)
+ if (pe_data (abfd)->timestamp == -1)
H_PUT_32 (abfd, time (0), edata_d + 4);
+ else
+ H_PUT_32 (abfd, pe_data (abfd)->timestamp, edata_d + 4);
if (pe_def_file->version_major != -1)
{