diff options
| author | Cherry Zhang <cherryyz@google.com> | 2020-10-30 18:36:41 -0400 |
|---|---|---|
| committer | Cherry Zhang <cherryyz@google.com> | 2020-11-02 03:02:35 +0000 |
| commit | fdba080220f0642b2b3926cbc062c775f6224e5d (patch) | |
| tree | a342caee006f2c505252f7cfd362722e12dce808 /src/cmd/internal/objabi | |
| parent | e463c28cc116fb1f40a4e203bddf93b6ef52c8d9 (diff) | |
| download | go-fdba080220f0642b2b3926cbc062c775f6224e5d.tar.xz | |
cmd: remove Go115AMD64
Always do aligned jumps now.
Change-Id: If68a16fe93c9173c83323a9063465c9bd166eeb8
Reviewed-on: https://go-review.googlesource.com/c/go/+/266857
Trust: Cherry Zhang <cherryyz@google.com>
Run-TryBot: Cherry Zhang <cherryyz@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: David Chase <drchase@google.com>
Diffstat (limited to 'src/cmd/internal/objabi')
| -rw-r--r-- | src/cmd/internal/objabi/util.go | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/cmd/internal/objabi/util.go b/src/cmd/internal/objabi/util.go index b81b73a022..9479ab2cd9 100644 --- a/src/cmd/internal/objabi/util.go +++ b/src/cmd/internal/objabi/util.go @@ -25,7 +25,6 @@ var ( GOARCH = envOr("GOARCH", defaultGOARCH) GOOS = envOr("GOOS", defaultGOOS) GO386 = envOr("GO386", defaultGO386) - GOAMD64 = goamd64() GOARM = goarm() GOMIPS = gomips() GOMIPS64 = gomips64() @@ -37,15 +36,9 @@ var ( const ( ElfRelocOffset = 256 - MachoRelocOffset = 2048 // reserve enough space for ELF relocations - Go115AMD64 = "alignedjumps" // Should be "alignedjumps" or "normaljumps"; this replaces environment variable introduced in CL 219357. + MachoRelocOffset = 2048 // reserve enough space for ELF relocations ) -// TODO(1.16): assuming no issues in 1.15 release, remove this and related constant. -func goamd64() string { - return Go115AMD64 -} - func goarm() int { switch v := envOr("GOARM", defaultGOARM); v { case "5": |