mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmd/go, runtime: define GOBUILDMODE_shared rather than shared when dynamically linking 

To avoid collisions with what existing code may already be doing.

Change-Id: Ice639440aafc0724714c25333d90a49954372230
Reviewed-on: https://go-review.googlesource.com/16503
Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
Michael Hudson-Doyle 2015-10-30 11:48:43 +13:00
parent b50b21d3e1
commit 35d71d6727
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cmd/go/build.go
View File

@ -389,7 +389,7 @@ func buildModeInit() {
} else { } else {
switch platform { switch platform {
case "linux/386", "linux/amd64", "linux/arm", "linux/arm64": case "linux/386", "linux/amd64", "linux/arm", "linux/arm64":
buildAsmflags = append(buildAsmflags, "-D=shared=1") buildAsmflags = append(buildAsmflags, "-D=GOBUILDMODE_shared=1")
default: default:
fatalf("-buildmode=shared not supported on %s\n", platform) fatalf("-buildmode=shared not supported on %s\n", platform)
} }
@ -408,7 +408,7 @@ func buildModeInit() {
} else { } else {
switch platform { switch platform {
case "linux/386", "linux/amd64", "linux/arm", "linux/arm64": case "linux/386", "linux/amd64", "linux/arm", "linux/arm64":
buildAsmflags = append(buildAsmflags, "-D=shared=1") buildAsmflags = append(buildAsmflags, "-D=GOBUILDMODE_shared=1")
default: default:
fatalf("-buildmode=shared not supported on %s\n", platform) fatalf("-buildmode=shared not supported on %s\n", platform)
} }

2
src/runtime/sys_linux_386.s
View File

@ -10,7 +10,7 @@
#include "go_tls.h" #include "go_tls.h"
#include "textflag.h" #include "textflag.h"
#ifdef shared #ifdef GOBUILDMODE_shared
#define INVOKE_SYSINFO CALL 0x10(GS) #define INVOKE_SYSINFO CALL 0x10(GS)
#else #else
#define INVOKE_SYSINFO CALL *runtime·_vdso(SB) #define INVOKE_SYSINFO CALL *runtime·_vdso(SB)