@@ -1133,15 +1133,15 @@ func (p *GCProg) AddSym(s *Symbol) {
1133
1133
}
1134
1134
1135
1135
ptrsize := int64 (SysArch .PtrSize )
1136
- nptr := decodetype_ptrdata (p .ctxt .Arch , typ ) / ptrsize
1136
+ nptr := decodetypePtrdata (p .ctxt .Arch , typ ) / ptrsize
1137
1137
1138
1138
if debugGCProg {
1139
1139
fmt .Fprintf (os .Stderr , "gcprog sym: %s at %d (ptr=%d+%d)\n " , s .Name , s .Value , s .Value / ptrsize , nptr )
1140
1140
}
1141
1141
1142
- if decodetype_usegcprog (typ ) == 0 {
1142
+ if decodetypeUsegcprog (typ ) == 0 {
1143
1143
// Copy pointers from mask into program.
1144
- mask := decodetype_gcmask (p .ctxt , typ )
1144
+ mask := decodetypeGcmask (p .ctxt , typ )
1145
1145
for i := int64 (0 ); i < nptr ; i ++ {
1146
1146
if (mask [i / 8 ]>> uint (i % 8 ))& 1 != 0 {
1147
1147
p .w .Ptr (s .Value / ptrsize + i )
@@ -1151,7 +1151,7 @@ func (p *GCProg) AddSym(s *Symbol) {
1151
1151
}
1152
1152
1153
1153
// Copy program.
1154
- prog := decodetype_gcprog (p .ctxt , typ )
1154
+ prog := decodetypeGcprog (p .ctxt , typ )
1155
1155
p .w .ZeroUntil (s .Value / ptrsize )
1156
1156
p .w .Append (prog [4 :], nptr )
1157
1157
}
@@ -1539,12 +1539,12 @@ func (ctxt *Link) dodata() {
1539
1539
// situation.
1540
1540
// TODO(mwhudson): It would make sense to do this more widely, but it makes
1541
1541
// the system linker segfault on darwin.
1542
- relro_perms := 04
1543
- relro_prefix := ""
1542
+ relroPerms := 04
1543
+ relroPrefix := ""
1544
1544
1545
1545
if UseRelro () {
1546
- relro_perms = 06
1547
- relro_prefix = ".data.rel.ro"
1546
+ relroPerms = 06
1547
+ relroPrefix = ".data.rel.ro"
1548
1548
/* data only written by relocations */
1549
1549
sect = addsection (segro , ".data.rel.ro" , 06 )
1550
1550
@@ -1587,7 +1587,7 @@ func (ctxt *Link) dodata() {
1587
1587
}
1588
1588
1589
1589
/* typelink */
1590
- sect = addsection (segro , relro_prefix + ".typelink" , relro_perms )
1590
+ sect = addsection (segro , relroPrefix + ".typelink" , relroPerms )
1591
1591
sect .Align = dataMaxAlign [obj .STYPELINK ]
1592
1592
datsize = Rnd (datsize , int64 (sect .Align ))
1593
1593
sect .Vaddr = uint64 (datsize )
@@ -1604,7 +1604,7 @@ func (ctxt *Link) dodata() {
1604
1604
sect .Length = uint64 (datsize ) - sect .Vaddr
1605
1605
1606
1606
/* itablink */
1607
- sect = addsection (segro , relro_prefix + ".itablink" , relro_perms )
1607
+ sect = addsection (segro , relroPrefix + ".itablink" , relroPerms )
1608
1608
sect .Align = dataMaxAlign [obj .SITABLINK ]
1609
1609
datsize = Rnd (datsize , int64 (sect .Align ))
1610
1610
sect .Vaddr = uint64 (datsize )
@@ -1621,7 +1621,7 @@ func (ctxt *Link) dodata() {
1621
1621
sect .Length = uint64 (datsize ) - sect .Vaddr
1622
1622
1623
1623
/* gosymtab */
1624
- sect = addsection (segro , relro_prefix + ".gosymtab" , relro_perms )
1624
+ sect = addsection (segro , relroPrefix + ".gosymtab" , relroPerms )
1625
1625
sect .Align = dataMaxAlign [obj .SSYMTAB ]
1626
1626
datsize = Rnd (datsize , int64 (sect .Align ))
1627
1627
sect .Vaddr = uint64 (datsize )
@@ -1638,7 +1638,7 @@ func (ctxt *Link) dodata() {
1638
1638
sect .Length = uint64 (datsize ) - sect .Vaddr
1639
1639
1640
1640
/* gopclntab */
1641
- sect = addsection (segro , relro_prefix + ".gopclntab" , relro_perms )
1641
+ sect = addsection (segro , relroPrefix + ".gopclntab" , relroPerms )
1642
1642
sect .Align = dataMaxAlign [obj .SPCLNTAB ]
1643
1643
datsize = Rnd (datsize , int64 (sect .Align ))
1644
1644
sect .Vaddr = uint64 (datsize )
@@ -1794,7 +1794,7 @@ func dodataSect(ctxt *Link, symn int, syms []*Symbol) (result []*Symbol, maxAlig
1794
1794
case obj .STYPELINK :
1795
1795
// Sort typelinks by the rtype.string field so the reflect
1796
1796
// package can binary search type links.
1797
- symsSort [i ].name = string (decodetype_str (s .R [0 ].Sym ))
1797
+ symsSort [i ].name = string (decodetypeStr (s .R [0 ].Sym ))
1798
1798
}
1799
1799
}
1800
1800
0 commit comments