fixup! [RISCV] Support Parsing Nonstandard Relocations

Author: lenary

llvm/include/llvm/BinaryFormat/ELFRelocs/RISCV_nonstandard.def

@@ -10,20 +10,18 @@
 #error "ELF_RISCV_NONSTANDARD_RELOC must be defined"
 #endif
 
-/*
-  ELF_RISCV_NONSTANDARD_RELOC(VENDOR, NAME, ID) defines information about
-  nonstandard relocation codes. This can be used when parsing relocations, or
-  when printing them, to provide better information.
-
-  VENDOR should be the symbol name expected in the associated `R_RISCV_VENDOR`
-  relocation. NAME and ID work like `ELF_RELOC` but the mapping is not expected
-  to be 1:1.
-
-  The mapping in RISCV.def is 1:1, and should be used when the only information
-  available is the relocation enum value.
-*/
+// ELF_RISCV_NONSTANDARD_RELOC(VENDOR, NAME, ID) defines information about
+// nonstandard relocation codes. This can be used when parsing relocations, or
+// when printing them, to provide better information.
+//
+// VENDOR should be the symbol name expected in the associated `R_RISCV_VENDOR`
+// relocation. NAME and ID work like `ELF_RELOC` but the mapping is not expected
+// to be 1:1.
+//
+// The mapping in RISCV.def is 1:1, and should be used when the only information
+// available is the relocation enum value.
 
-/* Qualcomm Nonstandard Relocations */
+// Qualcomm Nonstandard Relocations
 ELF_RISCV_NONSTANDARD_RELOC(QUALCOMM, R_RISCV_QC_ABS20_U,    192)
 ELF_RISCV_NONSTANDARD_RELOC(QUALCOMM, R_RISCV_QC_E_BRANCH,   193)
 ELF_RISCV_NONSTANDARD_RELOC(QUALCOMM, R_RISCV_QC_E_32,       194)

llvm/test/MC/RISCV/custom_reloc.s

@@ -21,13 +21,13 @@
   .reloc ., R_RISCV_VENDOR,    VENDOR_NAME
   .reloc ., R_RISCV_CUSTOM192, my_foo + 1
   addi a0, a0, 0
-  # CHECK-ASM: [[L1:.L[^:]+]]:
+  # CHECK-ASM:      [[L1:.L[^:]+]]:
   # CHECK-ASM-NEXT: .reloc [[L1]], R_RISCV_VENDOR, VENDOR_NAME
   # CHECK-ASM-NEXT: [[L2:.L[^:]+]]:
   # CHECK-ASM-NEXT: .reloc [[L2]], R_RISCV_CUSTOM192, my_foo+1
   # CHECK-ASM-NEXT: mv a0, a0
 
-  # CHECK-OBJ: addi a0, a0, 0
+  # CHECK-OBJ:      addi a0, a0, 0
   # CHECK-OBJ-NEXT: R_RISCV_VENDOR    VENDOR_NAME
   # CHECK-OBJ-NEXT: R_RISCV_CUSTOM192 my_foo+0x1
 
@@ -38,13 +38,13 @@
   .reloc ., R_RISCV_VENDOR,     QUALCOMM
   .reloc ., R_RISCV_QC_ABS20_U, my_bar + 2
   addi a1, a1, 0
-  # CHECK-ASM: [[L3:.L[^:]+]]:
+  # CHECK-ASM:      [[L3:.L[^:]+]]:
   # CHECK-ASM-NEXT: .reloc [[L3]], R_RISCV_VENDOR, QUALCOMM
   # CHECK-ASM-NEXT: [[L4:.L[^:]+]]:
   # CHECK-ASM-NEXT: .reloc [[L4]], R_RISCV_QC_ABS20_U, my_bar+2
   # CHECK-ASM-NEXT: mv a1, a1
 
-  # CHECK-OBJ: addi a1, a1, 0
+  # CHECK-OBJ:      addi a1, a1, 0
   # CHECK-OBJ-NEXT: R_RISCV_VENDOR    QUALCOMM
   # CHECK-OBJ-NEXT: R_RISCV_CUSTOM192 my_bar+0x2