[dev.link] cmd/link: delete SCONST symbol type

After CL 233998, we don't produce SCONST symbols anywhere. Remove
the type.

Change-Id: I0f52de5242b8fd0ffec63370eef612511e1087ad
Reviewed-on: https://go-review.googlesource.com/c/go/+/234437
Run-TryBot: Cherry Zhang <cherryyz@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Than McIntosh <thanm@google.com>

diff --git a/src/cmd/link/internal/ld/data.go b/src/cmd/link/internal/ld/data.go
index e273841ddba3d0d1e4c16c4d40def6f213223342..98242b16e4d9e5acc4eda04588d860677684f33b 100644 (file)
--- a/src/cmd/link/internal/ld/data.go
+++ b/src/cmd/link/internal/ld/data.go
@@ -334,7 +334,7 @@ func (st *relocSymState) relocsym(s loader.Sym, P []byte) {
                                log.Fatalf("cannot handle R_TLS_IE (sym %s) when linking internally", ldr.SymName(s))
                        }
                case objabi.R_ADDR:
-                       if target.IsExternal() && rst != sym.SCONST {
+                       if target.IsExternal() {
                                needExtReloc = true
 
                                // set up addend for eventual relocation via outer symbol.
@@ -441,7 +441,7 @@ func (st *relocSymState) relocsym(s loader.Sym, P []byte) {
 
                // r.Sym() can be 0 when CALL $(constant) is transformed from absolute PC to relative PC call.
                case objabi.R_GOTPCREL:
-                       if target.IsDynlinkingGo() && target.IsDarwin() && rs != 0 && rst != sym.SCONST {
+                       if target.IsDynlinkingGo() && target.IsDarwin() && rs != 0 {
                                needExtReloc = true
                                rr.Xadd = r.Add()
                                rr.Xadd -= int64(siz) // relative to address after the relocated chunk
@@ -464,7 +464,7 @@ func (st *relocSymState) relocsym(s loader.Sym, P []byte) {
                                o = 0
                                break
                        }
-                       if target.IsExternal() && rs != 0 && rst != sym.SCONST && (ldr.SymSect(rs) != ldr.SymSect(s) || rt == objabi.R_GOTPCREL) {
+                       if target.IsExternal() && rs != 0 && (ldr.SymSect(rs) != ldr.SymSect(s) || rt == objabi.R_GOTPCREL) {
                                needExtReloc = true
 
                                // set up addend for eventual relocation via outer symbol.

diff --git a/src/cmd/link/internal/ld/macho.go b/src/cmd/link/internal/ld/macho.go
index ab8d82f61ed5cb3449af2284b3993f4722b25195..c66af8628a3f4ab46df8463ada785dd6c9a9f22b 100644 (file)
--- a/src/cmd/link/internal/ld/macho.go
+++ b/src/cmd/link/internal/ld/macho.go
@@ -779,7 +779,7 @@ func collectmachosyms(ctxt *Link) {
                        continue
                }
                t := ldr.SymType(s)
-               if t >= sym.SELFRXSECT && t < sym.SXREF || t == sym.SCONST { // data sections handled in dodata
+               if t >= sym.SELFRXSECT && t < sym.SXREF { // data sections handled in dodata
                        if t == sym.STLSBSS {
                                // TLSBSS is not used on darwin. See data.go:allocateDataSections
                                continue

diff --git a/src/cmd/link/internal/ld/pe.go b/src/cmd/link/internal/ld/pe.go
index 7e2c35674aac58bc57a51fed08aa0d22a4a605a4..29395c94e3af8fc026def187a81efc7da29bb24f 100644 (file)
--- a/src/cmd/link/internal/ld/pe.go
+++ b/src/cmd/link/internal/ld/pe.go
@@ -736,7 +736,7 @@ func (f *peFile) writeSymbols(ctxt *Link) {
                }
 
                switch t {
-               case sym.SDYNIMPORT, sym.SHOSTOBJ, sym.SUNDEFEXT, sym.SCONST:
+               case sym.SDYNIMPORT, sym.SHOSTOBJ, sym.SUNDEFEXT:
                        addsym(s)
                }
        }

diff --git a/src/cmd/link/internal/sym/symkind.go b/src/cmd/link/internal/sym/symkind.go
index 1933dd7b2168e414409aaed55daaae8bbd1f2092..75f72c37373449b979340f25315337844df1bb48 100644 (file)
--- a/src/cmd/link/internal/sym/symkind.go
+++ b/src/cmd/link/internal/sym/symkind.go
@@ -102,7 +102,6 @@ const (
        SMACHOINDIRECTPLT
        SMACHOINDIRECTGOT
        SFILEPATH
-       SCONST
        SDYNIMPORT
        SHOSTOBJ
        SUNDEFEXT // Undefined symbol for resolution by external linker

diff --git a/src/cmd/link/internal/sym/symkind_string.go b/src/cmd/link/internal/sym/symkind_string.go
index 97af9925d57583d523f3bd367342cc93b8aff8e1..5777047d0f55e993c416cfad27f76e12dbc89d29 100644 (file)
--- a/src/cmd/link/internal/sym/symkind_string.go
+++ b/src/cmd/link/internal/sym/symkind_string.go
@@ -1,4 +1,4 @@
-// Code generated by "stringer -type=SymKind symkind.go"; DO NOT EDIT.
+// Code generated by "stringer -type=SymKind"; DO NOT EDIT.
 
 package sym
 
@@ -52,21 +52,20 @@ func _() {
        _ = x[SMACHOINDIRECTPLT-41]
        _ = x[SMACHOINDIRECTGOT-42]
        _ = x[SFILEPATH-43]
-       _ = x[SCONST-44]
-       _ = x[SDYNIMPORT-45]
-       _ = x[SHOSTOBJ-46]
-       _ = x[SUNDEFEXT-47]
-       _ = x[SDWARFSECT-48]
-       _ = x[SDWARFINFO-49]
-       _ = x[SDWARFRANGE-50]
-       _ = x[SDWARFLOC-51]
-       _ = x[SDWARFLINES-52]
-       _ = x[SABIALIAS-53]
+       _ = x[SDYNIMPORT-44]
+       _ = x[SHOSTOBJ-45]
+       _ = x[SUNDEFEXT-46]
+       _ = x[SDWARFSECT-47]
+       _ = x[SDWARFINFO-48]
+       _ = x[SDWARFRANGE-49]
+       _ = x[SDWARFLOC-50]
+       _ = x[SDWARFLINES-51]
+       _ = x[SABIALIAS-52]
 }
 
-const _SymKind_name = "SxxxSTEXTSELFRXSECTSTYPESSTRINGSGOSTRINGSGOFUNCSGCBITSSRODATASFUNCTABSELFROSECTSMACHOPLTSTYPERELROSSTRINGRELROSGOSTRINGRELROSGOFUNCRELROSGCBITSRELROSRODATARELROSFUNCTABRELROSTYPELINKSITABLINKSSYMTABSPCLNTABSFirstWritableSBUILDINFOSELFSECTSMACHOSMACHOGOTSWINDOWSSELFGOTSNOPTRDATASINITARRSDATASXCOFFTOCSBSSSNOPTRBSSSLIBFUZZER_EXTRA_COUNTERSTLSBSSSXREFSMACHOSYMSTRSMACHOSYMTABSMACHOINDIRECTPLTSMACHOINDIRECTGOTSFILEPATHSCONSTSDYNIMPORTSHOSTOBJSUNDEFEXTSDWARFSECTSDWARFINFOSDWARFRANGESDWARFLOCSDWARFLINESSABIALIAS"
+const _SymKind_name = "SxxxSTEXTSELFRXSECTSTYPESSTRINGSGOSTRINGSGOFUNCSGCBITSSRODATASFUNCTABSELFROSECTSMACHOPLTSTYPERELROSSTRINGRELROSGOSTRINGRELROSGOFUNCRELROSGCBITSRELROSRODATARELROSFUNCTABRELROSTYPELINKSITABLINKSSYMTABSPCLNTABSFirstWritableSBUILDINFOSELFSECTSMACHOSMACHOGOTSWINDOWSSELFGOTSNOPTRDATASINITARRSDATASXCOFFTOCSBSSSNOPTRBSSSLIBFUZZER_EXTRA_COUNTERSTLSBSSSXREFSMACHOSYMSTRSMACHOSYMTABSMACHOINDIRECTPLTSMACHOINDIRECTGOTSFILEPATHSDYNIMPORTSHOSTOBJSUNDEFEXTSDWARFSECTSDWARFINFOSDWARFRANGESDWARFLOCSDWARFLINESSABIALIAS"
 
-var _SymKind_index = [...]uint16{0, 4, 9, 19, 24, 31, 40, 47, 54, 61, 69, 79, 88, 98, 110, 124, 136, 148, 160, 173, 182, 191, 198, 206, 220, 230, 238, 244, 253, 261, 268, 278, 286, 291, 300, 304, 313, 337, 344, 349, 361, 373, 390, 407, 416, 422, 432, 440, 449, 459, 469, 480, 489, 500, 509}
+var _SymKind_index = [...]uint16{0, 4, 9, 19, 24, 31, 40, 47, 54, 61, 69, 79, 88, 98, 110, 124, 136, 148, 160, 173, 182, 191, 198, 206, 220, 230, 238, 244, 253, 261, 268, 278, 286, 291, 300, 304, 313, 337, 344, 349, 361, 373, 390, 407, 416, 426, 434, 443, 453, 463, 474, 483, 494, 503}
 
 func (i SymKind) String() string {
        if i >= SymKind(len(_SymKind_index)-1) {