aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/internal/objabi
diff options
context:
space:
mode:
authorCherry Zhang <cherryyz@google.com>2020-06-11 16:49:19 -0400
committerCherry Zhang <cherryyz@google.com>2020-06-11 16:49:19 -0400
commit3187b05b87e39231202bf2a9bf89905649472b6c (patch)
tree39ee12d8d9c7b1efe1ed7782ba30874abe129162 /src/cmd/internal/objabi
parent6bf51c340666b2552b9c73c34ff1e1757d8d8489 (diff)
parentf7ba82d68f90e20aa9e6aa973cb6f12321abec71 (diff)
downloadgo-3187b05b87e39231202bf2a9bf89905649472b6c.tar.xz
[dev.link] all: merge branch 'master' into dev.link
Change-Id: I446db56b20ef2189e23e225a91a17736c1d11e4c
Diffstat (limited to 'src/cmd/internal/objabi')
-rw-r--r--src/cmd/internal/objabi/util.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cmd/internal/objabi/util.go b/src/cmd/internal/objabi/util.go
index 2f94ec6a67..f7873a42b9 100644
--- a/src/cmd/internal/objabi/util.go
+++ b/src/cmd/internal/objabi/util.go
@@ -134,7 +134,7 @@ func init() {
}
func Framepointer_enabled(goos, goarch string) bool {
- return framepointer_enabled != 0 && (goarch == "amd64" || goarch == "arm64" && goos == "linux")
+ return framepointer_enabled != 0 && (goarch == "amd64" || goarch == "arm64" && (goos == "linux" || goos == "darwin"))
}
func addexp(s string) {