[ARM] Use getSymbolPreferLocal() in GetARMGVSymbol

[arichardson]

Summary

This allows relaxing some relocations to symbol+offset instead of emitting
a relocation against a symbol.

[MaskRay]

LGTM.

[MaskRay]

This allows relaxing some relocations to symbol+offset instead of emitting

a relocation against a symbol.

STT_SECTION symbol+offset

[ayzhao]

This is causing linker failures in Android Chromium builds: https://crbug.com/1354305

Sample output:

[484/106609] LINK ./test_mixed_component_demo
FAILED: test_mixed_component_demo exe.unstripped/test_mixed_component_demo exe.unstripped/test_mixed_component_demo.map.gz
python3 "../../build/toolchain/gcc_link_wrapper.py" --output="./test_mixed_component_demo" --strip="../../third_party/llvm-build/Release+Asserts/bin/llvm-strip" --unstripped-file="./exe.unstripped/test_mixed_component_demo" --map-file "./exe.unstripped/test_mixed_component_demo.map.gz" -- ../../third_party/llvm-build/Release+Asserts/bin/clang++ -Werror -fuse-ld=lld -Wl,--fatal-warnings -Wl,--build-id=sha1 -fPIC -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,--icf=all -Wl,--color-diagnostics -Wl,-mllvm,-instcombine-lower-dbg-declare=0 -flto=thin -Wl,--thinlto-jobs=all -Wl,--thinlto-cache-dir=thinlto-cache -Wl,--thinlto-cache-policy=cache_size=10\%:cache_size_bytes=40g:cache_size_files=100000 -Wl,-mllvm,-import-instr-limit=5 -march=armv7-a -Wl,--no-rosegment -Wl,--no-call-graph-profile-sort -Wl,--exclude-libs=libvpx_assembly_arm.a --unwindlib=none --target=arm-linux-androideabi23 -no-canonical-prefixes -Wl,--warn-shared-textrel -Wl,-O2 -Wl,--gc-sections -Wl,-z,defs -Wl,--as-needed -nostdlib++ --sysroot=../../third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot -Wl,--warn-shared-textrel -Wl,--lto-O0 -pie -Bdynamic -Wl,-z,nocopyreloc -o "./exe.unstripped/test_mixed_component_demo" -Wl,--start-group @"./test_mixed_component_demo.rsp"  -Wl,--end-group  -landroid_support -ldl -lm
ld.lld: error: thinlto-cache/llvmcache-CFD42F77DBE4B29AA4645765DE7225F761BBE9DD:(function _Unwind_VRS_Pop: .text.unlikely._Unwind_VRS_Pop+0xcc): branch and link relocation: R_ARM_THM_CALL to non STT_FUNC symbol: .L_Unwind_VRS_Set$local interworking not performed; consider using directive '.type .L_Unwind_VRS_Set$local, %function' to give symbol type STT_FUNC if interworking between ARM and Thumb is required; Unwind-EHABI.cpp:1120 (../../buildtools/third_party/libunwind/trunk/src/Unwind-EHABI.cpp:1120)
clang++: error: linker command failed with exit code 1 (use -v to see invocation)

[ayzhao]

In D131433#3735694, @ayzhao wrote:

This is causing linker failures in Android Chromium builds: https://crbug.com/1354305

Sample output:

