c-common.c (get_source_date_epoch): New function...

gcc/c-family/ChangeLog:

2016-04-28  Eduard Sanou  <dhole@openmailbox.org>
	    Matthias Klose  <doko@debian.org>

	* c-common.c (get_source_date_epoch): New function, gets the environment
	variable SOURCE_DATE_EPOCH and parses it as long long with error 
	handling.
	* c-common.h (get_source_date_epoch): Prototype.
	* c-lex.c (c_lex_with_flags): set parse_in->source_date_epoch.

gcc/ChangeLog:

2016-04-28  Eduard Sanou  <dhole@openmailbox.org>
	    Matthias Klose  <doko@debian.org>

	* doc/cppenv.texi: Document SOURCE_DATE_EPOCH environment variable.

libcpp/ChangeLog:

2016-04-28  Eduard Sanou  <dhole@openmailbox.org>
	    Matthias Klose  <doko@debian.org>

	* include/cpplib.h (cpp_init_source_date_epoch): Prototype.
	* init.c (cpp_init_source_date_epoch): New function.
	* internal.h: Added source_date_epoch variable to struct
	cpp_reader to store a reproducible date.
	* macro.c (_cpp_builtin_macro_text): Set pfile->date timestamp from 
	pfile->source_date_epoch instead of localtime if source_date_epoch is 
	set, to be used for __DATE__ and __TIME__ macros to help reproducible 
	builds.

Co-Authored-By: Matthias Klose <doko@debian.org>

From-SVN: r235550
This commit is contained in:
Eduard Sanou 2016-04-28 09:12:05 +00:00 committed by Matthias Klose
parent a564d35095
commit 174f66220d
11 changed files with 113 additions and 8 deletions

View File

@ -1,3 +1,8 @@
2016-04-28 Eduard Sanou <dhole@openmailbox.org>
Matthias Klose <doko@debian.org>
* doc/cppenv.texi: Document SOURCE_DATE_EPOCH environment variable.
2016-04-28 Richard Biener <rguenther@suse.de>
PR middle-end/70777

View File

@ -1,3 +1,12 @@
2016-04-28 Eduard Sanou <dhole@openmailbox.org>
Matthias Klose <doko@debian.org>
* c-common.c (get_source_date_epoch): New function, gets the environment
variable SOURCE_DATE_EPOCH and parses it as long long with error
handling.
* c-common.h (get_source_date_epoch): Prototype.
* c-lex.c (c_lex_with_flags): set parse_in->source_date_epoch.
2015-04-27 Ryan Burn <contact@rnburn.com>
PR c++/69024

View File

@ -12784,4 +12784,37 @@ valid_array_size_p (location_t loc, tree type, tree name)
return true;
}
/* 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. */
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))
fatal_error (UNKNOWN_LOCATION, "environment variable $SOURCE_DATE_EPOCH: "
"strtoll: %s\n", xstrerror(errno));
if (endptr == source_date_epoch)
fatal_error (UNKNOWN_LOCATION, "environment variable $SOURCE_DATE_EPOCH: "
"no digits were found: %s\n", endptr);
if (*endptr != '\0')
fatal_error (UNKNOWN_LOCATION, "environment variable $SOURCE_DATE_EPOCH: "
"trailing garbage: %s\n", endptr);
if (epoch < 0)
fatal_error (UNKNOWN_LOCATION, "environment variable $SOURCE_DATE_EPOCH: "
"value must be nonnegative: %lld \n", epoch);
return (time_t) epoch;
}
#include "gt-c-family-c-common.h"

View File

@ -1471,4 +1471,9 @@ extern bool valid_array_size_p (location_t, tree, tree);
extern bool cilk_ignorable_spawn_rhs_op (tree);
extern bool cilk_recognize_spawn (tree, tree *);
/* 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. */
extern time_t get_source_date_epoch (void);
#endif /* ! GCC_C_COMMON_H */

View File

