[lld] r366463 - ELF: Simplify test. NFCI.

[Peter Collingbourne via llvm-commits]

Author: pcc
Date: Thu Jul 18 09:57:06 2019
New Revision: 366463

URL: http://llvm.org/viewvc/llvm-project?rev=366463&view=rev
Log:
ELF: Simplify test. NFCI.

Avoid splitting the test into multiple files and use zero for the value of
the symbol with addends at relocations so that it's clear what value is
being used at relocations.

Differential Revision: https://reviews.llvm.org/D64684

Removed:
    lld/trunk/test/ELF/Inputs/uabs_label.s
Modified:
    lld/trunk/test/ELF/aarch64-relocs.s

Removed: lld/trunk/test/ELF/Inputs/uabs_label.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/Inputs/uabs_label.s?rev=366462&view=auto
==============================================================================
--- lld/trunk/test/ELF/Inputs/uabs_label.s (original)
+++ lld/trunk/test/ELF/Inputs/uabs_label.s (removed)
@@ -1,4 +0,0 @@
-# Sample label to test R_AARCH64_MOVW_UABS relocations
-
-.globl uabs_label
-uabs_label = 0xF000E000D000C

Modified: lld/trunk/test/ELF/aarch64-relocs.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-relocs.s?rev=366463&r1=366462&r2=366463&view=diff
==============================================================================
--- lld/trunk/test/ELF/aarch64-relocs.s (original)
+++ lld/trunk/test/ELF/aarch64-relocs.s Thu Jul 18 09:57:06 2019
@@ -1,6 +1,6 @@
 # REQUIRES: aarch64
 # RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-freebsd %s -o %t
-# RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-freebsd %p/Inputs/uabs_label.s -o %t2.o
+# RUN: echo '.globl zero; zero = 0' | llvm-mc -filetype=obj -triple=aarch64-unknown-freebsd -o %t2.o
 # RUN: ld.lld %t %t2.o -o %t2
 # RUN: llvm-objdump -d %t2 | FileCheck %s
 
@@ -169,11 +169,11 @@ foo16:
 
 .section .R_AARCH64_MOVW_UABS,"ax", at progbits
 movz1:
-   movk x12, #:abs_g0_nc:uabs_label
-   movk x13, #:abs_g1_nc:uabs_label
-   movk x14, #:abs_g2_nc:uabs_label
-   movz x15, #:abs_g3:uabs_label
-   movk x16, #:abs_g3:uabs_label
+   movk x12, #:abs_g0_nc:zero+0xF000E000D000C
+   movk x13, #:abs_g1_nc:zero+0xF000E000D000C
+   movk x14, #:abs_g2_nc:zero+0xF000E000D000C
+   movz x15, #:abs_g3:zero+0xF000E000D000C
+   movk x16, #:abs_g3:zero+0xF000E000D000C
 
 ## 4222124650659840 == (0xF << 48)
 # CHECK: Disassembly of section .R_AARCH64_MOVW_UABS: