From e608ef6de92f53558b27b3166d5da5ea3725461d Mon Sep 17 00:00:00 2001 From: John David Anglin Date: Fri, 9 Jan 2015 00:50:49 +0000 Subject: [PATCH] re PR gcov-profile/61790 (gcov-tool.c uses atoll) PR gcov-profile/61790 * gcov-tool.c (do_rewrite): Use strtoll instead of atoll if host has long long. Fallback to int64_t if host doesn't have long long and use strtol if int64_t is long. Otherwise, use sscanf for conversion. From-SVN: r219372 --- gcc/ChangeLog | 7 +++++++ gcc/gcov-tool.c | 12 +++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 33ba9dae10a..c38f07aca59 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2015-01-08 John David Anglin + + PR gcov-profile/61790 + * gcov-tool.c (do_rewrite): Use strtoll instead of atoll if host has + long long. Fallback to int64_t if host doesn't have long long and + use strtol if int64_t is long. Otherwise, use sscanf for conversion. + 2015-01-08 Jakub Jelinek PR tree-optimization/63989 diff --git a/gcc/gcov-tool.c b/gcc/gcov-tool.c index 1268986f454..7de175fdfcc 100644 --- a/gcc/gcov-tool.c +++ b/gcc/gcov-tool.c @@ -289,7 +289,11 @@ 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; @@ -309,7 +313,13 @@ do_rewrite (int argc, char **argv) break; case 'n': if (!do_scaling) - normalize_val = atoll (optarg); +#if defined(HAVE_LONG_LONG) + normalize_val = strtoll (optarg, (char **)NULL, 10); +#elif defined(INT64_T_IS_LONG) + normalize_val = strtol (optarg, (char **)NULL, 10); +#else + sscanf (optarg, "%" SCNd64, &normalize_val); +#endif else fnotice (stderr, "scaling cannot co-exist with normalization," " skipping\n"); -- 2.30.2