diff mbox series

Commit: Use bfd_get_current_time more widely

Message ID 87leclp5uk.fsf@redhat.com
State New
Headers
Series Commit: Use bfd_get_current_time more widely |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_binutils_build--master-aarch64 warning Patch is already merged
linaro-tcwg-bot/tcwg_binutils_check--master-aarch64 warning Patch is already merged
linaro-tcwg-bot/tcwg_binutils_check--master-arm warning Patch is already merged
linaro-tcwg-bot/tcwg_binutils_build--master-arm warning Patch is already merged

Commit Message

Nick Clifton Oct. 2, 2023, 12:27 p.m. UTC 
  Hi Guys,

  I am applying the patch below to simplify some of the code in the
  linker and the BFD library.  There were a couple of places where we
  were testing for and using the SOURCE_DATE_EPOCH environment
  variable.  Since we now have a BFD library function that does this,
  there is no need for separate code.

Cheers
  Nick

bfd/ChangeLog
	* peXXigen.c (_bfd_XXi_only_swap_filehdr_out): Use
	bfd_get_current_time when filing in the timestamp.

ld/ChangeLog
	* pe-dll.c (fill_edata): Use bfd_get_current_time when filling in
	the timestamp.
diff mbox series

Patch

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/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