From e2fd426bdafe9f5c10066d3926ece6e342184a67 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sat, 19 Jan 2019 10:05:49 +0000 Subject: Vendor import of lld trunk r351319 (just before the release_80 branch point): https://llvm.org/svn/llvm-project/lld/trunk@351319 --- test/ELF/merge-string-error.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/ELF/merge-string-error.s') diff --git a/test/ELF/merge-string-error.s b/test/ELF/merge-string-error.s index 70a361b6ccde6..a0ffaafde8546 100644 --- a/test/ELF/merge-string-error.s +++ b/test/ELF/merge-string-error.s @@ -8,4 +8,4 @@ .data .long .rodata.str1.1 + 4 -// CHECK: merge-string-error.s.tmp.o:(.rodata.str1.1): entry is past the end of the section +// CHECK: merge-string-error.s.tmp.o:(.rodata.str1.1): offset is outside the section -- cgit v1.2.3