commit 311131dafc0eff9a965907596e51b9e8834b7082
Author: Peter Collingbourne <peter@pcc.me.uk>
Date:   Thu Jul 18 16:57:06 2019 +0000

    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
    
    llvm-svn: 366463

diff --git a/lld/test/ELF/Inputs/uabs_label.s b/lld/test/ELF/Inputs/uabs_label.s
deleted file mode 100644
index b2a67216a59..00000000000
--- a/lld/test/ELF/Inputs/uabs_label.s
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sample label to test R_AARCH64_MOVW_UABS relocations
-
-.globl uabs_label
-uabs_label = 0xF000E000D000C
diff --git a/lld/test/ELF/aarch64-relocs.s b/lld/test/ELF/aarch64-relocs.s
index c7678968040..efa9b732933 100644
--- a/lld/test/ELF/aarch64-relocs.s
+++ b/lld/test/ELF/aarch64-relocs.s
@@ -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",@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: