diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index eb4ee8de4a..100aa181c6 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -22,15 +22,12 @@ #include #include #include -#include #ifdef BR_CCACHE static char ccache_path[PATH_MAX]; #endif static char path[PATH_MAX]; static char sysroot[PATH_MAX]; -static char source_time[sizeof("-D__TIME__=\"HH:MM:SS\"")]; -static char source_date[sizeof("-D__DATE__=\"MMM DD YYYY\"")]; /** * GCC errors out with certain combinations of arguments (examples are @@ -42,11 +39,8 @@ static char source_date[sizeof("-D__DATE__=\"MMM DD YYYY\"")]; * -mfloat-abi= * -march= * -mcpu= - * -D__TIME__= - * -D__DATE__= - * -Wno-builtin-macro-redefined */ -#define EXCLUSIVE_ARGS 6 +#define EXCLUSIVE_ARGS 3 static char *predef_args[] = { #ifdef BR_CCACHE @@ -163,47 +157,6 @@ static void check_unsafe_path(const char *arg, } } -/* Read SOURCE_DATE_EPOCH from environment to have a deterministic - * timestamp to replace embedded current dates to get reproducible - * results. Returns -1 if SOURCE_DATE_EPOCH is not defined. - */ -static time_t get_source_date_epoch() -{ - char *source_date_epoch; - long long epoch; - char *endptr; - - source_date_epoch = getenv("SOURCE_DATE_EPOCH"); - if (!source_date_epoch) - return (time_t) -1; - - errno = 0; - epoch = strtoll(source_date_epoch, &endptr, 10); - if ((errno == ERANGE && (epoch == LLONG_MAX || epoch == LLONG_MIN)) - || (errno != 0 && epoch == 0)) { - fprintf(stderr, "environment variable $SOURCE_DATE_EPOCH: " - "strtoll: %s\n", strerror(errno)); - exit(2); - } - if (endptr == source_date_epoch) { - fprintf(stderr, "environment variable $SOURCE_DATE_EPOCH: " - "no digits were found: %s\n", endptr); - exit(2); - } - if (*endptr != '\0') { - fprintf(stderr, "environment variable $SOURCE_DATE_EPOCH: " - "trailing garbage: %s\n", endptr); - exit(2); - } - if (epoch < 0) { - fprintf(stderr, "environment variable $SOURCE_DATE_EPOCH: " - "value must be nonnegative: %lld \n", epoch); - exit(2); - } - - return (time_t) epoch; -} - int main(int argc, char **argv) { char **args, **cur, **exec_args; @@ -214,7 +167,6 @@ int main(int argc, char **argv) char *paranoid_wrapper; int paranoid; int ret, i, count = 0, debug; - time_t source_date_epoch; /* Calculate the relative paths */ basename = strrchr(progpath, '/'); @@ -320,28 +272,6 @@ int main(int argc, char **argv) } #endif /* ARCH || CPU */ - source_date_epoch = get_source_date_epoch(); - if (source_date_epoch != -1) { - struct tm *tm = localtime(&source_date_epoch); - if (!tm) { - perror("__FILE__: localtime"); - return 3; - } - ret = strftime(source_time, sizeof(source_time), "-D__TIME__=\"%T\"", tm); - if (!ret) { - perror("__FILE__: overflow"); - return 3; - } - *cur++ = source_time; - ret = strftime(source_date, sizeof(source_date), "-D__DATE__=\"%b %e %Y\"", tm); - if (!ret) { - perror("__FILE__: overflow"); - return 3; - } - *cur++ = source_date; - *cur++ = "-Wno-builtin-macro-redefined"; - } - paranoid_wrapper = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); if (paranoid_wrapper && strlen(paranoid_wrapper) > 0) paranoid = 1;