summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lld/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp2
-rw-r--r--lld/test/elf/Mips/e-flags-merge-10.test2
-rw-r--r--lld/test/elf/Mips/e-flags-merge-11.test2
-rw-r--r--lld/test/elf/Mips/e-flags-merge-9.test2
4 files changed, 4 insertions, 4 deletions
diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp b/lld/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp
index d8c1aad39de..0ef2c70b815 100644
--- a/lld/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp
+++ b/lld/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp
@@ -135,7 +135,7 @@ std::error_code MipsELFFlagsMerger::merge(uint8_t newClass, uint32_t newFlags) {
if (!matchMipsISA(newArch, oldArch)) {
if (!matchMipsISA(oldArch, newArch))
return make_dynamic_error_code(
- Twine("Linking modules with icompatible ISA"));
+ Twine("Linking modules with incompatible ISA"));
_flags &= ~EF_MIPS_ARCH;
_flags |= newArch;
}
diff --git a/lld/test/elf/Mips/e-flags-merge-10.test b/lld/test/elf/Mips/e-flags-merge-10.test
index 33d4e85868d..a0aa45d5f2c 100644
--- a/lld/test/elf/Mips/e-flags-merge-10.test
+++ b/lld/test/elf/Mips/e-flags-merge-10.test
@@ -7,7 +7,7 @@
# RUN: not lld -flavor gnu -target mipsel -shared -o %t.so \
# RUN: %t-32r2.o %t-32r6.o 2>&1 | FileCheck %s
-# CHECK: Linking modules with icompatible ISA
+# CHECK: Linking modules with incompatible ISA
# 32r2.o
---
diff --git a/lld/test/elf/Mips/e-flags-merge-11.test b/lld/test/elf/Mips/e-flags-merge-11.test
index e51427dacf3..b4c0039bd19 100644
--- a/lld/test/elf/Mips/e-flags-merge-11.test
+++ b/lld/test/elf/Mips/e-flags-merge-11.test
@@ -7,7 +7,7 @@
# RUN: not lld -flavor gnu -target mips64el -shared -o %t.so \
# RUN: %t-64r2.o %t-64r6.o 2>&1 | FileCheck %s
-# CHECK: Linking modules with icompatible ISA
+# CHECK: Linking modules with incompatible ISA
# 64r2.o
---
diff --git a/lld/test/elf/Mips/e-flags-merge-9.test b/lld/test/elf/Mips/e-flags-merge-9.test
index 767a2b5e725..dea32f07cb9 100644
--- a/lld/test/elf/Mips/e-flags-merge-9.test
+++ b/lld/test/elf/Mips/e-flags-merge-9.test
@@ -7,7 +7,7 @@
# RUN: not lld -flavor gnu -target mipsel -shared -o %t.so \
# RUN: %t-32r2.o %t-64.o 2>&1 | FileCheck %s
-# CHECK: Linking modules with icompatible ISA
+# CHECK: Linking modules with incompatible ISA
# 32r2.o
---
OpenPOWER on IntegriCloud