This file is part of MXE. See LICENSE.md for licensing information. Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Sat, 15 Jul 2017 00:09:40 +1000 Subject: [PATCH 1/1] Allow the PE timestamp to be specified with SOURCE_DATE_EPOCH Taken from: https://sources.debian.net/patches/binutils-mingw-w64/7.4/specify-timestamp.patch/ diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c index 1111111..2222222 100644 --- a/bfd/peXXigen.c +++ b/bfd/peXXigen.c @@ -70,6 +70,9 @@ #include #endif +#include +#include + /* NOTE: it's strange to be including an architecture specific header in what's supposed to be general (to PE/PEI) code. However, that's where the definitions are, and they don't vary per architecture @@ -878,10 +881,38 @@ _bfd_XXi_only_swap_filehdr_out (bfd * abfd, void * in, void * out) H_PUT_16 (abfd, filehdr_in->f_nscns, filehdr_out->f_nscns); /* Only use a real timestamp if the option was chosen. */ - if ((pe_data (abfd)->insert_timestamp)) - H_PUT_32 (abfd, time (0), filehdr_out->f_timdat); - else + if (pe_data (abfd)->insert_timestamp) { + time_t now; + char *source_date_epoch; + unsigned long long epoch; + char *endptr; + + now = time(NULL); + source_date_epoch = getenv("SOURCE_DATE_EPOCH"); + if (source_date_epoch) { + errno = 0; + epoch = strtoull(source_date_epoch, &endptr, 10); + if ((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0)) + || (errno != 0 && epoch == 0)) { + _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: strtoull: %s\n", + strerror(errno)); + } else if (endptr == source_date_epoch) { + _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: No digits were found: %s\n", + endptr); + } else if (*endptr != '\0') { + _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: Trailing garbage: %s\n", + endptr); + } else if (epoch > ULONG_MAX) { + _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: value must be smaller than or equal to: %lu but was found to be: %llu\n", + ULONG_MAX, epoch); + } else { + now = epoch; + } + } + H_PUT_32 (abfd, now, filehdr_out->f_timdat); + } else { H_PUT_32 (abfd, 0, filehdr_out->f_timdat); + } PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, filehdr_out->f_symptr); diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em index 1111111..2222222 100644 --- a/ld/emultempl/pe.em +++ b/ld/emultempl/pe.em @@ -305,7 +305,7 @@ gld${EMULATION_NAME}_add_options OPTION_USE_NUL_PREFIXED_IMPORT_TABLES}, {"no-leading-underscore", no_argument, NULL, OPTION_NO_LEADING_UNDERSCORE}, {"leading-underscore", no_argument, NULL, OPTION_LEADING_UNDERSCORE}, - {"insert-timestamp", no_argument, NULL, OPTION_INSERT_TIMESTAMP}, + {"insert-timestamp", optional_argument, NULL, OPTION_INSERT_TIMESTAMP}, {"no-insert-timestamp", no_argument, NULL, OPTION_NO_INSERT_TIMESTAMP}, #ifdef DLL_SUPPORT /* getopt allows abbreviations, so we do this to stop it diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em index 1111111..2222222 100644 --- a/ld/emultempl/pep.em +++ b/ld/emultempl/pep.em @@ -321,7 +321,7 @@ gld${EMULATION_NAME}_add_options {"no-bind", no_argument, NULL, OPTION_NO_BIND}, {"wdmdriver", no_argument, NULL, OPTION_WDM_DRIVER}, {"tsaware", no_argument, NULL, OPTION_TERMINAL_SERVER_AWARE}, - {"insert-timestamp", no_argument, NULL, OPTION_INSERT_TIMESTAMP}, + {"insert-timestamp", optional_argument, NULL, OPTION_INSERT_TIMESTAMP}, {"no-insert-timestamp", no_argument, NULL, OPTION_NO_INSERT_TIMESTAMP}, {"build-id", optional_argument, NULL, OPTION_BUILD_ID}, {NULL, no_argument, NULL, 0} diff --git a/ld/pe-dll.c b/ld/pe-dll.c index 1111111..2222222 100644 --- a/ld/pe-dll.c +++ b/ld/pe-dll.c @@ -26,6 +26,8 @@ #include "filenames.h" #include "safe-ctype.h" +#include +#include #include #include "ld.h" @@ -1192,8 +1194,36 @@ fill_edata (bfd *abfd, struct bfd_link_info *info ATTRIBUTE_UNUSED) memset (edata_d, 0, edata_sz); - if (pe_data (abfd)->insert_timestamp) - H_PUT_32 (abfd, time (0), edata_d + 4); + if (pe_data (abfd)->insert_timestamp) { + time_t now; + char *source_date_epoch; + unsigned long long epoch; + char *endptr; + + now = time(NULL); + source_date_epoch = getenv("SOURCE_DATE_EPOCH"); + if (source_date_epoch) { + errno = 0; + epoch = strtoull(source_date_epoch, &endptr, 10); + if ((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0)) + || (errno != 0 && epoch == 0)) { + einfo("Environment variable $SOURCE_DATE_EPOCH: strtoull: %s\n", + strerror(errno)); + } else if (endptr == source_date_epoch) { + einfo("Environment variable $SOURCE_DATE_EPOCH: No digits were found: %s\n", + endptr); + } else if (*endptr != '\0') { + einfo("Environment variable $SOURCE_DATE_EPOCH: Trailing garbage: %s\n", + endptr); + } else if (epoch > ULONG_MAX) { + einfo("Environment variable $SOURCE_DATE_EPOCH: value must be smaller than or equal to: %lu but was found to be: %llu\n", + ULONG_MAX, epoch); + } else { + now = epoch; + } + } + H_PUT_32 (abfd, now, edata_d + 4); + } if (pe_def_file->version_major != -1) {