cmd/link, cmd/internal/objabi: remove R_DWARFFILEREF relocation type

Get rid of the R_DWARFFILEREF relocation type -- we have not used this
relocation for a while now, ever since jfaller's revamp of the DWARF
line table file section in Go 1.15. No change in compiler or linker
functionality; this is purely a dead code cleanup.

Change-Id: I178760c87f3aa79694cfabe7364ca382605c6975
Reviewed-on: https://go-review.googlesource.com/c/go/+/633876
Reviewed-by: David Chase <drchase@google.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>

diff --git a/src/cmd/internal/objabi/reloctype.go b/src/cmd/internal/objabi/reloctype.go
index 8e9bee508224b23b48de056dab01246fe20c8d45..ca6cec1f45839d9d0d2f26ae5ffe9fd3865a7f4e 100644 (file)
--- a/src/cmd/internal/objabi/reloctype.go
+++ b/src/cmd/internal/objabi/reloctype.go
@@ -118,11 +118,6 @@ const (
        // Target of relocation must be size 4 (in current implementation).
        R_DWARFSECREF
 
-       // R_DWARFFILEREF resolves to an index into the DWARF .debug_line
-       // file table for the specified file symbol. Must be applied to an
-       // attribute of form DW_FORM_data4.
-       R_DWARFFILEREF
-
        // Platform dependent relocations. Architectures with fixed width instructions
        // have the inherent issue that a 32-bit (or 64-bit!) displacement cannot be
        // stuffed into a 32-bit instruction, so an address needs to be spread across

diff --git a/src/cmd/internal/objabi/reloctype_string.go b/src/cmd/internal/objabi/reloctype_string.go
index 2d8a9554eb5c946a9758083734974607a2b77997..cd986cce1cdf911fec80a2f8e38826431826fc88 100644 (file)
--- a/src/cmd/internal/objabi/reloctype_string.go
+++ b/src/cmd/internal/objabi/reloctype_string.go
@@ -39,76 +39,75 @@ func _() {
        _ = x[R_GOTPCREL-29]
        _ = x[R_JMPMIPS-30]
        _ = x[R_DWARFSECREF-31]
-       _ = x[R_DWARFFILEREF-32]
-       _ = x[R_ARM64_TLS_LE-33]
-       _ = x[R_ARM64_TLS_IE-34]
-       _ = x[R_ARM64_GOTPCREL-35]
-       _ = x[R_ARM64_GOT-36]
-       _ = x[R_ARM64_PCREL-37]
-       _ = x[R_ARM64_PCREL_LDST8-38]
-       _ = x[R_ARM64_PCREL_LDST16-39]
-       _ = x[R_ARM64_PCREL_LDST32-40]
-       _ = x[R_ARM64_PCREL_LDST64-41]
-       _ = x[R_ARM64_LDST8-42]
-       _ = x[R_ARM64_LDST16-43]
-       _ = x[R_ARM64_LDST32-44]
-       _ = x[R_ARM64_LDST64-45]
-       _ = x[R_ARM64_LDST128-46]
-       _ = x[R_POWER_TLS_LE-47]
-       _ = x[R_POWER_TLS_IE-48]
-       _ = x[R_POWER_TLS-49]
-       _ = x[R_POWER_TLS_IE_PCREL34-50]
-       _ = x[R_POWER_TLS_LE_TPREL34-51]
-       _ = x[R_ADDRPOWER_DS-52]
-       _ = x[R_ADDRPOWER_GOT-53]
-       _ = x[R_ADDRPOWER_GOT_PCREL34-54]
-       _ = x[R_ADDRPOWER_PCREL-55]
-       _ = x[R_ADDRPOWER_TOCREL-56]
-       _ = x[R_ADDRPOWER_TOCREL_DS-57]
-       _ = x[R_ADDRPOWER_D34-58]
-       _ = x[R_ADDRPOWER_PCREL34-59]
-       _ = x[R_RISCV_JAL-60]
-       _ = x[R_RISCV_JAL_TRAMP-61]
-       _ = x[R_RISCV_CALL-62]
-       _ = x[R_RISCV_PCREL_ITYPE-63]
-       _ = x[R_RISCV_PCREL_STYPE-64]
-       _ = x[R_RISCV_TLS_IE-65]
-       _ = x[R_RISCV_TLS_LE-66]
-       _ = x[R_RISCV_GOT_HI20-67]
-       _ = x[R_RISCV_GOT_PCREL_ITYPE-68]
-       _ = x[R_RISCV_PCREL_HI20-69]
-       _ = x[R_RISCV_PCREL_LO12_I-70]
-       _ = x[R_RISCV_PCREL_LO12_S-71]
-       _ = x[R_RISCV_BRANCH-72]
-       _ = x[R_RISCV_RVC_BRANCH-73]
-       _ = x[R_RISCV_RVC_JUMP-74]
-       _ = x[R_PCRELDBL-75]
-       _ = x[R_LOONG64_ADDR_HI-76]
-       _ = x[R_LOONG64_ADDR_LO-77]
-       _ = x[R_LOONG64_TLS_LE_HI-78]
-       _ = x[R_LOONG64_TLS_LE_LO-79]
-       _ = x[R_CALLLOONG64-80]
-       _ = x[R_LOONG64_TLS_IE_HI-81]
-       _ = x[R_LOONG64_TLS_IE_LO-82]
-       _ = x[R_LOONG64_GOT_HI-83]
-       _ = x[R_LOONG64_GOT_LO-84]
-       _ = x[R_LOONG64_ADD64-85]
-       _ = x[R_LOONG64_SUB64-86]
-       _ = x[R_JMP16LOONG64-87]
-       _ = x[R_JMP21LOONG64-88]
-       _ = x[R_JMPLOONG64-89]
-       _ = x[R_ADDRMIPSU-90]
-       _ = x[R_ADDRMIPSTLS-91]
-       _ = x[R_ADDRCUOFF-92]
-       _ = x[R_WASMIMPORT-93]
-       _ = x[R_XCOFFREF-94]
-       _ = x[R_PEIMAGEOFF-95]
-       _ = x[R_INITORDER-96]
+       _ = x[R_ARM64_TLS_LE-32]
+       _ = x[R_ARM64_TLS_IE-33]
+       _ = x[R_ARM64_GOTPCREL-34]
+       _ = x[R_ARM64_GOT-35]
+       _ = x[R_ARM64_PCREL-36]
+       _ = x[R_ARM64_PCREL_LDST8-37]
+       _ = x[R_ARM64_PCREL_LDST16-38]
+       _ = x[R_ARM64_PCREL_LDST32-39]
+       _ = x[R_ARM64_PCREL_LDST64-40]
+       _ = x[R_ARM64_LDST8-41]
+       _ = x[R_ARM64_LDST16-42]
+       _ = x[R_ARM64_LDST32-43]
+       _ = x[R_ARM64_LDST64-44]
+       _ = x[R_ARM64_LDST128-45]
+       _ = x[R_POWER_TLS_LE-46]
+       _ = x[R_POWER_TLS_IE-47]
+       _ = x[R_POWER_TLS-48]
+       _ = x[R_POWER_TLS_IE_PCREL34-49]
+       _ = x[R_POWER_TLS_LE_TPREL34-50]
+       _ = x[R_ADDRPOWER_DS-51]
+       _ = x[R_ADDRPOWER_GOT-52]
+       _ = x[R_ADDRPOWER_GOT_PCREL34-53]
+       _ = x[R_ADDRPOWER_PCREL-54]
+       _ = x[R_ADDRPOWER_TOCREL-55]
+       _ = x[R_ADDRPOWER_TOCREL_DS-56]
+       _ = x[R_ADDRPOWER_D34-57]
+       _ = x[R_ADDRPOWER_PCREL34-58]
+       _ = x[R_RISCV_JAL-59]
+       _ = x[R_RISCV_JAL_TRAMP-60]
+       _ = x[R_RISCV_CALL-61]
+       _ = x[R_RISCV_PCREL_ITYPE-62]
+       _ = x[R_RISCV_PCREL_STYPE-63]
+       _ = x[R_RISCV_TLS_IE-64]
+       _ = x[R_RISCV_TLS_LE-65]
+       _ = x[R_RISCV_GOT_HI20-66]
+       _ = x[R_RISCV_GOT_PCREL_ITYPE-67]
+       _ = x[R_RISCV_PCREL_HI20-68]
+       _ = x[R_RISCV_PCREL_LO12_I-69]
+       _ = x[R_RISCV_PCREL_LO12_S-70]
+       _ = x[R_RISCV_BRANCH-71]
+       _ = x[R_RISCV_RVC_BRANCH-72]
+       _ = x[R_RISCV_RVC_JUMP-73]
+       _ = x[R_PCRELDBL-74]
+       _ = x[R_LOONG64_ADDR_HI-75]
+       _ = x[R_LOONG64_ADDR_LO-76]
+       _ = x[R_LOONG64_TLS_LE_HI-77]
+       _ = x[R_LOONG64_TLS_LE_LO-78]
+       _ = x[R_CALLLOONG64-79]
+       _ = x[R_LOONG64_TLS_IE_HI-80]
+       _ = x[R_LOONG64_TLS_IE_LO-81]
+       _ = x[R_LOONG64_GOT_HI-82]
+       _ = x[R_LOONG64_GOT_LO-83]
+       _ = x[R_LOONG64_ADD64-84]
+       _ = x[R_LOONG64_SUB64-85]
+       _ = x[R_JMP16LOONG64-86]
+       _ = x[R_JMP21LOONG64-87]
+       _ = x[R_JMPLOONG64-88]
+       _ = x[R_ADDRMIPSU-89]
+       _ = x[R_ADDRMIPSTLS-90]
+       _ = x[R_ADDRCUOFF-91]
+       _ = x[R_WASMIMPORT-92]
+       _ = x[R_XCOFFREF-93]
+       _ = x[R_PEIMAGEOFF-94]
+       _ = x[R_INITORDER-95]
 }
 
-const _RelocType_name = "R_ADDRR_ADDRPOWERR_ADDRARM64R_ADDRMIPSR_ADDROFFR_SIZER_CALLR_CALLARMR_CALLARM64R_CALLINDR_CALLPOWERR_CALLMIPSR_CONSTR_PCRELR_TLS_LER_TLS_IER_GOTOFFR_PLT0R_PLT1R_PLT2R_USEFIELDR_USETYPER_USEIFACER_USEIFACEMETHODR_USENAMEDMETHODR_METHODOFFR_KEEPR_POWER_TOCR_GOTPCRELR_JMPMIPSR_DWARFSECREFR_DWARFFILEREFR_ARM64_TLS_LER_ARM64_TLS_IER_ARM64_GOTPCRELR_ARM64_GOTR_ARM64_PCRELR_ARM64_PCREL_LDST8R_ARM64_PCREL_LDST16R_ARM64_PCREL_LDST32R_ARM64_PCREL_LDST64R_ARM64_LDST8R_ARM64_LDST16R_ARM64_LDST32R_ARM64_LDST64R_ARM64_LDST128R_POWER_TLS_LER_POWER_TLS_IER_POWER_TLSR_POWER_TLS_IE_PCREL34R_POWER_TLS_LE_TPREL34R_ADDRPOWER_DSR_ADDRPOWER_GOTR_ADDRPOWER_GOT_PCREL34R_ADDRPOWER_PCRELR_ADDRPOWER_TOCRELR_ADDRPOWER_TOCREL_DSR_ADDRPOWER_D34R_ADDRPOWER_PCREL34R_RISCV_JALR_RISCV_JAL_TRAMPR_RISCV_CALLR_RISCV_PCREL_ITYPER_RISCV_PCREL_STYPER_RISCV_TLS_IER_RISCV_TLS_LER_RISCV_GOT_HI20R_RISCV_GOT_PCREL_ITYPER_RISCV_PCREL_HI20R_RISCV_PCREL_LO12_IR_RISCV_PCREL_LO12_SR_RISCV_BRANCHR_RISCV_RVC_BRANCHR_RISCV_RVC_JUMPR_PCRELDBLR_LOONG64_ADDR_HIR_LOONG64_ADDR_LOR_LOONG64_TLS_LE_HIR_LOONG64_TLS_LE_LOR_CALLLOONG64R_LOONG64_TLS_IE_HIR_LOONG64_TLS_IE_LOR_LOONG64_GOT_HIR_LOONG64_GOT_LOR_LOONG64_ADD64R_LOONG64_SUB64R_JMP16LOONG64R_JMP21LOONG64R_JMPLOONG64R_ADDRMIPSUR_ADDRMIPSTLSR_ADDRCUOFFR_WASMIMPORTR_XCOFFREFR_PEIMAGEOFFR_INITORDER"
+const _RelocType_name = "R_ADDRR_ADDRPOWERR_ADDRARM64R_ADDRMIPSR_ADDROFFR_SIZER_CALLR_CALLARMR_CALLARM64R_CALLINDR_CALLPOWERR_CALLMIPSR_CONSTR_PCRELR_TLS_LER_TLS_IER_GOTOFFR_PLT0R_PLT1R_PLT2R_USEFIELDR_USETYPER_USEIFACER_USEIFACEMETHODR_USENAMEDMETHODR_METHODOFFR_KEEPR_POWER_TOCR_GOTPCRELR_JMPMIPSR_DWARFSECREFR_ARM64_TLS_LER_ARM64_TLS_IER_ARM64_GOTPCRELR_ARM64_GOTR_ARM64_PCRELR_ARM64_PCREL_LDST8R_ARM64_PCREL_LDST16R_ARM64_PCREL_LDST32R_ARM64_PCREL_LDST64R_ARM64_LDST8R_ARM64_LDST16R_ARM64_LDST32R_ARM64_LDST64R_ARM64_LDST128R_POWER_TLS_LER_POWER_TLS_IER_POWER_TLSR_POWER_TLS_IE_PCREL34R_POWER_TLS_LE_TPREL34R_ADDRPOWER_DSR_ADDRPOWER_GOTR_ADDRPOWER_GOT_PCREL34R_ADDRPOWER_PCRELR_ADDRPOWER_TOCRELR_ADDRPOWER_TOCREL_DSR_ADDRPOWER_D34R_ADDRPOWER_PCREL34R_RISCV_JALR_RISCV_JAL_TRAMPR_RISCV_CALLR_RISCV_PCREL_ITYPER_RISCV_PCREL_STYPER_RISCV_TLS_IER_RISCV_TLS_LER_RISCV_GOT_HI20R_RISCV_GOT_PCREL_ITYPER_RISCV_PCREL_HI20R_RISCV_PCREL_LO12_IR_RISCV_PCREL_LO12_SR_RISCV_BRANCHR_RISCV_RVC_BRANCHR_RISCV_RVC_JUMPR_PCRELDBLR_LOONG64_ADDR_HIR_LOONG64_ADDR_LOR_LOONG64_TLS_LE_HIR_LOONG64_TLS_LE_LOR_CALLLOONG64R_LOONG64_TLS_IE_HIR_LOONG64_TLS_IE_LOR_LOONG64_GOT_HIR_LOONG64_GOT_LOR_LOONG64_ADD64R_LOONG64_SUB64R_JMP16LOONG64R_JMP21LOONG64R_JMPLOONG64R_ADDRMIPSUR_ADDRMIPSTLSR_ADDRCUOFFR_WASMIMPORTR_XCOFFREFR_PEIMAGEOFFR_INITORDER"
 
-var _RelocType_index = [...]uint16{0, 6, 17, 28, 38, 47, 53, 59, 68, 79, 88, 99, 109, 116, 123, 131, 139, 147, 153, 159, 165, 175, 184, 194, 210, 226, 237, 243, 254, 264, 273, 286, 300, 314, 328, 344, 355, 368, 387, 407, 427, 447, 460, 474, 488, 502, 517, 531, 545, 556, 578, 600, 614, 629, 652, 669, 687, 708, 723, 742, 753, 770, 782, 801, 820, 834, 848, 864, 887, 905, 925, 945, 959, 977, 993, 1003, 1020, 1037, 1056, 1075, 1088, 1107, 1126, 1142, 1158, 1173, 1188, 1202, 1216, 1228, 1239, 1252, 1263, 1275, 1285, 1297, 1308}
+var _RelocType_index = [...]uint16{0, 6, 17, 28, 38, 47, 53, 59, 68, 79, 88, 99, 109, 116, 123, 131, 139, 147, 153, 159, 165, 175, 184, 194, 210, 226, 237, 243, 254, 264, 273, 286, 300, 314, 330, 341, 354, 373, 393, 413, 433, 446, 460, 474, 488, 503, 517, 531, 542, 564, 586, 600, 615, 638, 655, 673, 694, 709, 728, 739, 756, 768, 787, 806, 820, 834, 850, 873, 891, 911, 931, 945, 963, 979, 989, 1006, 1023, 1042, 1061, 1074, 1093, 1112, 1128, 1144, 1159, 1174, 1188, 1202, 1214, 1225, 1238, 1249, 1261, 1271, 1283, 1294}
 
 func (i RelocType) String() string {
        i -= 1

diff --git a/src/cmd/link/internal/ld/data.go b/src/cmd/link/internal/ld/data.go
index a6b94a829f1442202d8156754c1dc57222797c8e..deff909e5ca00374afbdadce1d0c1e9d0848aef6 100644 (file)
--- a/src/cmd/link/internal/ld/data.go
+++ b/src/cmd/link/internal/ld/data.go
@@ -590,10 +590,6 @@ func (st *relocSymState) relocsym(s loader.Sym, P []byte) {
                        nExtReloc++
                        continue
 
-               case objabi.R_DWARFFILEREF:
-                       // We don't renumber files in dwarf.go:writelines anymore.
-                       continue
-
                case objabi.R_CONST:
                        o = r.Add()
 

diff --git a/src/cmd/link/internal/ld/pe.go b/src/cmd/link/internal/ld/pe.go
index d4d6abe153efeb2583654551ac7fec9e4a297631..920ee7b573eac7736f0be103530eb7fc3936cef6 100644 (file)
--- a/src/cmd/link/internal/ld/pe.go
+++ b/src/cmd/link/internal/ld/pe.go
@@ -1582,9 +1582,6 @@ func addPEBaseRelocSym(ldr *loader.Loader, s loader.Sym, rt *peBaseRelocTable) {
                if r.Siz() == 0 { // informational relocation
                        continue
                }
-               if r.Type() == objabi.R_DWARFFILEREF {
-                       continue
-               }
                rs := r.Sym()
                if rs == 0 {
                        continue