diff options
| author | Franz Sirl <franz.sirl-kernel@lauterbach.com> | 2018-07-11 16:44:22 +0100 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2018-07-11 16:44:22 +0100 |
| commit | ea22a560ea53d564730cddeba06c9abe144e5b79 (patch) | |
| tree | 7a008bd19580304a4d20a4902a69b1b384d6a490 | |
| parent | 557b8e0ea452395c3ca89e8146e5d7f29e9f8af6 (diff) | |
| download | fsf-binutils-gdb-ea22a560ea53d564730cddeba06c9abe144e5b79.zip fsf-binutils-gdb-ea22a560ea53d564730cddeba06c9abe144e5b79.tar.gz fsf-binutils-gdb-ea22a560ea53d564730cddeba06c9abe144e5b79.tar.bz2 | |
Reimport a patch to fix building gold on Cygwin64 systms: 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/ChangeLog | 8 | ||||
| -rw-r--r-- | gold/main.cc | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index eeb19e7..7cc811d 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,11 @@ +2018-07-11 Nick Clifton <nickc@redhat.com> + + Reimport this patch: + + 2018-01-24 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(); |