From 6a6117ab0ffe18ea984abca84869eae799c1b346 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 2 Oct 2023 13:24:05 +0100 Subject: [PATCH] Use bfd_get_current_time in places where it is suitable --- bfd/ChangeLog | 5 +++++ bfd/peXXigen.c | 12 +----------- ld/ChangeLog | 5 +++++ ld/pe-dll.c | 10 +--------- 4 files changed, 12 insertions(+), 20 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 6c4e3e52953..851b47606c4 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2023-10-02 Nick Clifton + + * peXXigen.c (_bfd_XXi_only_swap_filehdr_out): Use + bfd_get_current_time when filing in the timestamp. + 2023-09-29 Nick Clifton PR 30906 diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c index 2f2968d48e8..641c259d04b 100644 --- a/bfd/peXXigen.c +++ b/bfd/peXXigen.c @@ -839,17 +839,7 @@ _bfd_XXi_only_swap_filehdr_out (bfd * abfd, void * in, void * out) option was chosen. */ if ((pe_data (abfd)->timestamp) == -1) { - time_t now; - char *source_date_epoch; - - /* If the SOURCE_DATE_EPOCH environment variable is - defined then use that as the time, otherwise use - the current time. */ - source_date_epoch = getenv ("SOURCE_DATE_EPOCH"); - if (source_date_epoch) - now = (time_t) strtoll (source_date_epoch, NULL, 10); - else - now = time (NULL); + time_t now = bfd_get_current_time (0); H_PUT_32 (abfd, now, filehdr_out->f_timdat); } else diff --git a/ld/ChangeLog b/ld/ChangeLog index 3e41bdc294e..4e4f5326d80 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2023-10-02 Nick Clifton + + * pe-dll.c (fill_edata): Use bfd_get_current_time when filling in + the timestamp. + 2023-09-27 Hsinyuan Xavier PR 30875 diff --git a/ld/pe-dll.c b/ld/pe-dll.c index df08a57e644..fc83f5208d6 100644 --- a/ld/pe-dll.c +++ b/ld/pe-dll.c @@ -1232,15 +1232,7 @@ fill_edata (bfd *abfd, struct bfd_link_info *info ATTRIBUTE_UNUSED) if (pe_data (abfd)->timestamp == -1) { - time_t now; - char *source_date_epoch; - - source_date_epoch = getenv ("SOURCE_DATE_EPOCH"); - if (source_date_epoch) - now = (time_t) strtoll (source_date_epoch, NULL, 10); - else - now = time (NULL); - + time_t now = bfd_get_current_time (0); H_PUT_32 (abfd, now, edata_d + 4); } else -- 2.11.4.GIT