This is an archive of the discontinued LLVM Phabricator instance.

Differential D54786

[LLD][ARM] Change REQUIRES: ARM to Requires: arm
ClosedPublic

Authored by peter.smith on Nov 21 2018, 2:49 AM.

Details

Reviewers
ruiu
grimar
• espindola
Commits
rG4923930be536: [ARM] Change REQUIRES: ARM to Requires: arm
rLLD347388: [ARM] Change REQUIRES: ARM to Requires: arm
rL347388: [ARM] Change REQUIRES: ARM to Requires: arm
Summary

When REQUIRES: ARM is used the test is skipped as ARM is not recognized. Change to REQUIRES: arm so that it is run. This required updating one of the tests due to changes in expected output. In this case the name of a mapping symbol changed, as this wasn't important to the test so I removed the line.

Diff Detail

Repository
rL LLVM

Event Timeline

peter.smith created this revision.Nov 21 2018, 2:49 AM
Herald added a reviewer: • espindola. · View Herald TranscriptNov 21 2018, 2:50 AM
Herald added subscribers: chrib, kristof.beyls, arichardson and 2 others. · View Herald Transcript
grimar accepted this revision.Nov 21 2018, 2:53 AM

LGTM. Nice!

This revision is now accepted and ready to land.Nov 21 2018, 2:53 AM
Closed by commit rL347388: [ARM] Change REQUIRES: ARM to Requires: arm (authored by psmith). · Explain WhyNov 21 2018, 3:32 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lld/
trunk/
test/
ELF/
5 lines
2 lines

Diff 174896

lld/trunk/test/ELF/arm-thunk-nosuitable.s

// REQUIRES: ARM // REQUIRES: arm
// RUN: llvm-mc %s --arm-add-build-attributes --triple=armv7a-linux-gnueabihf --filetype=obj -o %t.o // RUN: llvm-mc %s --arm-add-build-attributes --triple=armv7a-linux-gnueabihf --filetype=obj -o %t.o
// RUN: ld.lld %t.o -o %t // RUN: ld.lld %t.o -o %t
// RUN: llvm-objdump -triple=thumbv7a-linux-gnueabihf -d -start-address=2166784 -stop-address=2166794 %t | FileCheck %s // RUN: llvm-objdump -triple=thumbv7a-linux-gnueabihf -d -start-address=2166784 -stop-address=2166794 %t | FileCheck %s
// Create a conditional branch too far away from a precreated thunk // Create a conditional branch too far away from a precreated thunk
// section. This will need a thunk section created within range. // section. This will need a thunk section created within range.
.syntax unified .syntax unified
.thumb .thumb
.section .text.0, "ax", %progbits .section .text.0, "ax", %progbits
.space 2 * 1024 * 1024 .space 2 * 1024 * 1024
.globl _start .globl _start
.type _start, %function .type _start, %function
_start: _start:
// Range of +/- 1 Megabyte, new ThunkSection will need creating after // Range of +/- 1 Megabyte, new ThunkSection will need creating after
// .text.1 // .text.1
beq.w target beq.w target
.section .text.1, "ax", %progbits .section .text.1, "ax", %progbits
bx lr bx lr
// CHECK: _start: // CHECK: _start:
// CHECK-NEXT: 211000: 00 f0 00 80 beq.w #0 // CHECK-NEXT: 211000: 00 f0 00 80 beq.w #0
// CHECK: __Thumbv7ABSLongThunk_target: // CHECK: __Thumbv7ABSLongThunk_target:
// CHECK-NEXT: 211004: 00 f0 01 90 b.w #12582914 // CHECK-NEXT: 211004: 00 f0 01 90 b.w #12582914
// CHECK: $t.1: // CHECK: 211008: 70 47 bx lr
// CHECK-NEXT: 211008: 70 47 bx lr
.section .text.2, "ax", %progbits .section .text.2, "ax", %progbits
.space 12 * 1024 * 1024 .space 12 * 1024 * 1024
.globl target .globl target
.type target, %function .type target, %function
target: bx lr target: bx lr

lld/trunk/test/ELF/arm-thunk-section-too-large.s

// REQUIRES: ARM // REQUIRES: arm
// RUN: llvm-mc %s -triple=armv7a-linux-gnueabihf -arm-add-build-attributes -filetype=obj -o %t.o // RUN: llvm-mc %s -triple=armv7a-linux-gnueabihf -arm-add-build-attributes -filetype=obj -o %t.o
// RUN: not ld.lld %t.o -o /dev/null 2>&1 | FileCheck %s // RUN: not ld.lld %t.o -o /dev/null 2>&1 | FileCheck %s
// CHECK: InputSection too large for range extension thunk // CHECK: InputSection too large for range extension thunk
.syntax unified .syntax unified
.thumb .thumb
.text .text
.globl _start .globl _start
Show All 12 Lines