diff options
| -rw-r--r-- | lld/ELF/Writer.cpp | 2 | ||||
| -rw-r--r-- | lld/test/ELF/linkerscript/overlapping-sections.s | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp index 309022dbb92..5e0a34e755b 100644 --- a/lld/ELF/Writer.cpp +++ b/lld/ELF/Writer.cpp @@ -1937,7 +1937,7 @@ template <class ELFT> void Writer<ELFT>::setPhdrs() { static std::string rangeToString(uint64_t Addr, uint64_t Len) { if (Len == 0) return "<empty range at 0x" + utohexstr(Addr) + ">"; - return "[0x" + utohexstr(Addr) + " -> 0x" + utohexstr(Addr + Len - 1) + "]"; + return "[0x" + utohexstr(Addr) + ", 0x" + utohexstr(Addr + Len - 1) + "]"; } // Check whether sections overlap for a specific address range (file offsets, diff --git a/lld/test/ELF/linkerscript/overlapping-sections.s b/lld/test/ELF/linkerscript/overlapping-sections.s index fcc995706de..2da06f493b9 100644 --- a/lld/test/ELF/linkerscript/overlapping-sections.s +++ b/lld/test/ELF/linkerscript/overlapping-sections.s @@ -63,8 +63,8 @@ # RUN: }" > %t-lma.script # RUN: not ld.lld -o %t.so --script %t-lma.script %t.o -shared 2>&1 | FileCheck %s -check-prefix LMA-OVERLAP-ERR # LMA-OVERLAP-ERR: error: section .sec1 load address range overlaps with .sec2 -# LMA-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000 -> 0x80FF] -# LMA-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8080 -> 0x817F] +# LMA-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000, 0x80FF] +# LMA-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8080, 0x817F] # Check that we create the expected binary with --noinhibit-exec or --no-check-sections: # RUN: ld.lld -o %t.so --script %t-lma.script %t.o -shared --noinhibit-exec @@ -95,8 +95,8 @@ # RUN: }" > %t-vaddr.script # RUN: not ld.lld -o %t.so --script %t-vaddr.script %t.o -shared 2>&1 | FileCheck %s -check-prefix VADDR-OVERLAP-ERR # VADDR-OVERLAP-ERR: error: section .sec1 virtual address range overlaps with .sec2 -# VADDR-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000 -> 0x80FF] -# VADDR-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8020 -> 0x811F] +# VADDR-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000, 0x80FF] +# VADDR-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8020, 0x811F] # Check that the expected binary was created with --noinhibit-exec: # RUN: ld.lld -o %t.so --script %t-vaddr.script %t.o -shared --noinhibit-exec @@ -123,14 +123,14 @@ # RUN: not ld.lld -o %t.so --script %t-both-overlap.script %t.o -shared 2>&1 | FileCheck %s -check-prefix BOTH-OVERLAP-ERR # BOTH-OVERLAP-ERR: error: section .sec1 file range overlaps with .sec2 -# BOTH-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x18000 -> 0x180FF] -# BOTH-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x18040 -> 0x1813F] +# BOTH-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x18000, 0x180FF] +# BOTH-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x18040, 0x1813F] # BOTH-OVERLAP-ERR: error: section .sec1 virtual address range overlaps with .sec2 -# BOTH-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000 -> 0x80FF] -# BOTH-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8040 -> 0x813F] +# BOTH-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000, 0x80FF] +# BOTH-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8040, 0x813F] # BOTH-OVERLAP-ERR: error: section .sec1 load address range overlaps with .sec2 -# BOTH-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000 -> 0x80FF] -# BOTH-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8040 -> 0x813F] +# BOTH-OVERLAP-ERR-NEXT: >>> .sec1 range is [0x8000, 0x80FF] +# BOTH-OVERLAP-ERR-NEXT: >>> .sec2 range is [0x8040, 0x813F] # RUN: ld.lld -o %t.so --script %t-both-overlap.script %t.o -shared --noinhibit-exec # Note: I case everything overlaps we create a binary with overlapping file |
