diff --git a/src/cmd/link/internal/ld/xcoff.go b/src/cmd/link/internal/ld/xcoff.go
index 13ca19223ba..c07aac1612e 100644
--- a/src/cmd/link/internal/ld/xcoff.go
+++ b/src/cmd/link/internal/ld/xcoff.go
@@ -583,7 +583,7 @@ func xcoffUpdateOuterSize(ctxt *Link, size int64, stype sym.SymKind) {
 	switch stype {
 	default:
 		Errorf("unknown XCOFF outer symbol for type %s", stype.String())
-	case sym.SRODATA, sym.SRODATARELRO, sym.SFUNCTAB, sym.SSTRING:
+	case sym.SRODATA, sym.SRODATARELRO, sym.SSTRING:
 		// Nothing to do
 	case sym.STYPE:
 		if ctxt.UseRelro() && (ctxt.BuildMode == BuildModeCArchive || ctxt.BuildMode == BuildModeCShared || ctxt.BuildMode == BuildModePIE) {
diff --git a/src/cmd/link/internal/sym/symkind.go b/src/cmd/link/internal/sym/symkind.go
index 5ee4bc74c2e..ec31ff666ee 100644
--- a/src/cmd/link/internal/sym/symkind.go
+++ b/src/cmd/link/internal/sym/symkind.go
@@ -61,7 +61,6 @@ const (
 	SRODATAFIPS      // FIPS read-only data.
 	SRODATAFIPSEND   // End of FIPS read-only data.
 	SRODATAEND       // End of read-only data.
-	SFUNCTAB         // Appears to be unused, except for runtime.etypes.
 	SPCLNTAB         // Pclntab data.
 	STYPELINK        // Type links.
 	SELFROSECT       // ELF read-only data: relocs, dynamic linking info.
@@ -188,7 +187,6 @@ var ReadOnly = []SymKind{
 	SRODATAFIPS,
 	SRODATAFIPSEND,
 	SRODATAEND,
-	SFUNCTAB,
 }
 
 // IsText returns true if t is a text type.
diff --git a/src/cmd/link/internal/sym/symkind_string.go b/src/cmd/link/internal/sym/symkind_string.go
index d2e43f4e720..9e7899ad961 100644
--- a/src/cmd/link/internal/sym/symkind_string.go
+++ b/src/cmd/link/internal/sym/symkind_string.go
@@ -24,70 +24,69 @@ func _() {
 	_ = x[SRODATAFIPS-13]
 	_ = x[SRODATAFIPSEND-14]
 	_ = x[SRODATAEND-15]
-	_ = x[SFUNCTAB-16]
-	_ = x[SPCLNTAB-17]
-	_ = x[STYPELINK-18]
-	_ = x[SELFROSECT-19]
-	_ = x[SRODATARELRO-20]
-	_ = x[STYPE-21]
-	_ = x[SGOFUNC-22]
-	_ = x[SELFRELROSECT-23]
-	_ = x[SMACHORELROSECT-24]
-	_ = x[SITABLINK-25]
-	_ = x[SFirstWritable-26]
-	_ = x[SBUILDINFO-27]
-	_ = x[SFIPSINFO-28]
-	_ = x[SELFSECT-29]
-	_ = x[SMACHO-30]
-	_ = x[SWINDOWS-31]
-	_ = x[SMODULEDATA-32]
-	_ = x[SELFGOT-33]
-	_ = x[SMACHOGOT-34]
-	_ = x[SNOPTRDATA-35]
-	_ = x[SNOPTRDATAFIPSSTART-36]
-	_ = x[SNOPTRDATAFIPS-37]
-	_ = x[SNOPTRDATAFIPSEND-38]
-	_ = x[SNOPTRDATAEND-39]
-	_ = x[SINITARR-40]
-	_ = x[SDATA-41]
-	_ = x[SDATAFIPSSTART-42]
-	_ = x[SDATAFIPS-43]
-	_ = x[SDATAFIPSEND-44]
-	_ = x[SDATAEND-45]
-	_ = x[SXCOFFTOC-46]
-	_ = x[SBSS-47]
-	_ = x[SNOPTRBSS-48]
-	_ = x[SLIBFUZZER_8BIT_COUNTER-49]
-	_ = x[SCOVERAGE_COUNTER-50]
-	_ = x[SCOVERAGE_AUXVAR-51]
-	_ = x[STLSBSS-52]
-	_ = x[SFirstUnallocated-53]
-	_ = x[SXREF-54]
-	_ = x[SMACHOSYMSTR-55]
-	_ = x[SMACHOSYMTAB-56]
-	_ = x[SMACHOINDIRECTPLT-57]
-	_ = x[SMACHOINDIRECTGOT-58]
-	_ = x[SDYNIMPORT-59]
-	_ = x[SHOSTOBJ-60]
-	_ = x[SUNDEFEXT-61]
-	_ = x[SDWARFSECT-62]
-	_ = x[SDWARFCUINFO-63]
-	_ = x[SDWARFCONST-64]
-	_ = x[SDWARFFCN-65]
-	_ = x[SDWARFABSFCN-66]
-	_ = x[SDWARFTYPE-67]
-	_ = x[SDWARFVAR-68]
-	_ = x[SDWARFRANGE-69]
-	_ = x[SDWARFLOC-70]
-	_ = x[SDWARFLINES-71]
-	_ = x[SDWARFADDR-72]
-	_ = x[SSEHUNWINDINFO-73]
-	_ = x[SSEHSECT-74]
+	_ = x[SPCLNTAB-16]
+	_ = x[STYPELINK-17]
+	_ = x[SELFROSECT-18]
+	_ = x[SRODATARELRO-19]
+	_ = x[STYPE-20]
+	_ = x[SGOFUNC-21]
+	_ = x[SELFRELROSECT-22]
+	_ = x[SMACHORELROSECT-23]
+	_ = x[SITABLINK-24]
+	_ = x[SFirstWritable-25]
+	_ = x[SBUILDINFO-26]
+	_ = x[SFIPSINFO-27]
+	_ = x[SELFSECT-28]
+	_ = x[SMACHO-29]
+	_ = x[SWINDOWS-30]
+	_ = x[SMODULEDATA-31]
+	_ = x[SELFGOT-32]
+	_ = x[SMACHOGOT-33]
+	_ = x[SNOPTRDATA-34]
+	_ = x[SNOPTRDATAFIPSSTART-35]
+	_ = x[SNOPTRDATAFIPS-36]
+	_ = x[SNOPTRDATAFIPSEND-37]
+	_ = x[SNOPTRDATAEND-38]
+	_ = x[SINITARR-39]
+	_ = x[SDATA-40]
+	_ = x[SDATAFIPSSTART-41]
+	_ = x[SDATAFIPS-42]
+	_ = x[SDATAFIPSEND-43]
+	_ = x[SDATAEND-44]
+	_ = x[SXCOFFTOC-45]
+	_ = x[SBSS-46]
+	_ = x[SNOPTRBSS-47]
+	_ = x[SLIBFUZZER_8BIT_COUNTER-48]
+	_ = x[SCOVERAGE_COUNTER-49]
+	_ = x[SCOVERAGE_AUXVAR-50]
+	_ = x[STLSBSS-51]
+	_ = x[SFirstUnallocated-52]
+	_ = x[SXREF-53]
+	_ = x[SMACHOSYMSTR-54]
+	_ = x[SMACHOSYMTAB-55]
+	_ = x[SMACHOINDIRECTPLT-56]
+	_ = x[SMACHOINDIRECTGOT-57]
+	_ = x[SDYNIMPORT-58]
+	_ = x[SHOSTOBJ-59]
+	_ = x[SUNDEFEXT-60]
+	_ = x[SDWARFSECT-61]
+	_ = x[SDWARFCUINFO-62]
+	_ = x[SDWARFCONST-63]
+	_ = x[SDWARFFCN-64]
+	_ = x[SDWARFABSFCN-65]
+	_ = x[SDWARFTYPE-66]
+	_ = x[SDWARFVAR-67]
+	_ = x[SDWARFRANGE-68]
+	_ = x[SDWARFLOC-69]
+	_ = x[SDWARFLINES-70]
+	_ = x[SDWARFADDR-71]
+	_ = x[SSEHUNWINDINFO-72]
+	_ = x[SSEHSECT-73]
 }
 
-const _SymKind_name = "SxxxSTEXTSTEXTFIPSSTARTSTEXTFIPSSTEXTFIPSENDSTEXTENDSELFRXSECTSMACHOPLTSSTRINGSGOSTRINGSGCBITSSRODATASRODATAFIPSSTARTSRODATAFIPSSRODATAFIPSENDSRODATAENDSFUNCTABSPCLNTABSTYPELINKSELFROSECTSRODATARELROSTYPESGOFUNCSELFRELROSECTSMACHORELROSECTSITABLINKSFirstWritableSBUILDINFOSFIPSINFOSELFSECTSMACHOSWINDOWSSMODULEDATASELFGOTSMACHOGOTSNOPTRDATASNOPTRDATAFIPSSTARTSNOPTRDATAFIPSSNOPTRDATAFIPSENDSNOPTRDATAENDSINITARRSDATASDATAFIPSSTARTSDATAFIPSSDATAFIPSENDSDATAENDSXCOFFTOCSBSSSNOPTRBSSSLIBFUZZER_8BIT_COUNTERSCOVERAGE_COUNTERSCOVERAGE_AUXVARSTLSBSSSFirstUnallocatedSXREFSMACHOSYMSTRSMACHOSYMTABSMACHOINDIRECTPLTSMACHOINDIRECTGOTSDYNIMPORTSHOSTOBJSUNDEFEXTSDWARFSECTSDWARFCUINFOSDWARFCONSTSDWARFFCNSDWARFABSFCNSDWARFTYPESDWARFVARSDWARFRANGESDWARFLOCSDWARFLINESSDWARFADDRSSEHUNWINDINFOSSEHSECT"
+const _SymKind_name = "SxxxSTEXTSTEXTFIPSSTARTSTEXTFIPSSTEXTFIPSENDSTEXTENDSELFRXSECTSMACHOPLTSSTRINGSGOSTRINGSGCBITSSRODATASRODATAFIPSSTARTSRODATAFIPSSRODATAFIPSENDSRODATAENDSPCLNTABSTYPELINKSELFROSECTSRODATARELROSTYPESGOFUNCSELFRELROSECTSMACHORELROSECTSITABLINKSFirstWritableSBUILDINFOSFIPSINFOSELFSECTSMACHOSWINDOWSSMODULEDATASELFGOTSMACHOGOTSNOPTRDATASNOPTRDATAFIPSSTARTSNOPTRDATAFIPSSNOPTRDATAFIPSENDSNOPTRDATAENDSINITARRSDATASDATAFIPSSTARTSDATAFIPSSDATAFIPSENDSDATAENDSXCOFFTOCSBSSSNOPTRBSSSLIBFUZZER_8BIT_COUNTERSCOVERAGE_COUNTERSCOVERAGE_AUXVARSTLSBSSSFirstUnallocatedSXREFSMACHOSYMSTRSMACHOSYMTABSMACHOINDIRECTPLTSMACHOINDIRECTGOTSDYNIMPORTSHOSTOBJSUNDEFEXTSDWARFSECTSDWARFCUINFOSDWARFCONSTSDWARFFCNSDWARFABSFCNSDWARFTYPESDWARFVARSDWARFRANGESDWARFLOCSDWARFLINESSDWARFADDRSSEHUNWINDINFOSSEHSECT"
 
-var _SymKind_index = [...]uint16{0, 4, 9, 23, 32, 44, 52, 62, 71, 78, 87, 94, 101, 117, 128, 142, 152, 160, 168, 177, 187, 199, 204, 211, 224, 239, 248, 262, 272, 281, 289, 295, 303, 314, 321, 330, 340, 359, 373, 390, 403, 411, 416, 430, 439, 451, 459, 468, 472, 481, 504, 521, 537, 544, 561, 566, 578, 590, 607, 624, 634, 642, 651, 661, 673, 684, 693, 705, 715, 724, 735, 744, 755, 765, 779, 787}
+var _SymKind_index = [...]uint16{0, 4, 9, 23, 32, 44, 52, 62, 71, 78, 87, 94, 101, 117, 128, 142, 152, 160, 169, 179, 191, 196, 203, 216, 231, 240, 254, 264, 273, 281, 287, 295, 306, 313, 322, 332, 351, 365, 382, 395, 403, 408, 422, 431, 443, 451, 460, 464, 473, 496, 513, 529, 536, 553, 558, 570, 582, 599, 616, 626, 634, 643, 653, 665, 676, 685, 697, 707, 716, 727, 736, 747, 757, 771, 779}
 
 func (i SymKind) String() string {
 	if i >= SymKind(len(_SymKind_index)-1) {