[484/106609] LINK ./test_mixed_component_demo
FAILED: test_mixed_component_demo exe.unstripped/test_mixed_component_demo exe.unstripped/test_mixed_component_demo.map.gz
python3 "../../build/toolchain/gcc_link_wrapper.py" --output="./test_mixed_component_demo" --strip="../../third_party/llvm-build/Release+Asserts/bin/llvm-strip" --unstripped-file="./exe.unstripped/test_mixed_component_demo" --map-file "./exe.unstripped/test_mixed_component_demo.map.gz" -- ../../third_party/llvm-build/Release+Asserts/bin/clang++ -Werror -fuse-ld=lld -Wl,--fatal-warnings -Wl,--build-id=sha1 -fPIC -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,--icf=all -Wl,--color-diagnostics -Wl,-mllvm,-instcombine-lower-dbg-declare=0 -flto=thin -Wl,--thinlto-jobs=all -Wl,--thinlto-cache-dir=thinlto-cache -Wl,--thinlto-cache-policy=cache_size=10\%:cache_size_bytes=40g:cache_size_files=100000 -Wl,-mllvm,-import-instr-limit=5 -march=armv7-a -Wl,--no-rosegment -Wl,--no-call-graph-profile-sort -Wl,--exclude-libs=libvpx_assembly_arm.a --unwindlib=none --target=arm-linux-androideabi23 -no-canonical-prefixes -Wl,--warn-shared-textrel -Wl,-O2 -Wl,--gc-sections -Wl,-z,defs -Wl,--as-needed -nostdlib++ --sysroot=../../third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot -Wl,--warn-shared-textrel -Wl,--lto-O0 -pie -Bdynamic -Wl,-z,nocopyreloc -o "./exe.unstripped/test_mixed_component_demo" -Wl,--start-group @"./test_mixed_component_demo.rsp"  -Wl,--end-group  -landroid_support -ldl -lm
ld.lld: error: thinlto-cache/llvmcache-CFD42F77DBE4B29AA4645765DE7225F761BBE9DD:(function _Unwind_VRS_Pop: .text.unlikely._Unwind_VRS_Pop+0xcc): branch and link relocation: R_ARM_THM_CALL to non STT_FUNC symbol: .L_Unwind_VRS_Set$local interworking not performed; consider using directive '.type .L_Unwind_VRS_Set$local, %function' to give symbol type STT_FUNC if interworking between ARM and Thumb is required; Unwind-EHABI.cpp:1120 (../../buildtools/third_party/libunwind/trunk/src/Unwind-EHABI.cpp:1120)
clang++: error: linker command failed with exit code 1 (use -v to see invocation)

Repro made with -Wl,--reproduce=repro.tar: https://drive.google.com/file/d/1pgQI2adwx3DJJqIYvMY4i249ouHU0rmu/view?usp=sharing

[ayzhao]

In D131433#3740683, @ayzhao wrote:

In D131433#3735694, @ayzhao wrote:

This is causing linker failures in Android Chromium builds: https://crbug.com/1354305

Sample output:

[484/106609] LINK ./test_mixed_component_demo
FAILED: test_mixed_component_demo exe.unstripped/test_mixed_component_demo exe.unstripped/test_mixed_component_demo.map.gz
python3 "../../build/toolchain/gcc_link_wrapper.py" --output="./test_mixed_component_demo" --strip="../../third_party/llvm-build/Release+Asserts/bin/llvm-strip" --unstripped-file="./exe.unstripped/test_mixed_component_demo" --map-file "./exe.unstripped/test_mixed_component_demo.map.gz" -- ../../third_party/llvm-build/Release+Asserts/bin/clang++ -Werror -fuse-ld=lld -Wl,--fatal-warnings -Wl,--build-id=sha1 -fPIC -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,--icf=all -Wl,--color-diagnostics -Wl,-mllvm,-instcombine-lower-dbg-declare=0 -flto=thin -Wl,--thinlto-jobs=all -Wl,--thinlto-cache-dir=thinlto-cache -Wl,--thinlto-cache-policy=cache_size=10\%:cache_size_bytes=40g:cache_size_files=100000 -Wl,-mllvm,-import-instr-limit=5 -march=armv7-a -Wl,--no-rosegment -Wl,--no-call-graph-profile-sort -Wl,--exclude-libs=libvpx_assembly_arm.a --unwindlib=none --target=arm-linux-androideabi23 -no-canonical-prefixes -Wl,--warn-shared-textrel -Wl,-O2 -Wl,--gc-sections -Wl,-z,defs -Wl,--as-needed -nostdlib++ --sysroot=../../third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot -Wl,--warn-shared-textrel -Wl,--lto-O0 -pie -Bdynamic -Wl,-z,nocopyreloc -o "./exe.unstripped/test_mixed_component_demo" -Wl,--start-group @"./test_mixed_component_demo.rsp"  -Wl,--end-group  -landroid_support -ldl -lm
ld.lld: error: thinlto-cache/llvmcache-CFD42F77DBE4B29AA4645765DE7225F761BBE9DD:(function _Unwind_VRS_Pop: .text.unlikely._Unwind_VRS_Pop+0xcc): branch and link relocation: R_ARM_THM_CALL to non STT_FUNC symbol: .L_Unwind_VRS_Set$local interworking not performed; consider using directive '.type .L_Unwind_VRS_Set$local, %function' to give symbol type STT_FUNC if interworking between ARM and Thumb is required; Unwind-EHABI.cpp:1120 (../../buildtools/third_party/libunwind/trunk/src/Unwind-EHABI.cpp:1120)
clang++: error: linker command failed with exit code 1 (use -v to see invocation)

