aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFranz Sirl <franz.sirl-kernel@lauterbach.com>2018-01-24 13:39:11 +0000
committerCary Coutant <ccoutant@gmail.com>2018-07-11 08:36:49 -0700
commit8238fb6230e5b8b58a024b1202edcd394af4780d (patch)
tree30304bd560b5d651623ba620a498b7b3bcae9d6b
parent557b8e0ea452395c3ca89e8146e5d7f29e9f8af6 (diff)
downloadgdb-8238fb6230e5b8b58a024b1202edcd394af4780d.zip
gdb-8238fb6230e5b8b58a024b1202edcd394af4780d.tar.gz
gdb-8238fb6230e5b8b58a024b1202edcd394af4780d.tar.bz2
Fix printing the size of GOLD's memory areana on Cygwin based systems.
I just stumbled over this with 2.29.1 while building a cross-toolchain, on Cygwin64, but it's still the same for 2.30. m.arena has size_t on Cygwin64 and thus errors out due to -Werror=format. gold * main.cc: Print m.arena as long long.
-rw-r--r--gold/ChangeLog4
-rw-r--r--gold/main.cc4
2 files changed, 6 insertions, 2 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index eeb19e7..aa9c412 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,7 @@
+2018-07-11 Franz Sirl <franz.sirl-kernel@lauterbach.com>
+
+ * main.cc: Print m.arena as long long.
+
2018-07-09 Cary Coutant <ccoutant@gmail.com>
* incremental.cc (Sized_incremental_binary::setup_readers): Use
diff --git a/gold/main.cc b/gold/main.cc
index aa6c698..06d810f 100644
--- a/gold/main.cc
+++ b/gold/main.cc
@@ -292,8 +292,8 @@ main(int argc, char** argv)
#ifdef HAVE_MALLINFO
struct mallinfo m = mallinfo();
- fprintf(stderr, _("%s: total space allocated by malloc: %d bytes\n"),
- program_name, m.arena);
+ fprintf(stderr, _("%s: total space allocated by malloc: %lld bytes\n"),
+ program_name, static_cast<long long>(m.arena));
#endif
File_read::print_stats();
Archive::print_stats();