<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Mar 10, 2016 at 8:58 AM, George Rimar via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: grimar<br>
Date: Thu Mar 10 10:58:34 2016<br>
New Revision: 263125<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=263125&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=263125&view=rev</a><br>
Log:<br>
[ELF] - Consistent spelling for error/warning messages<br>
<br>
Previously error and warnings were not consistent in lld.<br>
Some of them started from lowercase letter, others from<br>
uppercase. Also there was one or two which had a dot at the end.<br>
This patch changes all messages to start from uppercase letter if<br>
they were not before.<br></blockquote><div><br>Why that convention? Isn't that different from other diagnostic experiences (in clang, gcc, or even in binutils ld/gold/etc)?<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Differential revision: <a href="http://reviews.llvm.org/D18045" rel="noreferrer" target="_blank">http://reviews.llvm.org/D18045</a><br>
<br>
Modified:<br>
lld/trunk/ELF/Driver.cpp<br>
lld/trunk/ELF/DriverUtils.cpp<br>
lld/trunk/ELF/InputFiles.cpp<br>
lld/trunk/ELF/LinkerScript.cpp<br>
lld/trunk/ELF/OutputSections.cpp<br>
lld/trunk/ELF/SymbolTable.cpp<br>
lld/trunk/ELF/Target.cpp<br>
lld/trunk/ELF/Writer.cpp<br>
lld/trunk/test/ELF/basic.s<br>
lld/trunk/test/ELF/conflict.s<br>
lld/trunk/test/ELF/driver.test<br>
lld/trunk/test/ELF/duplicate-internal.s<br>
lld/trunk/test/ELF/invalid-elf.test<br>
lld/trunk/test/ELF/libsearch.s<br>
lld/trunk/test/ELF/linkerscript.s<br>
lld/trunk/test/ELF/lto/duplicated.ll<br>
lld/trunk/test/ELF/sysroot.s<br>
lld/trunk/test/ELF/tls-static.s<br>
lld/trunk/test/ELF/undef-start.s<br>
lld/trunk/test/ELF/undef.s<br>
<br>
Modified: lld/trunk/ELF/Driver.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Driver.cpp?rev=263125&r1=263124&r2=263125&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Driver.cpp?rev=263125&r1=263124&r2=263125&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/Driver.cpp (original)<br>
+++ lld/trunk/ELF/Driver.cpp Thu Mar 10 10:58:34 2016<br>
@@ -92,7 +92,7 @@ void LinkerDriver::addFile(StringRef Pat<br>
using namespace llvm::sys::fs;<br>
log(Path);<br>
auto MBOrErr = MemoryBuffer::getFile(Path);<br>
- if (error(MBOrErr, "cannot open " + Path))<br>
+ if (error(MBOrErr, "Cannot open " + Path))<br>
return;<br>
std::unique_ptr<MemoryBuffer> &MB = *MBOrErr;<br>
MemoryBufferRef MBRef = MB->getMemBufferRef();<br>
@@ -313,7 +313,7 @@ void LinkerDriver::createFiles(opt::Inpu<br>
}<br>
<br>
if (Files.empty() && !HasError)<br>
- error("no input files.");<br>
+ error("No input files");<br>
}<br>
<br>
template <class ELFT> void LinkerDriver::link(opt::InputArgList &Args) {<br>
<br>
Modified: lld/trunk/ELF/DriverUtils.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/DriverUtils.cpp?rev=263125&r1=263124&r2=263125&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/DriverUtils.cpp?rev=263125&r1=263124&r2=263125&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/DriverUtils.cpp (original)<br>
+++ lld/trunk/ELF/DriverUtils.cpp Thu Mar 10 10:58:34 2016<br>
@@ -67,15 +67,15 @@ opt::InputArgList elf::parseArgs(llvm::B<br>
// Parse options and then do error checking.<br>
opt::InputArgList Args = Table.ParseArgs(Vec, MissingIndex, MissingCount);<br>
if (MissingCount)<br>
- error(Twine("missing arg value for \"") + Args.getArgString(MissingIndex) +<br>
+ error(Twine("Missing arg value for \"") + Args.getArgString(MissingIndex) +<br>
"\", expected " + Twine(MissingCount) +<br>
(MissingCount == 1 ? " argument.\n" : " arguments"));<br>
<br>
iterator_range<opt::arg_iterator> Unknowns = Args.filtered(OPT_UNKNOWN);<br>
for (auto *Arg : Unknowns)<br>
- warning("warning: unknown argument: " + Arg->getSpelling());<br>
+ warning("Warning: unknown argument: " + Arg->getSpelling());<br>
if (Unknowns.begin() != Unknowns.end())<br>
- error("unknown argument(s) found");<br>
+ error("Unknown argument(s) found");<br>
return Args;<br>
}<br>
<br>
<br>
Modified: lld/trunk/ELF/InputFiles.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputFiles.cpp?rev=263125&r1=263124&r2=263125&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputFiles.cpp?rev=263125&r1=263124&r2=263125&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/InputFiles.cpp (original)<br>
+++ lld/trunk/ELF/InputFiles.cpp Thu Mar 10 10:58:34 2016<br>
@@ -302,7 +302,7 @@ SymbolBody *elf::ObjectFile<ELFT>::creat<br>
<br>
switch (Sym->getBinding()) {<br>
default:<br>
- fatal("unexpected binding");<br>
+ fatal("Unexpected binding");<br>
case STB_GLOBAL:<br>
case STB_WEAK:<br>
case STB_GNU_UNIQUE: {<br>
<br>
Modified: lld/trunk/ELF/LinkerScript.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/LinkerScript.cpp?rev=263125&r1=263124&r2=263125&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/LinkerScript.cpp?rev=263125&r1=263124&r2=263125&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/LinkerScript.cpp (original)<br>
+++ lld/trunk/ELF/LinkerScript.cpp Thu Mar 10 10:58:34 2016<br>
@@ -166,7 +166,7 @@ void ScriptParser::run() {<br>
if (Handler Fn = Cmd.lookup(Tok))<br>
(this->*Fn)();<br>
else<br>
- setError("unknown directive: " + Tok);<br>
+ setError("Unknown directive: " + Tok);<br>
}<br>
}<br>
<br>
@@ -190,7 +190,7 @@ std::vector<StringRef> ScriptParser::tok<br>
if (S.startswith("\"")) {<br>
size_t E = S.find("\"", 1);<br>
if (E == StringRef::npos) {<br>
- error("unclosed quote");<br>
+ error("Unclosed quote");<br>
return {};<br>
}<br>
Ret.push_back(S.substr(1, E - 1));<br>
@@ -217,7 +217,7 @@ StringRef ScriptParser::skipSpace(String<br>
if (S.startswith("/*")) {<br>
size_t E = S.find("*/", 2);<br>
if (E == StringRef::npos) {<br>
- error("unclosed comment in a linker script");<br>
+ error("Unclosed comment in a linker script");<br>
return "";<br>
}<br>
S = S.substr(E + 2);<br>
@@ -237,7 +237,7 @@ StringRef ScriptParser::next() {<br>
if (Error)<br>
return "";<br>
if (atEOF()) {<br>
- setError("unexpected EOF");<br>
+ setError("Unexpected EOF");<br>
return "";<br>
}<br>
return Tokens[Pos++];<br>
@@ -255,7 +255,7 @@ bool ScriptParser::skip(StringRef Tok) {<br>
if (Error)<br>
return false;<br>
if (atEOF()) {<br>
- setError("unexpected EOF");<br>
+ setError("Unexpected EOF");<br>
return false;<br>
}<br>
if (Tok != Tokens[Pos])<br>
@@ -352,7 +352,7 @@ void ScriptParser::readInclude() {<br>
StringRef Tok = next();<br>
auto MBOrErr = MemoryBuffer::getFile(Tok);<br>
if (!MBOrErr) {<br>
- setError("cannot open " + Tok);<br>
+ setError("Cannot open " + Tok);<br>
return;<br>
}<br>
std::unique_ptr<MemoryBuffer> &MB = *MBOrErr;<br>
@@ -385,7 +385,7 @@ void ScriptParser::readOutputFormat() {<br>
if (Tok == ")")<br>
return;<br>
if (Tok != ",") {<br>
- setError("unexpected token: " + Tok);<br>
+ setError("Unexpected token: " + Tok);<br>
return;<br>
}<br>
next();<br>
<br>
Modified: lld/trunk/ELF/OutputSections.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/OutputSections.cpp?rev=263125&r1=263124&r2=263125&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/OutputSections.cpp?rev=263125&r1=263124&r2=263125&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/OutputSections.cpp (original)<br>
+++ lld/trunk/ELF/OutputSections.cpp Thu Mar 10 10:58:34 2016<br>
@@ -683,7 +683,7 @@ EhFrameHeader<ELFT>::getFdePc(uintX_t Eh<br>
PC = read64<E>(F.PCRel);<br>
break;<br>
default:<br>
- fatal("unknown FDE size encoding");<br>
+ fatal("Unknown FDE size encoding");<br>
}<br>
switch (F.Enc & 0x70) {<br>
case DW_EH_PE_absptr:<br>
@@ -691,7 +691,7 @@ EhFrameHeader<ELFT>::getFdePc(uintX_t Eh<br>
case DW_EH_PE_pcrel:<br>
return PC + EhVA + F.Off + 8;<br>
default:<br>
- fatal("unknown FDE size relative encoding");<br>
+ fatal("Unknown FDE size relative encoding");<br>
}<br>
}<br>
<br>
@@ -1002,7 +1002,7 @@ Cie<ELFT>::Cie(EHInputSection<ELFT> *S,<br>
// Read a byte and advance D by one byte.<br>
static uint8_t readByte(ArrayRef<uint8_t> &D) {<br>
if (D.empty())<br>
- fatal("corrupted or unsupported CIE information");<br>
+ fatal("Corrupted or unsupported CIE information");<br>
uint8_t B = D.front();<br>
D = D.slice(1);<br>
return B;<br>
@@ -1015,7 +1015,7 @@ static void skipLeb128(ArrayRef<uint8_t><br>
if ((Val & 0x80) == 0)<br>
return;<br>
}<br>
- fatal("corrupted or unsupported CIE information");<br>
+ fatal("Corrupted or unsupported CIE information");<br>
}<br>
<br>
template <class ELFT> static size_t getAugPSize(unsigned Enc) {<br>
@@ -1033,7 +1033,7 @@ template <class ELFT> static size_t getA<br>
case DW_EH_PE_sdata8:<br>
return 8;<br>
}<br>
- fatal("unknown FDE encoding");<br>
+ fatal("Unknown FDE encoding");<br>
}<br>
<br>
template <class ELFT> static void skipAugP(ArrayRef<uint8_t> &D) {<br>
@@ -1042,7 +1042,7 @@ template <class ELFT> static void skipAu<br>
fatal("DW_EH_PE_aligned encoding is not supported");<br>
size_t Size = getAugPSize<ELFT>(Enc);<br>
if (Size >= D.size())<br>
- fatal("corrupted CIE");<br>
+ fatal("Corrupted CIE");<br>
D = D.slice(Size);<br>
}<br>
<br>
@@ -1058,7 +1058,7 @@ uint8_t EHOutputSection<ELFT>::getFdeEnc<br>
<br>
const unsigned char *AugEnd = std::find(D.begin() + 1, D.end(), '\0');<br>
if (AugEnd == D.end())<br>
- fatal("corrupted CIE");<br>
+ fatal("Corrupted CIE");<br>
StringRef Aug(reinterpret_cast<const char *>(D.begin()), AugEnd - D.begin());<br>
D = D.slice(Aug.size() + 1);<br>
<br>
@@ -1094,7 +1094,7 @@ uint8_t EHOutputSection<ELFT>::getFdeEnc<br>
readByte(D);<br>
continue;<br>
}<br>
- fatal("unknown .eh_frame augmentation string: " + Aug);<br>
+ fatal("Unknown .eh_frame augmentation string: " + Aug);<br>
}<br>
return DW_EH_PE_absptr;<br>
}<br>
<br>
Modified: lld/trunk/ELF/SymbolTable.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.cpp?rev=263125&r1=263124&r2=263125&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.cpp?rev=263125&r1=263124&r2=263125&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/SymbolTable.cpp (original)<br>
+++ lld/trunk/ELF/SymbolTable.cpp Thu Mar 10 10:58:34 2016<br>
@@ -316,7 +316,7 @@ template <class ELFT> void SymbolTable<E<br>
// equivalent (conflicting), or more preferable, respectively.<br>
int Comp = Existing->compare<ELFT>(New);<br>
if (Comp == 0) {<br>
- std::string S = "duplicate symbol: " + conflictMsg(Existing, New);<br>
+ std::string S = "Duplicate symbol: " + conflictMsg(Existing, New);<br>
if (Config->AllowMultipleDefinition)<br>
warning(S);<br>
else<br>
<br>
Modified: lld/trunk/ELF/Target.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Target.cpp?rev=263125&r1=263124&r2=263125&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Target.cpp?rev=263125&r1=263124&r2=263125&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/Target.cpp (original)<br>
+++ lld/trunk/ELF/Target.cpp Thu Mar 10 10:58:34 2016<br>
@@ -535,7 +535,7 @@ void X86TargetInfo::relocateOne(uint8_t<br>
write32le(Loc, Out<ELF32LE>::TlsPhdr->p_memsz - SA);<br>
break;<br>
default:<br>
- fatal("unrecognized reloc " + Twine(Type));<br>
+ fatal("Unrecognized reloc " + Twine(Type));<br>
}<br>
}<br>
<br>
@@ -953,7 +953,7 @@ void X86_64TargetInfo::relocateOne(uint8<br>
break;<br>
}<br>
default:<br>
- fatal("unrecognized reloc " + Twine(Type));<br>
+ fatal("Unrecognized reloc " + Twine(Type));<br>
}<br>
}<br>
<br>
@@ -983,7 +983,7 @@ void PPCTargetInfo::relocateOne(uint8_t<br>
write16be(Loc, applyPPCLo(SA));<br>
break;<br>
default:<br>
- fatal("unrecognized reloc " + Twine(Type));<br>
+ fatal("Unrecognized reloc " + Twine(Type));<br>
}<br>
}<br>
<br>
@@ -1191,7 +1191,7 @@ void PPC64TargetInfo::relocateOne(uint8_<br>
write64be(Loc, SA);<br>
break;<br>
default:<br>
- fatal("unrecognized reloc " + Twine(Type));<br>
+ fatal("Unrecognized reloc " + Twine(Type));<br>
}<br>
}<br>
<br>
@@ -1454,7 +1454,7 @@ void AArch64TargetInfo::relocateOne(uint<br>
break;<br>
}<br>
default:<br>
- fatal("unrecognized reloc " + Twine(Type));<br>
+ fatal("Unrecognized reloc " + Twine(Type));<br>
}<br>
}<br>
<br>
@@ -1553,7 +1553,7 @@ void AArch64TargetInfo::relocateTlsIeToL<br>
void AMDGPUTargetInfo::relocateOne(uint8_t *Loc, uint8_t *BufEnd, uint32_t Type,<br>
uint64_t P, uint64_t SA, uint64_t ZA,<br>
uint8_t *PairedLoc) const {<br>
- llvm_unreachable("not implemented");<br>
+ llvm_unreachable("Not implemented");<br>
}<br>
<br>
template <class ELFT> MipsTargetInfo<ELFT>::MipsTargetInfo() {<br>
@@ -1770,7 +1770,7 @@ void MipsTargetInfo<ELFT>::relocateOne(u<br>
writeMipsLo16<E>(Loc, S + readSignedLo16<E>(Loc) - P);<br>
break;<br>
default:<br>
- fatal("unrecognized reloc " + Twine(Type));<br>
+ fatal("Unrecognized reloc " + Twine(Type));<br>
}<br>
}<br>
<br>
<br>
Modified: lld/trunk/ELF/Writer.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=263125&r1=263124&r2=263125&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=263125&r1=263124&r2=263125&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/Writer.cpp (original)<br>
+++ lld/trunk/ELF/Writer.cpp Thu Mar 10 10:58:34 2016<br>
@@ -516,7 +516,7 @@ static void reportUndefined(SymbolTable<<br>
if ((Config->Relocatable || Config->Shared) && !Config->NoUndefined)<br>
return;<br>
<br>
- std::string Msg = "undefined symbol: " + Sym->getName().str();<br>
+ std::string Msg = "Undefined symbol: " + Sym->getName().str();<br>
if (InputFile *File = Symtab.findFile(Sym))<br>
Msg += " in " + File->getName().str();<br>
if (Config->NoinhibitExec)<br>
@@ -1525,7 +1525,7 @@ template <class ELFT> bool Writer<ELFT>:<br>
ErrorOr<std::unique_ptr<FileOutputBuffer>> BufferOrErr =<br>
FileOutputBuffer::create(Config->OutputFile, FileSize,<br>
FileOutputBuffer::F_executable);<br>
- if (error(BufferOrErr, "failed to open " + Config->OutputFile))<br>
+ if (error(BufferOrErr, "Failed to open " + Config->OutputFile))<br>
return false;<br>
Buffer = std::move(*BufferOrErr);<br>
return true;<br>
<br>
Modified: lld/trunk/test/ELF/basic.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/basic.s?rev=263125&r1=263124&r2=263125&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/basic.s?rev=263125&r1=263124&r2=263125&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/basic.s (original)<br>
+++ lld/trunk/test/ELF/basic.s Thu Mar 10 10:58:34 2016<br>
@@ -192,25 +192,25 @@ _start:<br>
<br>
# RUN: not ld.lld %t.foo -o %t2 2>&1 | \<br>
# RUN: FileCheck --check-prefix=MISSING %s<br>
-# MISSING: cannot open {{.*}}.foo: {{[Nn]}}o such file or directory<br>
+# MISSING: Cannot open {{.*}}.foo: {{[Nn]}}o such file or directory<br>
<br>
# RUN: not ld.lld -o %t2 2>&1 | \<br>
# RUN: FileCheck --check-prefix=NO_INPUT %s<br>
-# NO_INPUT: no input files.<br>
+# NO_INPUT: No input files<br>
<br>
# RUN: not ld.lld %t.no.such.file -o %t2 2>&1 | \<br>
# RUN: FileCheck --check-prefix=CANNOT_OPEN %s<br>
-# CANNOT_OPEN: cannot open {{.*}}.no.such.file: {{[Nn]}}o such file or directory<br>
+# CANNOT_OPEN: Cannot open {{.*}}.no.such.file: {{[Nn]}}o such file or directory<br>
<br>
# RUN: not ld.lld %t -o 2>&1 | FileCheck --check-prefix=NO_O_VAL %s<br>
-# NO_O_VAL: missing arg value for "-o", expected 1 argument.<br>
+# NO_O_VAL: Missing arg value for "-o", expected 1 argument.<br>
<br>
# RUN: not ld.lld --foo 2>&1 | FileCheck --check-prefix=UNKNOWN %s<br>
-# UNKNOWN: unknown argument: --foo<br>
+# UNKNOWN: Warning: unknown argument: --foo<br>
<br>
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t<br>
# RUN: not ld.lld %t %t -o %t2 2>&1 | FileCheck --check-prefix=DUP %s<br>
-# DUP: duplicate symbol: _start in {{.*}} and {{.*}}<br>
+# DUP: Duplicate symbol: _start in {{.*}} and {{.*}}<br>
<br>
# RUN: not ld.lld %t -o %t -m wrong_emul 2>&1 | FileCheck --check-prefix=UNKNOWN_EMUL %s<br>
# UNKNOWN_EMUL: Unknown emulation: wrong_emul<br>
<br>
Modified: lld/trunk/test/ELF/conflict.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/conflict.s?rev=263125&r1=263124&r2=263125&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/conflict.s?rev=263125&r1=263124&r2=263125&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/conflict.s (original)<br>
+++ lld/trunk/test/ELF/conflict.s Thu Mar 10 10:58:34 2016<br>
@@ -3,20 +3,20 @@<br>
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1.o<br>
# RUN: not ld.lld %t1.o %t1.o -o %t2 2>&1 | FileCheck -check-prefix=DEMANGLE %s<br>
<br>
-# DEMANGLE: duplicate symbol: {{mul\(double, double\)|_Z3muldd}} in<br>
-# DEMANGLE: duplicate symbol: foo in<br>
+# DEMANGLE: Duplicate symbol: {{mul\(double, double\)|_Z3muldd}} in<br>
+# DEMANGLE: Duplicate symbol: foo in<br>
<br>
# RUN: not ld.lld %t1.o %t1.o -o %t2 --no-demangle 2>&1 | \<br>
# RUN: FileCheck -check-prefix=NO_DEMANGLE %s<br>
<br>
-# NO_DEMANGLE: duplicate symbol: _Z3muldd in<br>
-# NO_DEMANGLE: duplicate symbol: foo in<br>
+# NO_DEMANGLE: Duplicate symbol: _Z3muldd in<br>
+# NO_DEMANGLE: Duplicate symbol: foo in<br>
<br>
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %S/Inputs/conflict.s -o %t2.o<br>
# RUN: llvm-ar rcs %t3.a %t2.o<br>
# RUN: not ld.lld %t1.o %t3.a -u baz -o %t2 2>&1 | FileCheck -check-prefix=ARCHIVE %s<br>
<br>
-# ARCHIVE: duplicate symbol: foo in {{.*}}1.o and {{.*}}3.a({{.*}}2.o)<br>
+# ARCHIVE: Duplicate symbol: foo in {{.*}}1.o and {{.*}}3.a({{.*}}2.o)<br>
<br>
.globl _Z3muldd, foo<br>
_Z3muldd:<br>
<br>
Modified: lld/trunk/test/ELF/driver.test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/driver.test?rev=263125&r1=263124&r2=263125&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/driver.test?rev=263125&r1=263124&r2=263125&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/driver.test (original)<br>
+++ lld/trunk/test/ELF/driver.test Thu Mar 10 10:58:34 2016<br>
@@ -3,16 +3,16 @@<br>
# RUN: not ld.lld --unknown1 --unknown2 -m foo /no/such/file -lnosuchlib \<br>
# RUN: 2>&1 | FileCheck -check-prefix=UNKNOWN %s<br>
<br>
-# UNKNOWN: warning: unknown argument: --unknown1<br>
-# UNKNOWN: warning: unknown argument: --unknown2<br>
-# UNKNOWN: unknown argument(s) found<br>
+# UNKNOWN: Warning: unknown argument: --unknown1<br>
+# UNKNOWN: Warning: unknown argument: --unknown2<br>
+# UNKNOWN: Unknown argument(s) found<br>
# UNKNOWN: Unknown emulation: foo<br>
-# UNKNOWN: cannot open /no/such/file<br>
+# UNKNOWN: Cannot open /no/such/file<br>
# UNKNOWN: Unable to find library -lnosuchlib<br>
<br>
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t<br>
# RUN: not ld.lld %t -o /no/such/file 2>&1 | FileCheck -check-prefix=MISSING %s<br>
-# MISSING: failed to open /no/such/file<br>
+# MISSING: Failed to open /no/such/file<br>
<br>
# RUN: ld.lld --help 2>&1 | FileCheck -check-prefix=HELP %s<br>
# HELP: USAGE:<br>
<br>
Modified: lld/trunk/test/ELF/duplicate-internal.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/duplicate-internal.s?rev=263125&r1=263124&r2=263125&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/duplicate-internal.s?rev=263125&r1=263124&r2=263125&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/duplicate-internal.s (original)<br>
+++ lld/trunk/test/ELF/duplicate-internal.s Thu Mar 10 10:58:34 2016<br>
@@ -3,7 +3,7 @@<br>
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o<br>
# RUN: not ld.lld -shared %t.o -o %t.so 2>&1 | FileCheck %s<br>
<br>
-# CHECK: duplicate symbol: _gp in (internal) and {{.*}}<br>
+# CHECK: Duplicate symbol: _gp in (internal) and {{.*}}<br>
<br>
# REQUIRES: mips<br>
<br>
<br>
Modified: lld/trunk/test/ELF/invalid-elf.test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/invalid-elf.test?rev=263125&r1=263124&r2=263125&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/invalid-elf.test?rev=263125&r1=263124&r2=263125&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/invalid-elf.test (original)<br>
+++ lld/trunk/test/ELF/invalid-elf.test Thu Mar 10 10:58:34 2016<br>
@@ -14,7 +14,7 @@<br>
<br>
# RUN: not ld.lld %p/Inputs/invalid-binding.elf -o %t2 2>&1 | \<br>
# RUN: FileCheck --check-prefix=INVALID-BINDING %s<br>
-# INVALID-BINDING: unexpected binding<br>
+# INVALID-BINDING: Unexpected binding<br>
<br>
# RUN: not ld.lld %p/Inputs/invalid-section-index.elf -o %t2 2>&1 | \<br>
# RUN: FileCheck --check-prefix=INVALID-SECTION-INDEX %s<br>
<br>
Modified: lld/trunk/test/ELF/libsearch.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/libsearch.s?rev=263125&r1=263124&r2=263125&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/libsearch.s?rev=263125&r1=263124&r2=263125&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/libsearch.s (original)<br>
+++ lld/trunk/test/ELF/libsearch.s Thu Mar 10 10:58:34 2016<br>
@@ -13,12 +13,12 @@<br>
// Should fail if no library specified<br>
// RUN: not ld.lld -l 2>&1 \<br>
// RUN: | FileCheck --check-prefix=NOLIBRARY %s<br>
-// NOLIBRARY: missing arg value for "-l", expected 1 argument.<br>
+// NOLIBRARY: Missing arg value for "-l", expected 1 argument.<br>
<br>
// Should not link because of undefined symbol _bar<br>
// RUN: not ld.lld -o %t3 %t.o 2>&1 \<br>
// RUN: | FileCheck --check-prefix=UNDEFINED %s<br>
-// UNDEFINED: undefined symbol: _bar<br>
+// UNDEFINED: Undefined symbol: _bar<br>
<br>
// Should fail if cannot find specified library (without -L switch)<br>
// RUN: not ld.lld -o %t3 %t.o -lls 2>&1 \<br>
<br>
Modified: lld/trunk/test/ELF/linkerscript.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript.s?rev=263125&r1=263124&r2=263125&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript.s?rev=263125&r1=263124&r2=263125&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/linkerscript.s (original)<br>
+++ lld/trunk/test/ELF/linkerscript.s Thu Mar 10 10:58:34 2016<br>
@@ -58,7 +58,7 @@<br>
# RUN: not ld.lld -o %t2 %t.script %t > %t.log 2>&1<br>
# RUN: FileCheck -check-prefix=ERR-ENTRY %s < %t.log<br>
<br>
-# ERR-ENTRY: undefined symbol: _wrong_label<br>
+# ERR-ENTRY: Undefined symbol: _wrong_label<br>
<br>
# -e has precedence over linker script's ENTRY.<br>
# RUN: echo "ENTRY(_label)" > %t.script<br>
@@ -104,7 +104,7 @@<br>
# RUN: not ld.lld -o foo %t.script > %t.log 2>&1<br>
# RUN: FileCheck -check-prefix=ERR1 %s < %t.log<br>
<br>
-# ERR1: unknown directive: FOO<br>
+# ERR1: Unknown directive: FOO<br>
<br>
.globl _start, _label;<br>
_start:<br>
<br>
Modified: lld/trunk/test/ELF/lto/duplicated.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/duplicated.ll?rev=263125&r1=263124&r2=263125&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/duplicated.ll?rev=263125&r1=263124&r2=263125&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/lto/duplicated.ll (original)<br>
+++ lld/trunk/test/ELF/lto/duplicated.ll Thu Mar 10 10:58:34 2016<br>
@@ -1,7 +1,7 @@<br>
; REQUIRES: x86<br>
; RUN: llvm-as %s -o %t.o<br>
; RUN: not ld.lld -m elf_x86_64 %t.o %t.o -o %t.so -shared 2>&1 | FileCheck %s<br>
-; CHECK: duplicate symbol: f in {{.*}}.o and {{.*}}.o<br>
+; CHECK: Duplicate symbol: f in {{.*}}.o and {{.*}}.o<br>
target triple = "x86_64-unknown-linux-gnu"<br>
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"<br>
<br>
<br>
Modified: lld/trunk/test/ELF/sysroot.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/sysroot.s?rev=263125&r1=263124&r2=263125&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/sysroot.s?rev=263125&r1=263124&r2=263125&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/sysroot.s (original)<br>
+++ lld/trunk/test/ELF/sysroot.s Thu Mar 10 10:58:34 2016<br>
@@ -9,7 +9,7 @@<br>
// Should not link because of undefined symbol _bar<br>
// RUN: not ld.lld -o %t/r %t/m.o 2>&1 \<br>
// RUN: | FileCheck --check-prefix=UNDEFINED %s<br>
-// UNDEFINED: undefined symbol: _bar<br>
+// UNDEFINED: Undefined symbol: _bar<br>
<br>
// We need to be sure that there is no suitable library in the /lib directory<br>
// RUN: not ld.lld -o %t/r %t/m.o -L/lib -l:libls.a 2>&1 \<br>
<br>
Modified: lld/trunk/test/ELF/tls-static.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/tls-static.s?rev=263125&r1=263124&r2=263125&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/tls-static.s?rev=263125&r1=263124&r2=263125&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/tls-static.s (original)<br>
+++ lld/trunk/test/ELF/tls-static.s Thu Mar 10 10:58:34 2016<br>
@@ -10,4 +10,4 @@<br>
_start:<br>
call __tls_get_addr<br>
<br>
-// CHECK: undefined symbol: __tls_get_addr<br>
+// CHECK: Undefined symbol: __tls_get_addr<br>
<br>
Modified: lld/trunk/test/ELF/undef-start.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/undef-start.s?rev=263125&r1=263124&r2=263125&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/undef-start.s?rev=263125&r1=263124&r2=263125&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/undef-start.s (original)<br>
+++ lld/trunk/test/ELF/undef-start.s Thu Mar 10 10:58:34 2016<br>
@@ -1,4 +1,4 @@<br>
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t<br>
# RUN: not ld.lld %t -o %t2 2>&1 | FileCheck %s<br>
-# CHECK: undefined symbol: _start<br>
+# CHECK: Undefined symbol: _start<br>
# REQUIRES: x86<br>
<br>
Modified: lld/trunk/test/ELF/undef.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/undef.s?rev=263125&r1=263124&r2=263125&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/undef.s?rev=263125&r1=263124&r2=263125&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/undef.s (original)<br>
+++ lld/trunk/test/ELF/undef.s Thu Mar 10 10:58:34 2016<br>
@@ -1,7 +1,7 @@<br>
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t<br>
# RUN: not ld.lld %t -o %t2 2>&1 | FileCheck %s<br>
-# CHECK: undefined symbol: bar in {{.*}}<br>
-# CHECK: undefined symbol: foo in {{.*}}<br>
+# CHECK: Undefined symbol: bar in {{.*}}<br>
+# CHECK: Undefined symbol: foo in {{.*}}<br>
# REQUIRES: x86<br>
<br>
.globl _start<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>