Repro made with -Wl,--reproduce=repro.tar: https://drive.google.com/file/d/1pgQI2adwx3DJJqIYvMY4i249ouHU0rmu/view?usp=sharing

To repro:

1. tar -xvf repro.tar.gz
2. cd repro/
3. bin/ld.lld @response.txt

[arichardson]

In D131433#3740710, @ayzhao wrote:

In D131433#3740683, @ayzhao wrote:

In D131433#3735694, @ayzhao wrote:

This is causing linker failures in Android Chromium builds: https://crbug.com/1354305

Sample output:

[484/106609] LINK ./test_mixed_component_demo
FAILED: test_mixed_component_demo exe.unstripped/test_mixed_component_demo exe.unstripped/test_mixed_component_demo.map.gz
python3 "../../build/toolchain/gcc_link_wrapper.py" --output="./test_mixed_component_demo" --strip="../../third_party/llvm-build/Release+Asserts/bin/llvm-strip" --unstripped-file="./exe.unstripped/test_mixed_component_demo" --map-file "./exe.unstripped/test_mixed_component_demo.map.gz" -- ../../third_party/llvm-build/Release+Asserts/bin/clang++ -Werror -fuse-ld=lld -Wl,--fatal-warnings -Wl,--build-id=sha1 -fPIC -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,--icf=all -Wl,--color-diagnostics -Wl,-mllvm,-instcombine-lower-dbg-declare=0 -flto=thin -Wl,--thinlto-jobs=all -Wl,--thinlto-cache-dir=thinlto-cache -Wl,--thinlto-cache-policy=cache_size=10\%:cache_size_bytes=40g:cache_size_files=100000 -Wl,-mllvm,-import-instr-limit=5 -march=armv7-a -Wl,--no-rosegment -Wl,--no-call-graph-profile-sort -Wl,--exclude-libs=libvpx_assembly_arm.a --unwindlib=none --target=arm-linux-androideabi23 -no-canonical-prefixes -Wl,--warn-shared-textrel -Wl,-O2 -Wl,--gc-sections -Wl,-z,defs -Wl,--as-needed -nostdlib++ --sysroot=../../third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot -Wl,--warn-shared-textrel -Wl,--lto-O0 -pie -Bdynamic -Wl,-z,nocopyreloc -o "./exe.unstripped/test_mixed_component_demo" -Wl,--start-group @"./test_mixed_component_demo.rsp"  -Wl,--end-group  -landroid_support -ldl -lm
ld.lld: error: thinlto-cache/llvmcache-CFD42F77DBE4B29AA4645765DE7225F761BBE9DD:(function _Unwind_VRS_Pop: .text.unlikely._Unwind_VRS_Pop+0xcc): branch and link relocation: R_ARM_THM_CALL to non STT_FUNC symbol: .L_Unwind_VRS_Set$local interworking not performed; consider using directive '.type .L_Unwind_VRS_Set$local, %function' to give symbol type STT_FUNC if interworking between ARM and Thumb is required; Unwind-EHABI.cpp:1120 (../../buildtools/third_party/libunwind/trunk/src/Unwind-EHABI.cpp:1120)
clang++: error: linker command failed with exit code 1 (use -v to see invocation)

Repro made with -Wl,--reproduce=repro.tar: https://drive.google.com/file/d/1pgQI2adwx3DJJqIYvMY4i249ouHU0rmu/view?usp=sharing

To repro:

1. tar -xvf repro.tar.gz
2. cd repro/
3. bin/ld.lld @response.txt

Thanks for the reproducer. However, to confirm I'd a minimal set of source files since the archive of already has the bad symbol table encoded.

I believe this should be fixed by D131429. I will rebase that and adjust the test cases to allow these two patches to be committed in the inverse order.

[arichardson]

Rebased to be committed after D131429

[ayzhao]

In D131433#3748657, @arichardson wrote:

In D131433#3740710, @ayzhao wrote:

