From 628fe404f79bee73b00076483e33601a209b78db Mon Sep 17 00:00:00 2001 From: Simon Atanasyan Date: Thu, 24 Mar 2016 16:30:20 +0000 Subject: [PATCH] [ELF] Follow-up to r264300. Update test case expectations to reflect recent changes in llvm-readobj. NFC. llvm-svn: 264304 --- lld/test/ELF/comdat.s | 4 +++- lld/test/ELF/discard-merge-locals.s | 4 +++- lld/test/ELF/discard-merge-unnamed.s | 4 +++- lld/test/ELF/dynamic.s | 4 +++- lld/test/ELF/gc-sections-local-sym.s | 4 +++- lld/test/ELF/local-dynamic.s | 4 +++- lld/test/ELF/lto/visibility.ll | 8 ++++++-- lld/test/ELF/merge.s | 4 +++- lld/test/ELF/mips-sto-plt.s | 5 +++-- lld/test/ELF/section-symbol.s | 4 +++- lld/test/ELF/shared.s | 4 +++- lld/test/ELF/symbols.s | 12 +++++++++--- lld/test/ELF/visibility.s | 24 ++++++++++++++++++------ 13 files changed, 63 insertions(+), 22 deletions(-) diff --git a/lld/test/ELF/comdat.s b/lld/test/ELF/comdat.s index d3c8c01..d422ee8 100644 --- a/lld/test/ELF/comdat.s +++ b/lld/test/ELF/comdat.s @@ -66,7 +66,9 @@ foo: // READ-NEXT: Size: 0 // READ-NEXT: Binding: Local // READ-NEXT: Type: None -// READ-NEXT: Other: 2 +// READ-NEXT: Other [ (0x2) +// READ-NEXT: STV_HIDDEN +// READ-NEXT: ] // READ-NEXT: Section: .dynamic // READ-NEXT: } // READ-NEXT: Symbol { diff --git a/lld/test/ELF/discard-merge-locals.s b/lld/test/ELF/discard-merge-locals.s index bf3f9b9..01b4d33 100644 --- a/lld/test/ELF/discard-merge-locals.s +++ b/lld/test/ELF/discard-merge-locals.s @@ -27,7 +27,9 @@ // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None -// CHECK-NEXT: Other: 2 +// CHECK-NEXT: Other [ (0x2) +// CHECK-NEXT: STV_HIDDEN +// CHECK-NEXT: ] // CHECK-NEXT: Section: .dynamic // CHECK-NEXT: } // CHECK-NEXT: ] diff --git a/lld/test/ELF/discard-merge-unnamed.s b/lld/test/ELF/discard-merge-unnamed.s index e61aec5..be174f2 100644 --- a/lld/test/ELF/discard-merge-unnamed.s +++ b/lld/test/ELF/discard-merge-unnamed.s @@ -19,7 +19,9 @@ // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None -// CHECK-NEXT: Other: 2 +// CHECK-NEXT: Other [ (0x2) +// CHECK-NEXT: STV_HIDDEN +// CHECK-NEXT: ] // CHECK-NEXT: Section: .dynamic // CHECK-NEXT: } // CHECK-NEXT: ] diff --git a/lld/test/ELF/dynamic.s b/lld/test/ELF/dynamic.s index 47c162a0..2efd299 100644 --- a/lld/test/ELF/dynamic.s +++ b/lld/test/ELF/dynamic.s @@ -28,7 +28,9 @@ # CHECK-NEXT: Size: 0 # CHECK-NEXT: Binding: Local # CHECK-NEXT: Type: None -# CHECK-NEXT: Other: 2 +# CHECK-NEXT: Other [ (0x2) +# CHECK-NEXT: STV_HIDDEN +# CHECK-NEXT: ] # CHECK-NEXT: Section: .dynamic # CHECK-NEXT: } diff --git a/lld/test/ELF/gc-sections-local-sym.s b/lld/test/ELF/gc-sections-local-sym.s index db9f4c37..89121e2 100644 --- a/lld/test/ELF/gc-sections-local-sym.s +++ b/lld/test/ELF/gc-sections-local-sym.s @@ -40,7 +40,9 @@ zed: // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None -// CHECK-NEXT: Other: 2 +// CHECK-NEXT: Other [ (0x2) +// CHECK-NEXT: STV_HIDDEN +// CHECK-NEXT: ] // CHECK-NEXT: Section: .dynamic // CHECK-NEXT: } // CHECK-NEXT: Symbol { diff --git a/lld/test/ELF/local-dynamic.s b/lld/test/ELF/local-dynamic.s index 156f74e..436516a 100644 --- a/lld/test/ELF/local-dynamic.s +++ b/lld/test/ELF/local-dynamic.s @@ -47,7 +47,9 @@ // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None -// CHECK-NEXT: Other: 2 +// CHECK-NEXT: Other [ (0x2) +// CHECK-NEXT: STV_HIDDEN +// CHECK-NEXT: ] // CHECK-NEXT: Section: .dynamic // CHECK-NEXT: } // CHECK-NEXT: Symbol { diff --git a/lld/test/ELF/lto/visibility.ll b/lld/test/ELF/lto/visibility.ll index b0b6bca..718cc5b 100644 --- a/lld/test/ELF/lto/visibility.ll +++ b/lld/test/ELF/lto/visibility.ll @@ -9,7 +9,9 @@ ; CHECK-NEXT: Size: 0 ; CHECK-NEXT: Binding: Local ; CHECK-NEXT: Type: None -; CHECK-NEXT: Other: 2 +; CHECK-NEXT: Other [ (0x2) +; CHECK-NEXT: STV_HIDDEN +; CHECK-NEXT: ] ; CHECK-NEXT: Section: .text ; CHECK: Name: a @@ -17,7 +19,9 @@ ; CHECK-NEXT: Size: 0 ; CHECK-NEXT: Binding: Local ; CHECK-NEXT: Type: None -; CHECK-NEXT: Other: 2 +; CHECK-NEXT: Other [ (0x2) +; CHECK-NEXT: STV_HIDDEN +; CHECK-NEXT: ] ; CHECK-NEXT: Section: .data target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" diff --git a/lld/test/ELF/merge.s b/lld/test/ELF/merge.s index b5bb5d2..5039ec2 100644 --- a/lld/test/ELF/merge.s +++ b/lld/test/ELF/merge.s @@ -61,7 +61,9 @@ zed: // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None -// CHECK-NEXT: Other: 2 +// CHECK-NEXT: Other [ (0x2) +// CHECK-NEXT: STV_HIDDEN +// CHECK-NEXT: ] // CHECK-NEXT: Section: .mysec // CHECK: ] diff --git a/lld/test/ELF/mips-sto-plt.s b/lld/test/ELF/mips-sto-plt.s index acb6b4c..bd8de41 100644 --- a/lld/test/ELF/mips-sto-plt.s +++ b/lld/test/ELF/mips-sto-plt.s @@ -24,8 +24,9 @@ # CHECK-NEXT: Size: 0 # CHECK-NEXT: Binding: Global # CHECK-NEXT: Type: Function -# CHECK-NEXT: Other: 8 -# ^-- STO_MIPS_PLT +# CHECK-NEXT: Other [ (0x8) +# CHECK-NEXT: STO_MIPS_PLT +# CHECK-NEXT: ] # CHECK-NEXT: Section: Undefined # CHECK-NEXT: } diff --git a/lld/test/ELF/section-symbol.s b/lld/test/ELF/section-symbol.s index 072d9d4..5e546f5 100644 --- a/lld/test/ELF/section-symbol.s +++ b/lld/test/ELF/section-symbol.s @@ -29,7 +29,9 @@ // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None -// CHECK-NEXT: Other: 2 +// CHECK-NEXT: Other [ (0x2) +// CHECK-NEXT: STV_HIDDEN +// CHECK-NEXT: ] // CHECK-NEXT: Section: .dynamic // CHECK-NEXT: } // CHECK-NEXT: ] diff --git a/lld/test/ELF/shared.s b/lld/test/ELF/shared.s index 9cc235f..a81a093 100644 --- a/lld/test/ELF/shared.s +++ b/lld/test/ELF/shared.s @@ -149,7 +149,9 @@ // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None -// CHECK-NEXT: Other: 2 +// CHECK-NEXT: Other [ (0x2) +// CHECK-NEXT: STV_HIDDEN +// CHECK-NEXT: ] // CHECK-NEXT: Section: .dynamic // CHECK-NEXT: } // CHECK-NEXT: Symbol { diff --git a/lld/test/ELF/symbols.s b/lld/test/ELF/symbols.s index e2b5517..a6c838c 100644 --- a/lld/test/ELF/symbols.s +++ b/lld/test/ELF/symbols.s @@ -86,7 +86,9 @@ internal: // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None -// CHECK-NEXT: Other: 2 +// CHECK-NEXT: Other [ (0x2) +// CHECK-NEXT: STV_HIDDEN +// CHECK-NEXT: ] // CHECK-NEXT: Section: foobar // CHECK-NEXT: } // CHECK-NEXT: Symbol { @@ -95,7 +97,9 @@ internal: // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None -// CHECK-NEXT: Other: 1 +// CHECK-NEXT: Other [ (0x1) +// CHECK-NEXT: STV_INTERNAL +// CHECK-NEXT: ] // CHECK-NEXT: Section: foobar // CHECK-NEXT: } // CHECK-NEXT: Symbol { @@ -149,7 +153,9 @@ internal: // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: None -// CHECK-NEXT: Other: 3 +// CHECK-NEXT: Other [ (0x3) +// CHECK-NEXT: STV_PROTECTED +// CHECK-NEXT: ] // CHECK-NEXT: Section: foobar // CHECK-NEXT: } // CHECK-NEXT: Symbol { diff --git a/lld/test/ELF/visibility.s b/lld/test/ELF/visibility.s index 1aa01d0..02c709b 100644 --- a/lld/test/ELF/visibility.s +++ b/lld/test/ELF/visibility.s @@ -20,7 +20,9 @@ // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None -// CHECK-NEXT: Other: 2 +// CHECK-NEXT: Other [ (0x2) +// CHECK-NEXT: STV_HIDDEN +// CHECK-NEXT: ] // CHECK-NEXT: Section: .text // CHECK-NEXT: } // CHECK-NEXT: Symbol { @@ -29,7 +31,9 @@ // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None -// CHECK-NEXT: Other: 1 +// CHECK-NEXT: Other [ (0x1) +// CHECK-NEXT: STV_INTERNAL +// CHECK-NEXT: ] // CHECK-NEXT: Section: .text // CHECK-NEXT: } // CHECK-NEXT: Symbol { @@ -38,7 +42,9 @@ // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None -// CHECK-NEXT: Other: 2 +// CHECK-NEXT: Other [ (0x2) +// CHECK-NEXT: STV_HIDDEN +// CHECK-NEXT: ] // CHECK-NEXT: Section: .text // CHECK-NEXT: } // CHECK-NEXT: Symbol { @@ -47,7 +53,9 @@ // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None -// CHECK-NEXT: Other: 2 +// CHECK-NEXT: Other [ (0x2) +// CHECK-NEXT: STV_HIDDEN +// CHECK-NEXT: ] // CHECK-NEXT: Section: .dynamic // CHECK-NEXT: } // CHECK-NEXT: Symbol { @@ -65,7 +73,9 @@ // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: None -// CHECK-NEXT: Other: 3 +// CHECK-NEXT: Other [ (0x3) +// CHECK-NEXT: STV_PROTECTED +// CHECK-NEXT: ] // CHECK-NEXT: Section: .text // CHECK-NEXT: } // CHECK-NEXT: ] @@ -95,7 +105,9 @@ // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: None -// CHECK-NEXT: Other: 3 +// CHECK-NEXT: Other [ (0x3) +// CHECK-NEXT: STV_PROTECTED +// CHECK-NEXT: ] // CHECK-NEXT: Section: .text // CHECK-NEXT: } // CHECK-NEXT: ] -- 2.7.4