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: David Crawshaw <crawshaw@golang.org>

diff --git a/src/cmd/internal/obj/arm64/asm7.go b/src/cmd/internal/obj/arm64/asm7.go
index 89c737291cad1909e0e87b303171c072ae905602..523055b6f3a48dfea2a766938b2bf8a3e5fe2459 100644 (file)
--- a/src/cmd/internal/obj/arm64/asm7.go
+++ b/src/cmd/internal/obj/arm64/asm7.go
@@ -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
 }

diff --git a/src/cmd/internal/obj/mips/asm0.go b/src/cmd/internal/obj/mips/asm0.go
index 81e8d5ba631c002e40ced37111ddca2c69a5e3da..bac4a709002d1ad07e9a1625afa0bfd5ae6f9641 100644 (file)
--- a/src/cmd/internal/obj/mips/asm0.go
+++ b/src/cmd/internal/obj/mips/asm0.go
@@ -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
 
        /*

diff --git a/src/cmd/internal/obj/ppc64/asm9.go b/src/cmd/internal/obj/ppc64/asm9.go
index 7c9d83a7d1b587e6df7b895c52f8c5f58f9acffd..0b3e667f605ad6c617168983cfd8320f6ad99d5f 100644 (file)
--- a/src/cmd/internal/obj/ppc64/asm9.go
+++ b/src/cmd/internal/obj/ppc64/asm9.go
@@ -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
 
        /*

diff --git a/src/cmd/internal/obj/s390x/asmz.go b/src/cmd/internal/obj/s390x/asmz.go
index 1e4baf8bdc3d38058e98c7a56a6f1f2d13c27ac7..270670474b759f9115b627e7636b9b55f28f3153 100644 (file)
--- a/src/cmd/internal/obj/s390x/asmz.go
+++ b/src/cmd/internal/obj/s390x/asmz.go
@@ -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)

diff --git a/src/cmd/internal/obj/x86/asm6.go b/src/cmd/internal/obj/x86/asm6.go
index 7efc30e03c2381e974d17db7f336b55e51023768..f7fa9a2edc773d49f8b52ed2e5331ee1aa4f4afa 100644 (file)
--- a/src/cmd/internal/obj/x86/asm6.go
+++ b/src/cmd/internal/obj/x86/asm6.go
@@ -56,7 +56,7 @@ const (
        //
        LoopAlign  = 16
        MaxLoopPad = 0
-       FuncAlign  = 16
+       funcAlign  = 16
 )
 
 type Optab struct {

diff --git a/src/cmd/link/internal/amd64/l.go b/src/cmd/link/internal/amd64/l.go
index 2024f162be2e81d40bdd2b6bcd0079721327699f..393da6bf28485da685fd438a0d9b68a134910603 100644 (file)
--- a/src/cmd/link/internal/amd64/l.go
+++ b/src/cmd/link/internal/amd64/l.go
@@ -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
 )

diff --git a/src/cmd/link/internal/amd64/obj.go b/src/cmd/link/internal/amd64/obj.go
index 729b4371e0cfc76339c6ddf6c239e616845e4017..1b1f4ac771aea12ba91698cfcc205f1cb1865b70 100644 (file)
--- a/src/cmd/link/internal/amd64/obj.go
+++ b/src/cmd/link/internal/amd64/obj.go
@@ -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

diff --git a/src/cmd/link/internal/arm/l.go b/src/cmd/link/internal/arm/l.go
index 91718de54501160eaed210998eabd106e66fee4a..a83d26bf063cfd175f9aa34fd59c93b67ac609b7 100644 (file)
--- a/src/cmd/link/internal/arm/l.go
+++ b/src/cmd/link/internal/arm/l.go
@@ -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
 )

diff --git a/src/cmd/link/internal/arm/obj.go b/src/cmd/link/internal/arm/obj.go
index 775203d4ebe5600680f202577c19844fe2d6eb87..4feaa096a796a84b7c0004120ee275bda286822b 100644 (file)
--- a/src/cmd/link/internal/arm/obj.go
+++ b/src/cmd/link/internal/arm/obj.go
@@ -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

diff --git a/src/cmd/link/internal/arm64/l.go b/src/cmd/link/internal/arm64/l.go
index b0ece1670f1ad3b00acd9892ee4fa8586ebb5d9c..50b88e479fbc20eaa63e33d50cbf5fd81ea32d77 100644 (file)
--- a/src/cmd/link/internal/arm64/l.go
+++ b/src/cmd/link/internal/arm64/l.go
@@ -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
 )

diff --git a/src/cmd/link/internal/arm64/obj.go b/src/cmd/link/internal/arm64/obj.go
index c8d12f2aef1c5050acf2caa6ef5aa0e7ed50f973..7d49163e90dde80d019aaad083917f907e9bad2f 100644 (file)
--- a/src/cmd/link/internal/arm64/obj.go
+++ b/src/cmd/link/internal/arm64/obj.go
@@ -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

diff --git a/src/cmd/link/internal/mips64/l.go b/src/cmd/link/internal/mips64/l.go
index edf7170363578ab6addd6de39ef526784c623415..d794122f0b1e75574be15a251ac7d8f6dd979ac6 100644 (file)
--- a/src/cmd/link/internal/mips64/l.go
+++ b/src/cmd/link/internal/mips64/l.go
@@ -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
 )

diff --git a/src/cmd/link/internal/mips64/obj.go b/src/cmd/link/internal/mips64/obj.go
index 564a10ab517b25c075eced53b929898a976894d7..b79cd9df4fe7ff52f4b77a2849af4ebcfa8c36f1 100644 (file)
--- a/src/cmd/link/internal/mips64/obj.go
+++ b/src/cmd/link/internal/mips64/obj.go
@@ -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

diff --git a/src/cmd/link/internal/ppc64/l.go b/src/cmd/link/internal/ppc64/l.go
index 64b05e035c6155dac8ea0a6de1317afab71353e3..f7ae33dd25abdb5bfb507e0c93709ab0d83d2567 100644 (file)
--- a/src/cmd/link/internal/ppc64/l.go
+++ b/src/cmd/link/internal/ppc64/l.go
@@ -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
 )

diff --git a/src/cmd/link/internal/ppc64/obj.go b/src/cmd/link/internal/ppc64/obj.go
index 92cb1e8ebe54ce0994c07d9e6ea5322283661a26..6eff2f416df81816ed93e9a73774e3dd049466d0 100644 (file)
--- a/src/cmd/link/internal/ppc64/obj.go
+++ b/src/cmd/link/internal/ppc64/obj.go
@@ -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

diff --git a/src/cmd/link/internal/s390x/l.go b/src/cmd/link/internal/s390x/l.go
index 401dbbad4ac31b6243861a23f826728c7cd9bba3..87d10ee7828ddaa61171222eebeabb2adf4b93bf 100644 (file)
--- a/src/cmd/link/internal/s390x/l.go
+++ b/src/cmd/link/internal/s390x/l.go
@@ -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
 )

diff --git a/src/cmd/link/internal/s390x/obj.go b/src/cmd/link/internal/s390x/obj.go
index 6c1e1939548611d30ef4b129594544b2c129110f..eea8978080e0ff69bf7caed9de92d80c33fc6508 100644 (file)
--- a/src/cmd/link/internal/s390x/obj.go
+++ b/src/cmd/link/internal/s390x/obj.go
@@ -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

diff --git a/src/cmd/link/internal/x86/l.go b/src/cmd/link/internal/x86/l.go
index 80df96bece32ba40fe5be989e1a6d14d6dfd3e3b..0f104eab57b3674d559716cbf1d07a54d51947f2 100644 (file)
--- a/src/cmd/link/internal/x86/l.go
+++ b/src/cmd/link/internal/x86/l.go
@@ -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
 )

diff --git a/src/cmd/link/internal/x86/obj.go b/src/cmd/link/internal/x86/obj.go
index f35114f3b2ef9e67803493684df24656e07de5aa..ea213be7c7b57dc5a2872bbbf8604ff7b5560468 100644 (file)
--- a/src/cmd/link/internal/x86/obj.go
+++ b/src/cmd/link/internal/x86/obj.go
@@ -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