In D131433#3740683, @ayzhao wrote:

In D131433#3735694, @ayzhao wrote:

This is causing linker failures in Android Chromium builds: https://crbug.com/1354305

Sample output:

[484/106609] LINK ./test_mixed_component_demo
FAILED: test_mixed_component_demo exe.unstripped/test_mixed_component_demo exe.unstripped/test_mixed_component_demo.map.gz
python3 "../../build/toolchain/gcc_link_wrapper.py" --output="./test_mixed_component_demo" --strip="../../third_party/llvm-build/Release+Asserts/bin/llvm-strip" --unstripped-file="./exe.unstripped/test_mixed_component_demo" --map-file "./exe.unstripped/test_mixed_component_demo.map.gz" -- ../../third_party/llvm-build/Release+Asserts/bin/clang++ -Werror -fuse-ld=lld -Wl,--fatal-warnings -Wl,--build-id=sha1 -fPIC -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,--icf=all -Wl,--color-diagnostics -Wl,-mllvm,-instcombine-lower-dbg-declare=0 -flto=thin -Wl,--thinlto-jobs=all -Wl,--thinlto-cache-dir=thinlto-cache -Wl,--thinlto-cache-policy=cache_size=10\%:cache_size_bytes=40g:cache_size_files=100000 -Wl,-mllvm,-import-instr-limit=5 -march=armv7-a -Wl,--no-rosegment -Wl,--no-call-graph-profile-sort -Wl,--exclude-libs=libvpx_assembly_arm.a --unwindlib=none --target=arm-linux-androideabi23 -no-canonical-prefixes -Wl,--warn-shared-textrel -Wl,-O2 -Wl,--gc-sections -Wl,-z,defs -Wl,--as-needed -nostdlib++ --sysroot=../../third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot -Wl,--warn-shared-textrel -Wl,--lto-O0 -pie -Bdynamic -Wl,-z,nocopyreloc -o "./exe.unstripped/test_mixed_component_demo" -Wl,--start-group @"./test_mixed_component_demo.rsp"  -Wl,--end-group  -landroid_support -ldl -lm
ld.lld: error: thinlto-cache/llvmcache-CFD42F77DBE4B29AA4645765DE7225F761BBE9DD:(function _Unwind_VRS_Pop: .text.unlikely._Unwind_VRS_Pop+0xcc): branch and link relocation: R_ARM_THM_CALL to non STT_FUNC symbol: .L_Unwind_VRS_Set$local interworking not performed; consider using directive '.type .L_Unwind_VRS_Set$local, %function' to give symbol type STT_FUNC if interworking between ARM and Thumb is required; Unwind-EHABI.cpp:1120 (../../buildtools/third_party/libunwind/trunk/src/Unwind-EHABI.cpp:1120)
clang++: error: linker command failed with exit code 1 (use -v to see invocation)

Repro made with -Wl,--reproduce=repro.tar: https://drive.google.com/file/d/1pgQI2adwx3DJJqIYvMY4i249ouHU0rmu/view?usp=sharing

To repro:

1. tar -xvf repro.tar.gz
2. cd repro/
3. bin/ld.lld @response.txt

Thanks for the reproducer. However, to confirm I'd a minimal set of source files since the archive of already has the bad symbol table encoded.

I believe this should be fixed by D131429. I will rebase that and adjust the test cases to allow these two patches to be committed in the inverse order.

Confirmed that D131429 fixes this.

[arichardson]

In D131433#3749641, @ayzhao wrote:

In D131433#3748657, @arichardson wrote:

In D131433#3740710, @ayzhao wrote:

In D131433#3740683, @ayzhao wrote:

In D131433#3735694, @ayzhao wrote:

This is causing linker failures in Android Chromium builds: https://crbug.com/1354305

Sample output:

