Skip to content

Commit c311488

Browse files
josharianjosharian
committed
cmd/internal/obj: remove Linklookup
It was simply a wrapper around Link.Lookup. Unwrap everything. CL prepared using eg with template: package p import "cmd/internal/obj" func before(ctxt *obj.Link, name string, version int) *obj.LSym { return obj.Linklookup(ctxt, name, version) } func after(ctxt *obj.Link, name string, version int) *obj.LSym { return ctxt.Lookup(name, version) } Then one comment in cmd/asm/internal/asm/parse.go was manually updated (and gofmt'ed!), and func Linklookup deleted. Passes toolstash-check (as a sanity measure). Change-Id: Icc4d56b0b2b5c8888d3184c1898c48359ea1e638 Reviewed-on: https://go-review.googlesource.com/39715 Run-TryBot: Josh Bleecher Snyder <josharian@gmail.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
1 parent 2c1888b commit c311488

File tree

18 files changed

+75
-79
lines changed

18 files changed

+75
-79
lines changed

‎src/cmd/asm/internal/asm/parse.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ func (p *Parser) registerShift(name string, prefix rune) int64 {
541541
switch tok.ScanToken {
542542
case scanner.Ident:
543543
if p.arch.Family == sys.ARM64 {
544-
p.errorf("rhs of shift must be integer: %s", str)
544+
p.errorf("rhs of shift must be integer: %s", str)
545545
} else {
546546
r2, ok := p.registerReference(str)
547547
if !ok {
@@ -567,7 +567,7 @@ func (p *Parser) registerShift(name string, prefix rune) int64 {
567567
p.errorf("unexpected %s in register shift", tok.String())
568568
}
569569
if p.arch.Family == sys.ARM64 {
570-
return int64(int64(r1 & 31)<<16 | int64(op)<<22 | int64(uint16(count)))
570+
return int64(int64(r1&31)<<16 | int64(op)<<22 | int64(uint16(count)))
571571
} else {
572572
return int64((r1 & 15) | op<<5 | count)
573573
}
@@ -585,7 +585,7 @@ func (p *Parser) symbolReference(a *obj.Addr, name string, prefix rune) {
585585
a.Type = obj.TYPE_INDIR
586586
}
587587
// Weirdness with statics: Might now have "<>".
588-
isStatic := 0 // TODO: Really a boolean, but Linklookup wants a "version" integer.
588+
isStatic := 0 // TODO: Really a boolean, but ctxt.Lookup wants a "version" integer.
589589
if p.peek() == '<' {
590590
isStatic = 1
591591
p.next()
@@ -594,7 +594,7 @@ func (p *Parser) symbolReference(a *obj.Addr, name string, prefix rune) {
594594
if p.peek() == '+' || p.peek() == '-' {
595595
a.Offset = int64(p.expr())
596596
}
597-
a.Sym = obj.Linklookup(p.ctxt, name, isStatic)
597+
a.Sym = p.ctxt.Lookup(name, isStatic)
598598
if p.peek() == scanner.EOF {
599599
if prefix == 0 && p.isJump {
600600
// Symbols without prefix or suffix are jump labels.

‎src/cmd/compile/internal/gc/obj.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ func Linksym(s *Sym) *obj.LSym {
242242
name = s.Pkg.Prefix + "." + s.Name
243243
}
244244

245-
ls := obj.Linklookup(Ctxt, name, 0)
245+
ls := Ctxt.Lookup(name, 0)
246246
s.Lsym = ls
247247
return ls
248248
}
@@ -302,7 +302,7 @@ func stringsym(s string) (data *obj.LSym) {
302302
const prefix = "go.string."
303303
symdataname := prefix + symname
304304

305-
symdata := obj.Linklookup(Ctxt, symdataname, 0)
305+
symdata := Ctxt.Lookup(symdataname, 0)
306306

307307
if !symdata.SeenGlobl() {
308308
// string data

‎src/cmd/compile/internal/gc/pgen.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ func debuginfo(fnsym *obj.LSym, curfn interface{}) []*dwarf.Var {
352352

353353
gotype := Linksym(ngotype(n))
354354
fnsym.Autom = append(fnsym.Autom, &obj.Auto{
355-
Asym: obj.Linklookup(Ctxt, n.Sym.Name, 0),
355+
Asym: Ctxt.Lookup(n.Sym.Name, 0),
356356
Aoffset: int32(n.Xoffset),
357357
Name: name,
358358
Gotype: gotype,
@@ -367,7 +367,7 @@ func debuginfo(fnsym *obj.LSym, curfn interface{}) []*dwarf.Var {
367367
Name: n.Sym.Name,
368368
Abbrev: abbrev,
369369
Offset: int32(offs),
370-
Type: obj.Linklookup(Ctxt, typename, 0),
370+
Type: Ctxt.Lookup(typename, 0),
371371
})
372372
}
373373

‎src/cmd/compile/internal/gc/reflect.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ func dimportpath(p *Pkg) {
454454
str = p.Path
455455
}
456456

457-
s := obj.Linklookup(Ctxt, "type..importpath."+p.Prefix+".", 0)
457+
s := Ctxt.Lookup("type..importpath."+p.Prefix+".", 0)
458458
ot := dnameData(s, 0, str, "", nil, false)
459459
ggloblLSym(s, int32(ot), obj.DUPOK|obj.RODATA)
460460
p.Pathsym = s
@@ -475,7 +475,7 @@ func dgopkgpathLSym(s *obj.LSym, ot int, pkg *Pkg) int {
475475
// type..importpath.""., which the linker will rewrite using the correct import path.
476476
// Every package that imports this one directly defines the symbol.
477477
// See also https://groups.google.com/forum/#!topic/golang-dev/myb9s53HxGQ.
478-
ns := obj.Linklookup(Ctxt, `type..importpath."".`, 0)
478+
ns := Ctxt.Lookup(`type..importpath."".`, 0)
479479
return dsymptrLSym(s, ot, ns, 0)
480480
}
481481

@@ -494,7 +494,7 @@ func dgopkgpathOffLSym(s *obj.LSym, ot int, pkg *Pkg) int {
494494
// type..importpath.""., which the linker will rewrite using the correct import path.
495495
// Every package that imports this one directly defines the symbol.
496496
// See also https://groups.google.com/forum/#!topic/golang-dev/myb9s53HxGQ.
497-
ns := obj.Linklookup(Ctxt, `type..importpath."".`, 0)
497+
ns := Ctxt.Lookup(`type..importpath."".`, 0)
498498
return dsymptrOffLSym(s, ot, ns, 0)
499499
}
500500

@@ -598,7 +598,7 @@ func dname(name, tag string, pkg *Pkg, exported bool) *obj.LSym {
598598
sname = fmt.Sprintf(`%s"".%d`, sname, dnameCount)
599599
dnameCount++
600600
}
601-
s := obj.Linklookup(Ctxt, sname, 0)
601+
s := Ctxt.Lookup(sname, 0)
602602
if len(s.P) > 0 {
603603
return s
604604
}
@@ -1466,7 +1466,7 @@ func dumptypestructs() {
14661466
// process ptabs
14671467
if localpkg.Name == "main" && len(ptabs) > 0 {
14681468
ot := 0
1469-
s := obj.Linklookup(Ctxt, "go.plugin.tabs", 0)
1469+
s := Ctxt.Lookup("go.plugin.tabs", 0)
14701470
for _, p := range ptabs {
14711471
// Dump ptab symbol into go.pluginsym package.
14721472
//
@@ -1481,7 +1481,7 @@ func dumptypestructs() {
14811481
ggloblLSym(s, int32(ot), int16(obj.RODATA))
14821482

14831483
ot = 0
1484-
s = obj.Linklookup(Ctxt, "go.plugin.exports", 0)
1484+
s = Ctxt.Lookup("go.plugin.exports", 0)
14851485
for _, p := range ptabs {
14861486
ot = dsymptrLSym(s, ot, Linksym(p.s), 0)
14871487
}

‎src/cmd/compile/internal/ssa/export_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func (DummyFrontend) Line(_ src.XPos) string {
114114
func (DummyFrontend) AllocFrame(f *Func) {
115115
}
116116
func (d DummyFrontend) Syslook(s string) *obj.LSym {
117-
return obj.Linklookup(d.ctxt, s, 0)
117+
return d.ctxt.Lookup(s, 0)
118118
}
119119
func (DummyFrontend) UseWriteBarrier() bool {
120120
return true // only writebarrier_test cares

‎src/cmd/compile/internal/x86/ssa.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ func ssaGenValue(s *gc.SSAGenState, v *ssa.Value) {
452452
p := s.Prog(x86.ALEAL)
453453
p.From.Type = obj.TYPE_MEM
454454
p.From.Name = obj.NAME_EXTERN
455-
p.From.Sym = obj.Linklookup(gc.Ctxt, literal, 0)
455+
p.From.Sym = gc.Ctxt.Lookup(literal, 0)
456456
p.From.Sym.Set(obj.AttrLocal, true)
457457
p.To.Type = obj.TYPE_REG
458458
p.To.Reg = v.Reg()

‎src/cmd/internal/obj/arm/asm5.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ func asmoutnacl(ctxt *obj.Link, newprog obj.ProgAlloc, origPC int32, p *obj.Prog
337337
// align the last instruction (the actual BL) to the last instruction in a bundle
338338
if p.As == ABL {
339339
if deferreturn == nil {
340-
deferreturn = obj.Linklookup(ctxt, "runtime.deferreturn", 0)
340+
deferreturn = ctxt.Lookup("runtime.deferreturn", 0)
341341
}
342342
if p.To.Sym == deferreturn {
343343
p.Pc = ((int64(origPC) + 15) &^ 15) + 16 - int64(size)

‎src/cmd/internal/obj/arm/obj5.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func progedit(ctxt *obj.Link, p *obj.Prog, newprog obj.ProgAlloc) {
6868
if obj.GOARM < 7 {
6969
// Replace it with BL runtime.read_tls_fallback(SB) for ARM CPUs that lack the tls extension.
7070
if progedit_tlsfallback == nil {
71-
progedit_tlsfallback = obj.Linklookup(ctxt, "runtime.read_tls_fallback", 0)
71+
progedit_tlsfallback = ctxt.Lookup("runtime.read_tls_fallback", 0)
7272
}
7373

7474
// MOVW LR, R11
@@ -110,7 +110,7 @@ func progedit(ctxt *obj.Link, p *obj.Prog, newprog obj.ProgAlloc) {
110110
f32 := float32(p.From.Val.(float64))
111111
i32 := math.Float32bits(f32)
112112
literal := fmt.Sprintf("$f32.%08x", i32)
113-
s := obj.Linklookup(ctxt, literal, 0)
113+
s := ctxt.Lookup(literal, 0)
114114
p.From.Type = obj.TYPE_MEM
115115
p.From.Sym = s
116116
p.From.Name = obj.NAME_EXTERN
@@ -121,7 +121,7 @@ func progedit(ctxt *obj.Link, p *obj.Prog, newprog obj.ProgAlloc) {
121121
if p.From.Type == obj.TYPE_FCONST && chipfloat5(ctxt, p.From.Val.(float64)) < 0 && (chipzero5(ctxt, p.From.Val.(float64)) < 0 || p.Scond&C_SCOND != C_SCOND_NONE) {
122122
i64 := math.Float64bits(p.From.Val.(float64))
123123
literal := fmt.Sprintf("$f64.%016x", i64)
124-
s := obj.Linklookup(ctxt, literal, 0)
124+
s := ctxt.Lookup(literal, 0)
125125
p.From.Type = obj.TYPE_MEM
126126
p.From.Sym = s
127127
p.From.Name = obj.NAME_EXTERN
@@ -144,9 +144,9 @@ func rewriteToUseGot(ctxt *obj.Link, p *obj.Prog, newprog obj.ProgAlloc) {
144144
// CALL (R9)
145145
var sym *obj.LSym
146146
if p.As == obj.ADUFFZERO {
147-
sym = obj.Linklookup(ctxt, "runtime.duffzero", 0)
147+
sym = ctxt.Lookup("runtime.duffzero", 0)
148148
} else {
149-
sym = obj.Linklookup(ctxt, "runtime.duffcopy", 0)
149+
sym = ctxt.Lookup("runtime.duffcopy", 0)
150150
}
151151
offset := p.To.Offset
152152
p.As = AMOVW
@@ -650,7 +650,7 @@ func softfloat(ctxt *obj.Link, newprog obj.ProgAlloc, cursym *obj.LSym) {
650650
return
651651
}
652652

653-
symsfloat := obj.Linklookup(ctxt, "_sfloat", 0)
653+
symsfloat := ctxt.Lookup("_sfloat", 0)
654654

655655
wasfloat := 0
656656
for p := cursym.Text; p != nil; p = p.Link {
@@ -859,7 +859,7 @@ func stacksplit(ctxt *obj.Link, p *obj.Prog, newprog obj.ProgAlloc, framesize in
859859
case ctxt.Cursym.Text.From3.Offset&obj.NEEDCTXT == 0:
860860
morestack = "runtime.morestack_noctxt"
861861
}
862-
call.To.Sym = obj.Linklookup(ctxt, morestack, 0)
862+
call.To.Sym = ctxt.Lookup(morestack, 0)
863863

864864
// B start
865865
b := obj.Appendp(call, newprog)
@@ -875,10 +875,10 @@ func initdiv(ctxt *obj.Link) {
875875
if ctxt.Sym_div != nil {
876876
return
877877
}
878-
ctxt.Sym_div = obj.Linklookup(ctxt, "_div", 0)
879-
ctxt.Sym_divu = obj.Linklookup(ctxt, "_divu", 0)
880-
ctxt.Sym_mod = obj.Linklookup(ctxt, "_mod", 0)
881-
ctxt.Sym_modu = obj.Linklookup(ctxt, "_modu", 0)
878+
ctxt.Sym_div = ctxt.Lookup("_div", 0)
879+
ctxt.Sym_divu = ctxt.Lookup("_divu", 0)
880+
ctxt.Sym_mod = ctxt.Lookup("_mod", 0)
881+
ctxt.Sym_modu = ctxt.Lookup("_modu", 0)
882882
}
883883

884884
var unaryDst = map[obj.As]bool{

‎src/cmd/internal/obj/arm64/obj7.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ func stacksplit(ctxt *obj.Link, p *obj.Prog, newprog obj.ProgAlloc, framesize in
208208
case ctxt.Cursym.Text.From3.Offset&obj.NEEDCTXT == 0:
209209
morestack = "runtime.morestack_noctxt"
210210
}
211-
call.To.Sym = obj.Linklookup(ctxt, morestack, 0)
211+
call.To.Sym = ctxt.Lookup(morestack, 0)
212212

213213
// B start
214214
jmp := obj.Appendp(call, newprog)
@@ -266,7 +266,7 @@ func progedit(ctxt *obj.Link, p *obj.Prog, newprog obj.ProgAlloc) {
266266
break
267267
}
268268
literal := fmt.Sprintf("$f32.%08x", i32)
269-
s := obj.Linklookup(ctxt, literal, 0)
269+
s := ctxt.Lookup(literal, 0)
270270
s.Size = 4
271271
p.From.Type = obj.TYPE_MEM
272272
p.From.Sym = s
@@ -284,7 +284,7 @@ func progedit(ctxt *obj.Link, p *obj.Prog, newprog obj.ProgAlloc) {
284284
break
285285
}
286286
literal := fmt.Sprintf("$f64.%016x", i64)
287-
s := obj.Linklookup(ctxt, literal, 0)
287+
s := ctxt.Lookup(literal, 0)
288288
s.Size = 8
289289
p.From.Type = obj.TYPE_MEM
290290
p.From.Sym = s
@@ -340,9 +340,9 @@ func rewriteToUseGot(ctxt *obj.Link, p *obj.Prog, newprog obj.ProgAlloc) {
340340
// CALL REGTMP
341341
var sym *obj.LSym
342342
if p.As == obj.ADUFFZERO {
343-
sym = obj.Linklookup(ctxt, "runtime.duffzero", 0)
343+
sym = ctxt.Lookup("runtime.duffzero", 0)
344344
} else {
345-
sym = obj.Linklookup(ctxt, "runtime.duffcopy", 0)
345+
sym = ctxt.Lookup("runtime.duffcopy", 0)
346346
}
347347
offset := p.To.Offset
348348
p.As = AMOVD

‎src/cmd/internal/obj/mips/obj0.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func progedit(ctxt *obj.Link, p *obj.Prog, newprog obj.ProgAlloc) {
6666
break
6767
}
6868
literal := fmt.Sprintf("$f32.%08x", i32)
69-
s := obj.Linklookup(ctxt, literal, 0)
69+
s := ctxt.Lookup(literal, 0)
7070
s.Size = 4
7171
p.From.Type = obj.TYPE_MEM
7272
p.From.Sym = s
@@ -84,7 +84,7 @@ func progedit(ctxt *obj.Link, p *obj.Prog, newprog obj.ProgAlloc) {
8484
break
8585
}
8686
literal := fmt.Sprintf("$f64.%016x", i64)
87-
s := obj.Linklookup(ctxt, literal, 0)
87+
s := ctxt.Lookup(literal, 0)
8888
s.Size = 8
8989
p.From.Type = obj.TYPE_MEM
9090
p.From.Sym = s
@@ -96,7 +96,7 @@ func progedit(ctxt *obj.Link, p *obj.Prog, newprog obj.ProgAlloc) {
9696
case AMOVV:
9797
if p.From.Type == obj.TYPE_CONST && p.From.Name == obj.NAME_NONE && p.From.Reg == 0 && int64(int32(p.From.Offset)) != p.From.Offset {
9898
literal := fmt.Sprintf("$i64.%016x", uint64(p.From.Offset))
99-
s := obj.Linklookup(ctxt, literal, 0)
99+
s := ctxt.Lookup(literal, 0)
100100
s.Size = 8
101101
p.From.Type = obj.TYPE_MEM
102102
p.From.Sym = s
@@ -769,11 +769,11 @@ func stacksplit(ctxt *obj.Link, p *obj.Prog, newprog obj.ProgAlloc, framesize in
769769
p.As = AJAL
770770
p.To.Type = obj.TYPE_BRANCH
771771
if ctxt.Cursym.CFunc() {
772-
p.To.Sym = obj.Linklookup(ctxt, "runtime.morestackc", 0)
772+
p.To.Sym = ctxt.Lookup("runtime.morestackc", 0)
773773
} else if ctxt.Cursym.Text.From3.Offset&obj.NEEDCTXT == 0 {
774-
p.To.Sym = obj.Linklookup(ctxt, "runtime.morestack_noctxt", 0)
774+
p.To.Sym = ctxt.Lookup("runtime.morestack_noctxt", 0)
775775
} else {
776-
p.To.Sym = obj.Linklookup(ctxt, "runtime.morestack", 0)
776+
p.To.Sym = ctxt.Lookup("runtime.morestack", 0)
777777
}
778778
p.Mark |= BRANCH
779779

‎src/cmd/internal/obj/objfile.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -299,13 +299,13 @@ func (w *objWriter) writeRefs(s *LSym) {
299299
w.writeRef(d, false)
300300
}
301301
for _, f := range pc.File {
302-
fsym := Linklookup(w.ctxt, f, 0)
302+
fsym := w.ctxt.Lookup(f, 0)
303303
w.writeRef(fsym, true)
304304
}
305305
for _, call := range pc.InlTree.nodes {
306306
w.writeRef(call.Func, false)
307307
f, _ := linkgetlineFromPos(w.ctxt, call.Pos)
308-
fsym := Linklookup(w.ctxt, f, 0)
308+
fsym := w.ctxt.Lookup(f, 0)
309309
w.writeRef(fsym, true)
310310
}
311311
}
@@ -469,14 +469,14 @@ func (w *objWriter) writeSym(s *LSym) {
469469
}
470470
w.writeInt(int64(len(pc.File)))
471471
for _, f := range pc.File {
472-
fsym := Linklookup(ctxt, f, 0)
472+
fsym := ctxt.Lookup(f, 0)
473473
w.writeRefIndex(fsym)
474474
}
475475
w.writeInt(int64(len(pc.InlTree.nodes)))
476476
for _, call := range pc.InlTree.nodes {
477477
w.writeInt(int64(call.Parent))
478478
f, l := linkgetlineFromPos(w.ctxt, call.Pos)
479-
fsym := Linklookup(ctxt, f, 0)
479+
fsym := ctxt.Lookup(f, 0)
480480
w.writeRefIndex(fsym)
481481
w.writeInt(int64(l))
482482
w.writeRefIndex(call.Func)
@@ -558,7 +558,7 @@ func (c dwCtxt) AddSectionOffset(s dwarf.Sym, size int, t interface{}, ofs int64
558558
// makeFuncDebugEntry makes a DWARF Debugging Information Entry
559559
// for TEXT symbol s.
560560
func makeFuncDebugEntry(ctxt *Link, curfn interface{}, s *LSym) {
561-
dsym := Linklookup(ctxt, dwarf.InfoPrefix+s.Name, int(s.Version))
561+
dsym := ctxt.Lookup(dwarf.InfoPrefix+s.Name, int(s.Version))
562562
if dsym.Size != 0 {
563563
return
564564
}

‎src/cmd/internal/obj/plist.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func Flushplist(ctxt *Link, plist *Plist, newprog ProgAlloc) {
8282
if p.From.Type != TYPE_CONST || p.From.Offset != FUNCDATA_ArgsPointerMaps {
8383
ctxt.Diag("FUNCDATA use of go_args_stackmap(SB) without FUNCDATA_ArgsPointerMaps")
8484
}
85-
p.To.Sym = Linklookup(ctxt, fmt.Sprintf("%s.args_stackmap", curtext.Name), int(curtext.Version))
85+
p.To.Sym = ctxt.Lookup(fmt.Sprintf("%s.args_stackmap", curtext.Name), int(curtext.Version))
8686
}
8787

8888
}
@@ -119,7 +119,7 @@ func Flushplist(ctxt *Link, plist *Plist, newprog ProgAlloc) {
119119
p.From.Offset = FUNCDATA_ArgsPointerMaps
120120
p.To.Type = TYPE_MEM
121121
p.To.Name = NAME_EXTERN
122-
p.To.Sym = Linklookup(ctxt, fmt.Sprintf("%s.args_stackmap", s.Name), int(s.Version))
122+
p.To.Sym = ctxt.Lookup(fmt.Sprintf("%s.args_stackmap", s.Name), int(s.Version))
123123
}
124124
}
125125

‎src/cmd/internal/obj/ppc64/asm9.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2244,7 +2244,7 @@ func asmout(ctxt *obj.Link, p *obj.Prog, o *Optab, out []uint32) {
22442244
// that knows the name of the tls variable. Possibly
22452245
// we could add some assembly syntax so that the name
22462246
// of the variable does not have to be assumed.
2247-
rel.Sym = obj.Linklookup(ctxt, "runtime.tls_g", 0)
2247+
rel.Sym = ctxt.Lookup("runtime.tls_g", 0)
22482248
rel.Type = obj.R_POWER_TLS
22492249
}
22502250
o1 = AOP_RRR(opstorex(ctxt, p.As), uint32(p.From.Reg), uint32(p.To.Index), uint32(r))
@@ -2270,7 +2270,7 @@ func asmout(ctxt *obj.Link, p *obj.Prog, o *Optab, out []uint32) {
22702270
rel := obj.Addrel(ctxt.Cursym)
22712271
rel.Off = int32(ctxt.Pc)
22722272
rel.Siz = 4
2273-
rel.Sym = obj.Linklookup(ctxt, "runtime.tls_g", 0)
2273+
rel.Sym = ctxt.Lookup("runtime.tls_g", 0)
22742274
rel.Type = obj.R_POWER_TLS
22752275
}
22762276
o1 = AOP_RRR(oploadx(ctxt, p.As), uint32(p.To.Reg), uint32(p.From.Index), uint32(r))

0 commit comments

Comments
 (0)