This is an archive of the discontinued LLVM Phabricator instance.

Differential D117896

[LLD][ELF][AArch64] Update test with incorrect REQUIRES line [NFC]
ClosedPublic

Authored by peter.smith on Jan 21 2022, 8:30 AM.

Details

Reviewers
MaskRay
ikudrin
Commits
rGa08447d0de5d: [LLD][ELF][AArch64] Update test with incorrect REQUIRES line [NFC]
Summary

D54759 introduced aarch64-combined-dynrel.s and aarch64-combined-dynrel-ifunc.s . Unfortunately the requires line at the top was AArch64 instead of aarch64 which means they were never run. Update the tests to use aarch64 and fix to match current lld output.

Diff Detail

Event Timeline

peter.smith created this revision.Jan 21 2022, 8:30 AM
Herald added subscribers: kristof.beyls, emaste. · View Herald TranscriptJan 21 2022, 8:30 AM
peter.smith requested review of this revision.Jan 21 2022, 8:30 AM
peter.smith mentioned this in D54759: [LLD][ELF] Use more specific method to calculate DT_PLTRELSZ.
MaskRay accepted this revision.Jan 21 2022, 9:45 AM

LGTM.

This revision is now accepted and ready to land.Jan 21 2022, 9:45 AM
Harbormaster completed remote builds in B144843: Diff 401999.Jan 21 2022, 9:54 AM
ikudrin accepted this revision.Jan 23 2022, 9:07 PM

LGTM. Thanks!

Closed by commit rGa08447d0de5d: [LLD][ELF][AArch64] Update test with incorrect REQUIRES line [NFC] (authored by psmith). · Explain WhyJan 24 2022, 2:07 AM
This revision was automatically updated to reflect the committed changes.
psmith added a commit: rGa08447d0de5d: [LLD][ELF][AArch64] Update test with incorrect REQUIRES line [NFC].
Herald added a project: Restricted Project. · View Herald TranscriptJan 24 2022, 2:07 AM

Revision Contents

Diff 401999

lld/test/ELF/aarch64-combined-dynrel-ifunc.s

// REQUIRES: AArch64 // REQUIRES: aarch64
// RUN: llvm-mc -filetype=obj -triple=aarch64-linux-gnu %p/Inputs/shared.s -o %t-lib.o // RUN: llvm-mc -filetype=obj -triple=aarch64-linux-gnu %p/Inputs/shared.s -o %t-lib.o
// RUN: llvm-mc -filetype=obj -triple=aarch64-linux-gnu %s -o %t.o // RUN: llvm-mc -filetype=obj -triple=aarch64-linux-gnu %s -o %t.o
// RUN: ld.lld %t-lib.o --shared -o %t.so // RUN: ld.lld %t-lib.o --shared -o %t.so
// RUN: echo "SECTIONS { \ // RUN: echo "SECTIONS { \
// RUN: .text : { *(.text) } \ // RUN: .text : { *(.text) } \
// RUN: .rela.dyn : { *(.rela.dyn) *(.rela.plt) } \ // RUN: .rela.dyn : { *(.rela.dyn) *(.rela.plt) } \
// RUN: } " > %t.script // RUN: } " > %t.script
// RUN: ld.lld %t.o -o %t.axf %t.so --script %t.script // RUN: ld.lld %t.o -o %t.axf %t.so --script %t.script
Show All 27 Lines
adrp x8, :got:bar adrp x8, :got:bar
ldr x8, [x8, :got_lo12:bar] ldr x8, [x8, :got_lo12:bar]
ret ret
// CHECK: Name: .rela.dyn // CHECK: Name: .rela.dyn
// CHECK-NEXT: Type: SHT_RELA // CHECK-NEXT: Type: SHT_RELA
// CHECK-NEXT: Flags [ // CHECK-NEXT: Flags [
// CHECK-NEXT: SHF_ALLOC // CHECK-NEXT: SHF_ALLOC
// CHECK-NEXT: SHF_INFO_LINK
// CHECK-NEXT: ] // CHECK-NEXT: ]
// CHECK-NEXT: Address: // CHECK-NEXT: Address:
// CHECK-NEXT: Offset: // CHECK-NEXT: Offset:
// CHECK-NEXT: Size: 72 // CHECK-NEXT: Size: 72
// CHECK: 0x0000000000000008 RELASZ 72 // CHECK: 0x0000000000000008 RELASZ 72
// CHECK: 0x0000000000000002 PLTRELSZ 48 // CHECK: 0x0000000000000002 PLTRELSZ 24

lld/test/ELF/aarch64-combined-dynrel.s

// REQUIRES: AArch64 // REQUIRES: aarch64
// RUN: llvm-mc --triple=aarch64-linux-gnu -filetype=obj -o %t.o %s // RUN: llvm-mc --triple=aarch64-linux-gnu -filetype=obj -o %t.o %s
// RUN: echo "SECTIONS { \ // RUN: echo "SECTIONS { \
// RUN: .text : { *(.text) } \ // RUN: .text : { *(.text) } \
// RUN: .rela.dyn : { *(.rela.dyn) *(.rela.plt) } \ // RUN: .rela.dyn : { *(.rela.dyn) *(.rela.plt) } \
// RUN: } " > %t.script // RUN: } " > %t.script
// RUN: ld.lld %t.o -o %t.so --shared --script %t.script // RUN: ld.lld %t.o -o %t.so --shared --script %t.script
// RUN: llvm-readobj --section-headers --dynamic-table %t.so | FileCheck %s // RUN: llvm-readobj --section-headers --dynamic-table %t.so | FileCheck %s
Show All 17 Lines
adrp x8, :got:foo adrp x8, :got:foo
ldr x8, [x8, :got_lo12:foo] ldr x8, [x8, :got_lo12:foo]
ret ret
// CHECK: Name: .rela.dyn // CHECK: Name: .rela.dyn
// CHECK-NEXT: Type: SHT_RELA // CHECK-NEXT: Type: SHT_RELA
// CHECK-NEXT: Flags [ // CHECK-NEXT: Flags [
// CHECK-NEXT: SHF_ALLOC // CHECK-NEXT: SHF_ALLOC
// CHECK-NEXT: SHF_INFO_LINK
// CHECK-NEXT: ] // CHECK-NEXT: ]
// CHECK-NEXT: Address: // CHECK-NEXT: Address:
// CHECK-NEXT: Offset: // CHECK-NEXT: Offset:
// CHECK-NEXT: Size: 48 // CHECK-NEXT: Size: 48
// CHECK: 0x0000000000000008 RELASZ 48 // CHECK: 0x0000000000000008 RELASZ 48
// CHECK: 0x0000000000000002 PLTRELSZ 24 // CHECK: 0x0000000000000002 PLTRELSZ 24