[484/106609] LINK ./test_mixed_component_demo
FAILED: test_mixed_component_demo exe.unstripped/test_mixed_component_demo exe.unstripped/test_mixed_component_demo.map.gz
python3 "../../build/toolchain/gcc_link_wrapper.py" --output="./test_mixed_component_demo" --strip="../../third_party/llvm-build/Release+Asserts/bin/llvm-strip" --unstripped-file="./exe.unstripped/test_mixed_component_demo" --map-file "./exe.unstripped/test_mixed_component_demo.map.gz" -- ../../third_party/llvm-build/Release+Asserts/bin/clang++ -Werror -fuse-ld=lld -Wl,--fatal-warnings -Wl,--build-id=sha1 -fPIC -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,--icf=all -Wl,--color-diagnostics -Wl,-mllvm,-instcombine-lower-dbg-declare=0 -flto=thin -Wl,--thinlto-jobs=all -Wl,--thinlto-cache-dir=thinlto-cache -Wl,--thinlto-cache-policy=cache_size=10\%:cache_size_bytes=40g:cache_size_files=100000 -Wl,-mllvm,-import-instr-limit=5 -march=armv7-a -Wl,--no-rosegment -Wl,--no-call-graph-profile-sort -Wl,--exclude-libs=libvpx_assembly_arm.a --unwindlib=none --target=arm-linux-androideabi23 -no-canonical-prefixes -Wl,--warn-shared-textrel -Wl,-O2 -Wl,--gc-sections -Wl,-z,defs -Wl,--as-needed -nostdlib++ --sysroot=../../third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot -Wl,--warn-shared-textrel -Wl,--lto-O0 -pie -Bdynamic -Wl,-z,nocopyreloc -o "./exe.unstripped/test_mixed_component_demo" -Wl,--start-group @"./test_mixed_component_demo.rsp"  -Wl,--end-group  -landroid_support -ldl -lm
ld.lld: error: thinlto-cache/llvmcache-CFD42F77DBE4B29AA4645765DE7225F761BBE9DD:(function _Unwind_VRS_Pop: .text.unlikely._Unwind_VRS_Pop+0xcc): branch and link relocation: R_ARM_THM_CALL to non STT_FUNC symbol: .L_Unwind_VRS_Set$local interworking not performed; consider using directive '.type .L_Unwind_VRS_Set$local, %function' to give symbol type STT_FUNC if interworking between ARM and Thumb is required; Unwind-EHABI.cpp:1120 (../../buildtools/third_party/libunwind/trunk/src/Unwind-EHABI.cpp:1120)
clang++: error: linker command failed with exit code 1 (use -v to see invocation)

Repro made with -Wl,--reproduce=repro.tar: https://drive.google.com/file/d/1pgQI2adwx3DJJqIYvMY4i249ouHU0rmu/view?usp=sharing

To repro:

1. tar -xvf repro.tar.gz
2. cd repro/
3. bin/ld.lld @response.txt

Thanks for the reproducer. However, to confirm I'd a minimal set of source files since the archive of already has the bad symbol table encoded.

I believe this should be fixed by D131429. I will rebase that and adjust the test cases to allow these two patches to be committed in the inverse order.

Confirmed that D131429 fixes this.

Thank you for verifying!

llvm/lib/Target/ARM/ARMAsmPrinter.cpp

if (TargetFlags & ARMII::MO_COFFSTUB) {
           MMICOFF.getGVStubEntry(MCSym);
 
       if (!StubSym.getPointer())
         StubSym = MachineModuleInfoImpl::StubValueTy(getSymbol(GV), true);
     }
 
     return MCSym;
   } else if (Subtarget->isTargetELF()) {
-    return getSymbol(GV);
+    return getSymbolPreferLocal(*GV);
   }
   llvm_unreachable("unexpected target");
 }
 
 void ARMAsmPrinter::emitMachineConstantPoolValue(
     MachineConstantPoolValue *MCPV) {
   const DataLayout &DL = getDataLayout();
   int Size = DL.getTypeAllocSize(MCPV->getType());

llvm/test/CodeGen/ARM/dso-local-func.ll

 ; STATIC-NEXT:  bx  lr
 ; PIC-NEXT:     ldr r0, .LCPI0_0
 ; PIC-NEXT:   .LPC0_0:
 ; PIC-NEXT:     add r0, pc, r0
 ; PIC-NEXT:     bx  lr
 ; PIC-NEXT:     .p2align  2
 ; PIC-NEXT:   @ %bb.1:
 ; PIC-NEXT:   .LCPI0_0:
-; PIC-NEXT:     .long dsolocal_func-(.LPC0_0+8)
+; PIC-NEXT:     .long .Ldsolocal_func$local-(.LPC0_0+8)
 ; CHECK-NEXT: .Lfunc_end0:
 ; CHECK-NEXT:   .size dsolocal_func, .Lfunc_end0-dsolocal_func
 ; CHECK-NEXT:   .cantunwind
 ; CHECK-NEXT:   .fnend
   ret ptr @dsolocal_func
 }