@ -388,6 +388,9 @@ c_lex_with_flags (tree *value, location_t *loc, unsigned char *cpp_flags,
enum cpp_ttype type;
unsigned char add_flags = 0;
enum overflow_type overflow = OT_NONE;
time_t source_date_epoch = get_source_date_epoch ();
cpp_init_source_date_epoch (parse_in, source_date_epoch);
timevar_push (TV_CPP);
retry:

View File

@ -79,4 +79,21 @@ main input file is omitted.
@ifclear cppmanual
@xref{Preprocessor Options}.
@end ifclear
@item SOURCE_DATE_EPOCH
If this variable is set, its value specifies a UNIX timestamp to be
used in replacement of the current date and time in the @code{__DATE__}
and @code{__TIME__} macros, so that the embedded timestamps become
reproducible.
The value of @env{SOURCE_DATE_EPOCH} must be a UNIX timestamp,
defined as the number of seconds (excluding leap seconds) since
01 Jan 1970 00:00:00 represented in ASCII, identical to the output of
@samp{@command{date +%s}}.
The value should be a known timestamp such as the last modification
time of the source or package and it should be set by the build
process.
@end vtable

View File

@ -1,3 +1,15 @@
2016-04-28 Eduard Sanou <dhole@openmailbox.org>
Matthias Klose <doko@debian.org>
* include/cpplib.h (cpp_init_source_date_epoch): Prototype.
* init.c (cpp_init_source_date_epoch): New function.
* internal.h: Added source_date_epoch variable to struct
cpp_reader to store a reproducible date.
* macro.c (_cpp_builtin_macro_text): Set pfile->date timestamp from
pfile->source_date_epoch instead of localtime if source_date_epoch is
set, to be used for __DATE__ and __TIME__ macros to help reproducible
builds.
2016-04-13 Bernd Schmidt <bschmidt@redhat.com>
Patch from Roger Orr <rogero@howzatt.demon.co.uk>

View File

@ -784,6 +784,9 @@ extern void cpp_init_special_builtins (cpp_reader *);
/* Set up built-ins like __FILE__. */
extern void cpp_init_builtins (cpp_reader *, int);
/* Initialize the source_date_epoch value. */
extern void cpp_init_source_date_epoch (cpp_reader *, time_t);
/* This is called after options have been parsed, and partially
processed. */
extern void cpp_post_options (cpp_reader *);

View File

@ -533,8 +533,15 @@ cpp_init_builtins (cpp_reader *pfile, int hosted)
_cpp_define_builtin (pfile, "__OBJC__ 1");
}
/* Initialize the source_date_epoch value. */
void
cpp_init_source_date_epoch (cpp_reader *pfile, time_t source_date_epoch)
{
pfile->source_date_epoch = source_date_epoch;
}
/* Sanity-checks are dependent on command-line options, so it is
called as a subroutine of cpp_read_main_file (). */
called as a subroutine of cpp_read_main_file. */
#if CHECKING_P
static void sanity_checks (cpp_reader *);
static void sanity_checks (cpp_reader *pfile)

View File

@ -502,6 +502,10 @@ struct cpp_reader
const unsigned char *date;
const unsigned char *time;
/* Externally set timestamp to replace current date and time useful for
reproducibility. */
time_t source_date_epoch;
/* EOF token, and a token forcing paste avoidance. */
cpp_token avoid_paste;
cpp_token eof;

View File

@ -357,13 +357,20 @@ _cpp_builtin_macro_text (cpp_reader *pfile, cpp_hashnode *node,
time_t tt;
struct tm *tb = NULL;
/* (time_t) -1 is a legitimate value for "number of seconds
since the Epoch", so we have to do a little dance to
distinguish that from a genuine error. */
errno = 0;
tt = time(NULL);
if (tt != (time_t)-1 || errno == 0)
tb = localtime (&tt);
/* Set a reproducible timestamp for __DATE__ and __TIME__ macro
usage if SOURCE_DATE_EPOCH is defined. */
if (pfile->source_date_epoch != (time_t) -1)
tb = gmtime (&pfile->source_date_epoch);
else
{
/* (time_t) -1 is a legitimate value for "number of seconds
since the Epoch", so we have to do a little dance to
distinguish that from a genuine error. */
errno = 0;
tt = time (NULL);
if (tt != (time_t)-1 || errno == 0)
tb = localtime (&tt);
}
if (tb)
{