From a0c4fb0ac6d0ef13a106a7b46396e8592cd2eeb5 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Sun, 14 Oct 2007 06:57:58 +0000 Subject: [PATCH] Remove extraneous newlines. --- gold/archive.cc | 2 +- gold/fileread.cc | 6 +++--- gold/i386.cc | 2 +- gold/output.cc | 2 +- gold/script.cc | 2 +- gold/x86_64.cc | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gold/archive.cc b/gold/archive.cc index e7a87824080..4d95b7901d6 100644 --- a/gold/archive.cc +++ b/gold/archive.cc @@ -196,7 +196,7 @@ Archive::interpret_header(const Archive_header* hdr, off_t off, if (name_end == NULL || name_end - hdr->ar_name >= static_cast(sizeof hdr->ar_name)) { - gold_error(_("%s: malformed archive header name at %zu\n"), + gold_error(_("%s: malformed archive header name at %zu"), this->name().c_str(), static_cast(off)); return this->input_file_->file().filesize() - off; } diff --git a/gold/fileread.cc b/gold/fileread.cc index ed14d98567b..c4145de5cdb 100644 --- a/gold/fileread.cc +++ b/gold/fileread.cc @@ -438,7 +438,7 @@ Input_file::open(const General_options& options, const Dirsearch& dirpath) name = dirpath.find(n1, n2, &this->is_in_sysroot_); if (name.empty()) { - gold_error(_("cannot find -l%s\n"), + gold_error(_("cannot find -l%s"), this->input_argument_->name()); return false; } @@ -465,7 +465,7 @@ Input_file::open(const General_options& options, const Dirsearch& dirpath) &this->is_in_sysroot_); if (name.empty()) { - gold_error(_("cannot find %s\n"), + gold_error(_("cannot find %s"), this->input_argument_->name()); return false; } @@ -476,7 +476,7 @@ Input_file::open(const General_options& options, const Dirsearch& dirpath) // Now that we've figured out where the file lives, try to open it. if (!this->file_.open(name)) { - gold_error(_("cannot open %s: %s\n"), + gold_error(_("cannot open %s: %s"), name.c_str(), strerror(errno)); return false; } diff --git a/gold/i386.cc b/gold/i386.cc index 837f5abdf84..81d02b9ef25 100644 --- a/gold/i386.cc +++ b/gold/i386.cc @@ -779,7 +779,7 @@ Target_i386::Scan::local(const General_options&, case elfcpp::R_386_TLS_DTPOFF32: case elfcpp::R_386_TLS_TPOFF32: case elfcpp::R_386_TLS_DESC: - gold_error(_("%s: unexpected reloc %u in object file\n"), + gold_error(_("%s: unexpected reloc %u in object file"), object->name().c_str(), r_type); break; diff --git a/gold/output.cc b/gold/output.cc index 99a2954f8f9..60d94968ed3 100644 --- a/gold/output.cc +++ b/gold/output.cc @@ -1718,7 +1718,7 @@ void Output_file::close() { if (::munmap(this->base_, this->file_size_) < 0) - gold_error(_("%s: munmap: %s\n"), this->name_, strerror(errno)); + gold_error(_("%s: munmap: %s"), this->name_, strerror(errno)); this->base_ = NULL; if (::close(this->o_) < 0) diff --git a/gold/script.cc b/gold/script.cc index b672385e98c..2cea0c88787 100644 --- a/gold/script.cc +++ b/gold/script.cc @@ -1166,7 +1166,7 @@ yyerror(void* closurev, const char* message) { Parser_closure* closure = static_cast(closurev); - gold_error(_("%s: %s\n"), closure->filename(), message); + gold_error(_("%s: %s"), closure->filename(), message); } // Called by the bison parser to add a file to the link. diff --git a/gold/x86_64.cc b/gold/x86_64.cc index e454e246e83..adba1ccb326 100644 --- a/gold/x86_64.cc +++ b/gold/x86_64.cc @@ -151,7 +151,7 @@ class Target_x86_64 : public Sized_target<64, false> if (this->skip_call_tls_get_addr_) { // FIXME: This needs to specify the location somehow. - gold_error(_("missing expected TLS relocation\n")); + gold_error(_("missing expected TLS relocation")); } } -- 2.30.2