llvm/test/CodeGen/ARM/elf-preemption.ll

 ; PIC:       @ %bb.0:
 ; PIC-NEXT:    ldr r0, .LCPI1_0
 ; PIC-NEXT:  .LPC1_0:
 ; PIC-NEXT:    add r0, pc, r0
 ; PIC-NEXT:    bx lr
 ; PIC-NEXT:    .p2align 2
 ; PIC-NEXT:  @ %bb.1:
 ; PIC-NEXT:  .LCPI1_0:
-; PIC-NEXT:    .long dsolocal_var-(.LPC1_0+8)
+; PIC-NEXT:    .long .Ldsolocal_var$local-(.LPC1_0+8)
   ret ptr @dsolocal_var
 }
 
 @weak_dsolocal_var = weak dso_local global i32 42
 define ptr @get_weak_dsolocal_var() nounwind {
 ; STATIC-LABEL: get_weak_dsolocal_var:
 ; STATIC:       @ %bb.0:
 ; STATIC-NEXT:    movw r0, :lower16:weak_dsolocal_var

 ; PIC:       @ %bb.0:
 ; PIC-NEXT:    ldr r0, .LCPI6_0
 ; PIC-NEXT:  .LPC6_0:
 ; PIC-NEXT:    add r0, pc, r0
 ; PIC-NEXT:    bx lr
 ; PIC-NEXT:    .p2align 2
 ; PIC-NEXT:  @ %bb.1:
 ; PIC-NEXT:  .LCPI6_0:
-; PIC-NEXT:    .long dsolocal_func-(.LPC6_0+8)
+; PIC-NEXT:    .long .Ldsolocal_func$local-(.LPC6_0+8)
   ret ptr @dsolocal_func
 }
 
 define weak dso_local ptr @weak_dsolocal_func() nounwind {
 ; STATIC-LABEL: weak_dsolocal_func:
 ; STATIC:       @ %bb.0:
 ; STATIC-NEXT:    movw r0, :lower16:weak_dsolocal_func
 ; STATIC-NEXT:    movt r0, :upper16:weak_dsolocal_func

 ; STATIC-NEXT:    push {r11, lr}
 ; STATIC-NEXT:    bl dsolocal_func
 ; STATIC-NEXT:    pop {r11, pc}
 ;
 ; PIC-LABEL: call_dsolocal_func:
 ; PIC:       @ %bb.0:
 ; PIC-NEXT:    .save {r11, lr}
 ; PIC-NEXT:    push {r11, lr}
-; PIC-NEXT:    bl dsolocal_func
+; PIC-NEXT:    bl .Ldsolocal_func$local
 ; PIC-NEXT:    pop {r11, pc}
   call ptr @dsolocal_func()
   ret void
 }

