Commit e32ac797 authored by Ian Lance Taylor's avatar Ian Lance Taylor

cmd/link, cmd/internal/obj: stop exporting various names

Just happened to notice that these names (funcAlign and friends) are
never referenced outside their package, so no need to export them.

Change-Id: I4bbdaa4b0ef330c3c3ef50a2ca39593977a83545
Reviewed-on: https://go-review.googlesource.com/31496
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: default avatarDavid Crawshaw <crawshaw@golang.org>
parent 832082b4
......@@ -39,7 +39,7 @@ import (
)
const (
FuncAlign = 16
funcAlign = 16
)
const (
......@@ -633,7 +633,7 @@ func span7(ctxt *obj.Link, cursym *obj.LSym) {
}
}
c += -c & (FuncAlign - 1)
c += -c & (funcAlign - 1)
cursym.Size = c
/*
......@@ -806,7 +806,7 @@ func addpool(ctxt *obj.Link, p *obj.Prog, a *obj.Addr) {
ctxt.Elitrl.Link = q
}
ctxt.Elitrl = q
pool.size = -pool.size & (FuncAlign - 1)
pool.size = -pool.size & (funcAlign - 1)
pool.size += uint32(sz)
p.Pcond = q
}
......
......@@ -39,7 +39,7 @@ import (
// Instruction layout.
const (
FuncAlign = 8
funcAlign = 8
)
const (
......@@ -418,7 +418,7 @@ func span0(ctxt *obj.Link, cursym *obj.LSym) {
cursym.Size = c
}
c += -c & (FuncAlign - 1)
c += -c & (funcAlign - 1)
cursym.Size = c
/*
......
......@@ -40,7 +40,7 @@ import (
// Instruction layout.
const (
FuncAlign = 8
funcAlign = 8
)
const (
......@@ -569,7 +569,7 @@ func span9(ctxt *obj.Link, cursym *obj.LSym) {
cursym.Size = c
}
c += -c & (FuncAlign - 1)
c += -c & (funcAlign - 1)
cursym.Size = c
/*
......
......@@ -38,7 +38,7 @@ import (
// instruction layout.
const (
FuncAlign = 16
funcAlign = 16
)
type Optab struct {
......@@ -433,8 +433,8 @@ func spanz(ctxt *obj.Link, cursym *obj.LSym) {
}
cursym.Size = int64(len(buffer))
if cursym.Size%FuncAlign != 0 {
cursym.Size += FuncAlign - (cursym.Size % FuncAlign)
if cursym.Size%funcAlign != 0 {
cursym.Size += funcAlign - (cursym.Size % funcAlign)
}
cursym.Grow(cursym.Size)
copy(cursym.P, buffer)
......
......@@ -56,7 +56,7 @@ const (
//
LoopAlign = 16
MaxLoopPad = 0
FuncAlign = 16
funcAlign = 16
)
type Optab struct {
......
......@@ -31,13 +31,13 @@
package amd64
const (
MaxAlign = 32 // max data alignment
MinAlign = 1 // min data alignment
FuncAlign = 16
maxAlign = 32 // max data alignment
minAlign = 1 // min data alignment
funcAlign = 16
)
/* Used by ../internal/ld/dwarf.go */
const (
DWARFREGSP = 7
DWARFREGLR = 16
dwarfRegSP = 7
dwarfRegLR = 16
)
......@@ -43,11 +43,11 @@ func Init() {
ld.SysArch = sys.ArchAMD64P32
}
ld.Thearch.Funcalign = FuncAlign
ld.Thearch.Maxalign = MaxAlign
ld.Thearch.Minalign = MinAlign
ld.Thearch.Dwarfregsp = DWARFREGSP
ld.Thearch.Dwarfreglr = DWARFREGLR
ld.Thearch.Funcalign = funcAlign
ld.Thearch.Maxalign = maxAlign
ld.Thearch.Minalign = minAlign
ld.Thearch.Dwarfregsp = dwarfRegSP
ld.Thearch.Dwarfreglr = dwarfRegLR
ld.Thearch.Adddynrel = adddynrel
ld.Thearch.Archinit = archinit
......
......@@ -63,13 +63,13 @@ package arm
// THE SOFTWARE.
const (
MaxAlign = 8 // max data alignment
MinAlign = 1 // min data alignment
FuncAlign = 4 // single-instruction alignment
maxAlign = 8 // max data alignment
minAlign = 1 // min data alignment
funcAlign = 4 // single-instruction alignment
)
/* Used by ../internal/ld/dwarf.go */
const (
DWARFREGSP = 13
DWARFREGLR = 14
dwarfRegSP = 13
dwarfRegLR = 14
)
......@@ -40,11 +40,11 @@ import (
func Init() {
ld.SysArch = sys.ArchARM
ld.Thearch.Funcalign = FuncAlign
ld.Thearch.Maxalign = MaxAlign
ld.Thearch.Minalign = MinAlign
ld.Thearch.Dwarfregsp = DWARFREGSP
ld.Thearch.Dwarfreglr = DWARFREGLR
ld.Thearch.Funcalign = funcAlign
ld.Thearch.Maxalign = maxAlign
ld.Thearch.Minalign = minAlign
ld.Thearch.Dwarfregsp = dwarfRegSP
ld.Thearch.Dwarfreglr = dwarfRegLR
ld.Thearch.Adddynrel = adddynrel
ld.Thearch.Archinit = archinit
......
......@@ -62,13 +62,13 @@ package arm64
// THE SOFTWARE.
const (
MaxAlign = 32 // max data alignment
MinAlign = 1 // min data alignment
FuncAlign = 8
maxAlign = 32 // max data alignment
minAlign = 1 // min data alignment
funcAlign = 8
)
/* Used by ../internal/ld/dwarf.go */
const (
DWARFREGSP = 31
DWARFREGLR = 30
dwarfRegSP = 31
dwarfRegLR = 30
)
......@@ -40,11 +40,11 @@ import (
func Init() {
ld.SysArch = sys.ArchARM64
ld.Thearch.Funcalign = FuncAlign
ld.Thearch.Maxalign = MaxAlign
ld.Thearch.Minalign = MinAlign
ld.Thearch.Dwarfregsp = DWARFREGSP
ld.Thearch.Dwarfreglr = DWARFREGLR
ld.Thearch.Funcalign = funcAlign
ld.Thearch.Maxalign = maxAlign
ld.Thearch.Minalign = minAlign
ld.Thearch.Dwarfregsp = dwarfRegSP
ld.Thearch.Dwarfreglr = dwarfRegLR
ld.Thearch.Adddynrel = adddynrel
ld.Thearch.Archinit = archinit
......
......@@ -62,13 +62,13 @@ package mips64
// THE SOFTWARE.
const (
MaxAlign = 32 // max data alignment
MinAlign = 1 // min data alignment
FuncAlign = 8
maxAlign = 32 // max data alignment
minAlign = 1 // min data alignment
funcAlign = 8
)
/* Used by ../internal/ld/dwarf.go */
const (
DWARFREGSP = 29
DWARFREGLR = 31
dwarfRegSP = 29
dwarfRegLR = 31
)
......@@ -44,11 +44,11 @@ func Init() {
ld.SysArch = sys.ArchMIPS64
}
ld.Thearch.Funcalign = FuncAlign
ld.Thearch.Maxalign = MaxAlign
ld.Thearch.Minalign = MinAlign
ld.Thearch.Dwarfregsp = DWARFREGSP
ld.Thearch.Dwarfreglr = DWARFREGLR
ld.Thearch.Funcalign = funcAlign
ld.Thearch.Maxalign = maxAlign
ld.Thearch.Minalign = minAlign
ld.Thearch.Dwarfregsp = dwarfRegSP
ld.Thearch.Dwarfreglr = dwarfRegLR
ld.Thearch.Adddynrel = adddynrel
ld.Thearch.Archinit = archinit
......
......@@ -62,13 +62,13 @@ package ppc64
// THE SOFTWARE.
const (
MaxAlign = 32 // max data alignment
MinAlign = 1 // min data alignment
FuncAlign = 8
maxAlign = 32 // max data alignment
minAlign = 1 // min data alignment
funcAlign = 8
)
/* Used by ../internal/ld/dwarf.go */
const (
DWARFREGSP = 1
DWARFREGLR = 65
dwarfRegSP = 1
dwarfRegLR = 65
)
......@@ -44,11 +44,11 @@ func Init() {
ld.SysArch = sys.ArchPPC64
}
ld.Thearch.Funcalign = FuncAlign
ld.Thearch.Maxalign = MaxAlign
ld.Thearch.Minalign = MinAlign
ld.Thearch.Dwarfregsp = DWARFREGSP
ld.Thearch.Dwarfreglr = DWARFREGLR
ld.Thearch.Funcalign = funcAlign
ld.Thearch.Maxalign = maxAlign
ld.Thearch.Minalign = minAlign
ld.Thearch.Dwarfregsp = dwarfRegSP
ld.Thearch.Dwarfreglr = dwarfRegLR
ld.Thearch.Adddynrel = adddynrel
ld.Thearch.Archinit = archinit
......
......@@ -62,13 +62,13 @@ package s390x
// THE SOFTWARE.
const (
MaxAlign = 32 // max data alignment
MinAlign = 2 // min data alignment
FuncAlign = 16
maxAlign = 32 // max data alignment
minAlign = 2 // min data alignment
funcAlign = 16
)
/* Used by ../internal/ld/dwarf.go */
const (
DWARFREGSP = 15
DWARFREGLR = 14
dwarfRegSP = 15
dwarfRegLR = 14
)
......@@ -40,11 +40,11 @@ import (
func Init() {
ld.SysArch = sys.ArchS390X
ld.Thearch.Funcalign = FuncAlign
ld.Thearch.Maxalign = MaxAlign
ld.Thearch.Minalign = MinAlign
ld.Thearch.Dwarfregsp = DWARFREGSP
ld.Thearch.Dwarfreglr = DWARFREGLR
ld.Thearch.Funcalign = funcAlign
ld.Thearch.Maxalign = maxAlign
ld.Thearch.Minalign = minAlign
ld.Thearch.Dwarfregsp = dwarfRegSP
ld.Thearch.Dwarfreglr = dwarfRegLR
ld.Thearch.Adddynrel = adddynrel
ld.Thearch.Archinit = archinit
......
......@@ -31,13 +31,13 @@
package x86
const (
MaxAlign = 32 // max data alignment
MinAlign = 1 // min data alignment
FuncAlign = 16
maxAlign = 32 // max data alignment
minAlign = 1 // min data alignment
funcAlign = 16
)
/* Used by ../internal/ld/dwarf.go */
const (
DWARFREGSP = 4
DWARFREGLR = 8
dwarfRegSP = 4
dwarfRegLR = 8
)
......@@ -40,11 +40,11 @@ import (
func Init() {
ld.SysArch = sys.Arch386
ld.Thearch.Funcalign = FuncAlign
ld.Thearch.Maxalign = MaxAlign
ld.Thearch.Minalign = MinAlign
ld.Thearch.Dwarfregsp = DWARFREGSP
ld.Thearch.Dwarfreglr = DWARFREGLR
ld.Thearch.Funcalign = funcAlign
ld.Thearch.Maxalign = maxAlign
ld.Thearch.Minalign = minAlign
ld.Thearch.Dwarfregsp = dwarfRegSP
ld.Thearch.Dwarfreglr = dwarfRegLR
ld.Thearch.Adddynrel = adddynrel
ld.Thearch.Archinit = archinit
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment