diff --git a/llvm/test/MC/RISCV/riscv64-64b-pcrel.s b/llvm/test/MC/RISCV/riscv64-64b-pcrel.s
index ebdacc0785c9e..7df442874fb47 100644
--- a/llvm/test/MC/RISCV/riscv64-64b-pcrel.s
+++ b/llvm/test/MC/RISCV/riscv64-64b-pcrel.s
@@ -9,6 +9,12 @@
 # CHECK-NEXT:     0x0 R_RISCV_SUB64 w 0x0
 # CHECK-NEXT:     0x8 R_RISCV_ADD64 w 0x0
 # CHECK-NEXT:     0x8 R_RISCV_SUB64 extern 0x0
+# CHECK-NEXT:     0x10 R_RISCV_ADD32 x 0x0
+# CHECK-NEXT:     0x10 R_RISCV_SUB32 w 0x0
+# CHECK-NEXT:     0x14 R_RISCV_ADD32 w1 0x0
+# CHECK-NEXT:     0x14 R_RISCV_SUB32 w 0x0
+# CHECK-NEXT:     0x18 R_RISCV_ADD32 .L.str 0x0
+# CHECK-NEXT:     0x18 R_RISCV_SUB32 w 0x0
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Section ({{.*}}) .rela.alloc_x {
 # CHECK-NEXT:     0x0 R_RISCV_ADD64 y 0x0
@@ -34,8 +40,13 @@
 .endif
 
 .section .alloc_w,"aw",@progbits; w:
-.quad extern-w
+.quad extern-w   # extern is undefined
 .quad w-extern
+.long x-w        # A is later defined in another section
+.long w1-w       # A is later defined in the same section
+.long .L.str-w   # A is temporary
+w1:
+
 .section .alloc_x,"aw",@progbits; x:
 .quad y-x
 .section .alloc_y,"aw",@progbits; y:
@@ -56,6 +67,17 @@
 .section .nonalloc_y; ny:
 .quad nx-ny
 
+## -gdwarf-aranges generated assembly expects no relocation.
+## Otherwise, a .Lsec_end0 symbol (defined at the end of .rodata.str1.1)
+## will be rejected by linkers.
+.section .rodata.str1.1,"aMS",@progbits,1
+.L.str:
+  .asciz  "hello"
+.section .rodata.str1.1,"aMS",@progbits,1
+.Lsec_end0:
+.section .debug_aranges,"",@progbits
+.quad .Lsec_end0-.L.str
+
 ## .apple_names/.apple_types are fixed-size and do not need fixups.
 ## llvm-dwarfdump --apple-names does not process R_RISCV_{ADD,SUB}32 in them.
 ## See llvm/test/DebugInfo/Generic/accel-table-hash-collisions.ll