llvm/test/CodeGen/ARM/thumb-function-section-reloc.ll

 ;; Do not autogen (we check directives that are normally filtered out):
 ; UTC-ARGS: --disable
 
 ; RELOCS-LABEL: Relocations [
 ; RELOCS-NEXT:   Section (5) .rel.ARM.exidx.text._ZdlPv {
 ; RELOCS-NEXT:     0x0 R_ARM_PREL31 .text._ZdlPv
 ; RELOCS-NEXT:   }
 ; RELOCS-NEXT:   Section (7) .rel.text.test {
-; RELOCS-NEXT:     0x4 R_ARM_CALL _ZdlPv
+; RELOCS-NEXT:     0x4 R_ARM_CALL .L_ZdlPv$local
 ; FIXME: these two relocation should not be against the section!
 ; RELOCS-NEXT:     0xC R_ARM_ABS32 .text._ZdlPv
 ; RELOCS-NEXT:     0x10 R_ARM_ABS32 .text._ZdlPv
-; RELOCS-NEXT:     0x1C R_ARM_REL32 _ZdlPv
+; RELOCS-NEXT:     0x1C R_ARM_REL32 .L_ZdlPv$local
 ; RELOCS-NEXT:   }
 ; RELOCS-NEXT:   Section (9) .rel.ARM.exidx.text.test {
 ; RELOCS-NEXT:     0x0 R_ARM_PREL31 .text.test
 ; RELOCS-NEXT:   }
 ; RELOCS-NEXT:   Section (11) .rel.data {
 ; RELOCS-NEXT:     0x0 R_ARM_ABS32 _ZdlPv
 ; RELOCS-NEXT:   }
 ; RELOCS-NEXT: ]
 
 ; RELOCS-LABEL: Symbols [
-; RELOCS: Symbol {
-; FIXME: we should include the symbol in the symbol table!
-; RELOCS-NOT:    Name: .L_ZdlPv$local
-; RELOCS-TODO:   Name: .L_ZdlPv$local
+; RELOCS:      Symbol {
+; RELOCS:        Name: .L_ZdlPv$local
 ; RELOCS-TODO:   Value: 0x1
+; RELOCS-NEXT:   Value: 0x0
 ; RELOCS-TODO:   Size: 2
-; RELOCS-TODO:   Binding: Local (0x0)
+; RELOCS-NEXT:   Size: 0
+; RELOCS-NEXT:   Binding: Local (0x0)
 ; RELOCS-TODO:   Type: Function (0x2)
-; RELOCS-TODO:   Other: 0
-; RELOCS-TODO:   Section: .text._ZdlPv (
-; RELOCS-TODO: }
+; RELOCS-NEXT:   Type: None (0x0)
+; RELOCS-NEXT:   Other: 0
+; RELOCS-NEXT:   Section: .text._ZdlPv (
+; RELOCS-NEXT: }
 
 define dso_local void @_ZdlPv(ptr %ptr) local_unnamed_addr nounwind "target-features"="+armv7-a,+thumb-mode" {
 ; CHECK-LABEL:  .section  .text._ZdlPv,"ax",%progbits
 ; CHECK-NEXT:   .globl  _ZdlPv                          @ -- Begin function _ZdlPv
 ; CHECK-NEXT:   .p2align  1
 ; CHECK-NEXT:   .type _ZdlPv,%function
 ; CHECK-NEXT:   .code 16                              @ @_ZdlPv
 ; CHECK-NEXT:   .thumb_func
; CHECK-NEXT:   .fnend
   ret void
 }
 
 define ptr @test(ptr %ptr) nounwind {
 ; CHECK-LABEL: test:
 ; CHECK:       @ %bb.0: @ %entry
 ; CHECK-NEXT:    .save {r11, lr}
 ; CHECK-NEXT:    push {r11, lr}
-; CHECK-NEXT:    bl _ZdlPv{{$}}
+; CHECK-NEXT:    bl .L_ZdlPv$local
 ; CHECK-NEXT:    ldr r0, .LCPI1_0
 ; CHECK-NEXT:    @APP
 ; CHECK-NEXT:    .long .L_ZdlPv$local
 ; CHECK-NEXT:    @NO_APP
 ; CHECK-NEXT:    @APP
 ; CHECK-NEXT:    .Ltmp0:
 ; CHECK-NEXT:    .reloc .Ltmp0, R_ARM_ABS32, .L_ZdlPv$local
 ; CHECK-NEXT:    .long 0
 ; CHECK-NEXT:    @NO_APP
 ; CHECK-NEXT:  .LPC1_0:
 ; CHECK-NEXT:    add r0, pc, r0
 ; CHECK-NEXT:    pop {r11, pc}
 ; CHECK-NEXT:    .p2align 2
 ; CHECK-NEXT:  @ %bb.1:
 ; CHECK-NEXT:  .LCPI1_0:
-; CHECK-NEXT:    .long _ZdlPv-(.LPC1_0+8)
+; CHECK-NEXT:    .long .L_ZdlPv$local-(.LPC1_0+8)
 entry:
   call void @_ZdlPv(ptr %ptr)
   ; This inline assembly is needed to highlight the missing Thumb LSB since
   ; only R_ARM_ABS32 is converted to section+offset
   tail call void asm sideeffect ".4byte .L_ZdlPv$$local", ""()
   tail call void asm sideeffect ".reloc ., R_ARM_ABS32, .L_ZdlPv$$local\0A.4byte 0", ""()
   ret ptr @_ZdlPv
 }
 
 @fnptr = hidden local_unnamed_addr global ptr @_ZdlPv