OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

c-common.c (get_source_date_epoch): Use int64_t instead of long long. 

* c-common.c (get_source_date_epoch): Use int64_t instead of long long.

	* gcov-tool.c (profile_rewrite): Use int64_t instead of long long.
	(do_rewrite): likewise.

	* line-map.c (location_adhoc_data_update): Use int64_t instead of
	long long.
	(get_combined_adhoc_loc): Likewise.

From-SVN: r237676
This commit is contained in:
John David Anglin 2016-06-22 01:46:06 +00:00
parent d008cb31fd
commit fe55692cb3
6 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -1,3 +1,8 @@
2016-06-21 John David Anglin <danglin@gcc.gnu.org>
* gcov-tool.c (profile_rewrite): Use int64_t instead of long long.
(do_rewrite): likewise.
2016-06-21 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
* common/config/mep/mep-common.c: Remove.

4
gcc/c-family/ChangeLog
View File

@ -1,3 +1,7 @@
2016-06-21 John David Anglin <danglin@gcc.gnu.org>
* c-common.c (get_source_date_epoch): Use int64_t instead of long long.
2016-06-14 Jason Merrill <jason@redhat.com>
P0145R2: Refining Expression Order for C++.

6
gcc/c-family/c-common.c
View File

@ -12811,7 +12811,7 @@ time_t
cb_get_source_date_epoch (cpp_reader *pfile ATTRIBUTE_UNUSED)
{
char *source_date_epoch;
long long epoch;
int64_t epoch;
char *endptr;
source_date_epoch = getenv ("SOURCE_DATE_EPOCH");
@ -12819,7 +12819,11 @@ cb_get_source_date_epoch (cpp_reader *pfile ATTRIBUTE_UNUSED)
return (time_t) -1;
errno = 0;
#if defined(INT64_T_IS_LONG)
epoch = strtol (source_date_epoch, &endptr, 10);
#else
epoch = strtoll (source_date_epoch, &endptr, 10);
#endif
if (errno != 0 || endptr == source_date_epoch || *endptr != '\0'
|| epoch < 0 || epoch > MAX_SOURCE_DATE_EPOCH)
{

14
gcc/gcov-tool.c
View File

@ -232,7 +232,7 @@ do_merge (int argc, char **argv)
Otherwise, multiply the all counters by SCALE. */
static int
profile_rewrite (const char *d1, const char *out, long long n_val,
profile_rewrite (const char *d1, const char *out, int64_t n_val,
float scale, int n, int d)
{
struct gcov_info * d1_profile;
@ -261,7 +261,7 @@ print_rewrite_usage_message (int error_p)
fnotice (file, " -v, --verbose Verbose mode\n");
fnotice (file, " -o, --output <dir> Output directory\n");
fnotice (file, " -s, --scale <float or simple-frac> Scale the profile counters\n");
fnotice (file, " -n, --normalize <long long> Normalize the profile\n");
fnotice (file, " -n, --normalize <int64_t> Normalize the profile\n");
}
static const struct option rewrite_options[] =
@ -291,11 +291,7 @@ do_rewrite (int argc, char **argv)
int opt;
int ret;
const char *output_dir = 0;
#ifdef HAVE_LONG_LONG
long long normalize_val = 0;
#else
int64_t normalize_val = 0;
#endif
float scale = 0.0;
int numerator = 1;
int denominator = 1;
@ -315,12 +311,10 @@ do_rewrite (int argc, char **argv)
break;
case 'n':
if (!do_scaling)
#if defined(HAVE_LONG_LONG)
normalize_val = strtoll (optarg, (char **)NULL, 10);
#elif defined(INT64_T_IS_LONG)
#if defined(INT64_T_IS_LONG)
normalize_val = strtol (optarg, (char **)NULL, 10);
#else
sscanf (optarg, "%" SCNd64, &normalize_val);
normalize_val = strtoll (optarg, (char **)NULL, 10);
#endif
else
fnotice (stderr, "scaling cannot co-exist with normalization,"

6
libcpp/ChangeLog
View File

@ -1,3 +1,9 @@
2016-06-21 John David Anglin <danglin@gcc.gnu.org>
* line-map.c (location_adhoc_data_update): Use int64_t instead of
long long.
(get_combined_adhoc_loc): Likewise.
2016-06-01 Eduard Sanou <dhole@openmailbox.org>
* include/cpplib.h (cpp_callbacks): Add get_source_date_epoch

4
libcpp/line-map.c
View File

@ -102,7 +102,7 @@ location_adhoc_data_eq (const void *l1, const void *l2)
static int
location_adhoc_data_update (void **slot, void *data)
{
*((char **) slot) += *((long long *) data);
*((char **) slot) += *((int64_t *) data);
return 1;
}
@ -224,7 +224,7 @@ get_combined_adhoc_loc (struct line_maps *set,
set->location_adhoc_data_map.allocated)
{
char *orig_data = (char *) set->location_adhoc_data_map.data;
long long offset;
int64_t offset;
/* Cast away extern "C" from the type of xrealloc. */
line_map_realloc reallocator = (set->reallocator
? set->reallocator