diff options
| author | Brad Fitzpatrick <bradfitz@golang.org> | 2019-10-09 16:22:47 +0000 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2019-10-09 22:34:34 +0000 |
| commit | 07b4abd62e450f19c47266b3a526df49c01ba425 (patch) | |
| tree | f36075bd2f2c2149744ca1bd2fb22fecf742fd87 /src/reflect | |
| parent | 19a7490e568824302b271f6e27dde3f1cd92ffc7 (diff) | |
| download | go-07b4abd62e450f19c47266b3a526df49c01ba425.tar.gz go-07b4abd62e450f19c47266b3a526df49c01ba425.zip | |
all: remove the nacl port (part 2, amd64p32 + toolchain)
This is part two if the nacl removal. Part 1 was CL 199499.
This CL removes amd64p32 support, which might be useful in the future
if we implement the x32 ABI. It also removes the nacl bits in the
toolchain, and some remaining nacl bits.
Updates #30439
Change-Id: I2475d5bb066d1b474e00e40d95b520e7c2e286e1
Reviewed-on: https://go-review.googlesource.com/c/go/+/200077
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/reflect')
| -rw-r--r-- | src/reflect/asm_amd64p32.s | 36 | ||||
| -rw-r--r-- | src/reflect/type.go | 5 |
2 files changed, 0 insertions, 41 deletions
diff --git a/src/reflect/asm_amd64p32.s b/src/reflect/asm_amd64p32.s deleted file mode 100644 index e79beb6dc9..0000000000 --- a/src/reflect/asm_amd64p32.s +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright 2012 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -#include "textflag.h" -#include "funcdata.h" - -// makeFuncStub is the code half of the function returned by MakeFunc. -// See the comment on the declaration of makeFuncStub in makefunc.go -// for more details. -// No argsize here, gc generates argsize info at call site. -TEXT ·makeFuncStub(SB),(NOSPLIT|WRAPPER),$16 - NO_LOCAL_POINTERS - MOVL DX, 0(SP) - LEAL argframe+0(FP), CX - MOVL CX, 4(SP) - MOVB $0, 12(SP) - LEAL 12(SP), AX - MOVL AX, 8(SP) - CALL ·callReflect(SB) - RET - -// methodValueCall is the code half of the function returned by makeMethodValue. -// See the comment on the declaration of methodValueCall in makefunc.go -// for more details. -// No argsize here, gc generates argsize info at call site. -TEXT ·methodValueCall(SB),(NOSPLIT|WRAPPER),$16 - NO_LOCAL_POINTERS - MOVL DX, 0(SP) - LEAL argframe+0(FP), CX - MOVL CX, 4(SP) - MOVB $0, 12(SP) - LEAL 12(SP), AX - MOVL AX, 8(SP) - CALL ·callMethod(SB) - RET diff --git a/src/reflect/type.go b/src/reflect/type.go index f1f8ba93a4..495679b52e 100644 --- a/src/reflect/type.go +++ b/src/reflect/type.go @@ -2168,11 +2168,6 @@ func bucketOf(ktyp, etyp *rtype) *rtype { var ptrdata uintptr var overflowPad uintptr - // On NaCl, pad if needed to make overflow end at the proper struct alignment. - // On other systems, align > ptrSize is not possible. - if runtime.GOARCH == "amd64p32" && (ktyp.align > ptrSize || etyp.align > ptrSize) { - overflowPad = ptrSize - } size := bucketSize*(1+ktyp.size+etyp.size) + overflowPad + ptrSize if size&uintptr(ktyp.align-1) != 0 || size&uintptr(etyp.align-1) != 0 { panic("reflect: bad size computation in MapOf") |