diff options
| -rw-r--r-- | lld/ELF/LinkerScript.cpp | 4 | ||||
| -rw-r--r-- | lld/test/ELF/linkerscript/orphans.s | 4 | ||||
| -rw-r--r-- | lld/test/ELF/linkerscript/repsection-symbol.s | 6 | ||||
| -rw-r--r-- | lld/test/ELF/linkerscript/sort-non-script.s | 16 |
4 files changed, 7 insertions, 23 deletions
diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp index 56c78d46f5c..f092691517b 100644 --- a/lld/ELF/LinkerScript.cpp +++ b/lld/ELF/LinkerScript.cpp @@ -664,12 +664,12 @@ template <class ELFT> int LinkerScript<ELFT>::getSectionIndex(StringRef Name) { } // A compartor to sort output sections. Returns -1 or 1 if -// A and B are mentioned in linker script. Otherwise, returns 0. +// A or B are mentioned in linker script. Otherwise, returns 0. template <class ELFT> int LinkerScript<ELFT>::compareSections(StringRef A, StringRef B) { int I = getSectionIndex(A); int J = getSectionIndex(B); - if (I == INT_MAX || J == INT_MAX) + if (I == INT_MAX && J == INT_MAX) return 0; return I < J ? -1 : 1; } diff --git a/lld/test/ELF/linkerscript/orphans.s b/lld/test/ELF/linkerscript/orphans.s index 0a8c7ab1129..fa7d30bf7f7 100644 --- a/lld/test/ELF/linkerscript/orphans.s +++ b/lld/test/ELF/linkerscript/orphans.s @@ -14,8 +14,8 @@ # TEXTORPHAN: Sections: # TEXTORPHAN-NEXT: Idx Name # TEXTORPHAN-NEXT: 0 -# TEXTORPHAN-NEXT: 1 .text -# TEXTORPHAN-NEXT: 2 .writable +# TEXTORPHAN-NEXT: 1 .writable +# TEXTORPHAN-NEXT: 2 .text # WRITABLEORPHAN: Sections: # WRITABLEORPHAN-NEXT: Idx Name diff --git a/lld/test/ELF/linkerscript/repsection-symbol.s b/lld/test/ELF/linkerscript/repsection-symbol.s index f7401413c53..f0f0d827129 100644 --- a/lld/test/ELF/linkerscript/repsection-symbol.s +++ b/lld/test/ELF/linkerscript/repsection-symbol.s @@ -6,13 +6,13 @@ # RUN: llvm-readobj -t %t1 | FileCheck %s # CHECK: Name: foo1 -# CHECK-NEXT: Value: 0x288 +# CHECK-NEXT: Value: 0x200 # CHECK: Name: foo2 -# CHECK-NEXT: Value: 0x290 +# CHECK-NEXT: Value: 0x208 # CHECK: Name: foo3 -# CHECK-NEXT: Value: 0x294 +# CHECK-NEXT: Value: 0x20C .section .foo.1,"a" .long 1 diff --git a/lld/test/ELF/linkerscript/sort-non-script.s b/lld/test/ELF/linkerscript/sort-non-script.s deleted file mode 100644 index ac990b9a658..00000000000 --- a/lld/test/ELF/linkerscript/sort-non-script.s +++ /dev/null @@ -1,16 +0,0 @@ -# REQUIRES: x86 -# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t - -# RUN: echo "SECTIONS { foo : {*(foo)} }" > %t.script -# RUN: ld.lld -o %t1 --script %t.script %t -shared -# RUN: llvm-readobj -elf-output-style=GNU -s %t1 | FileCheck %s - -# CHECK: .dynsym {{.*}} A -# CHECK-NEXT: .hash {{.*}} A -# CHECK-NEXT: .dynstr {{.*}} A -# CHECK-NEXT: .text {{.*}} AX -# CHECK-NEXT: .dynamic {{.*}} WA -# CHECK-NEXT: foo {{.*}} WA - -.section foo, "aw" -.byte 0 |
