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>

diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go
index b1c95220ccc660eb193cb6321cefc622a957cd40..3ee5b59f18aa94d9cf8ff84c78f3e75b06e4f87b 100644 (file)
--- a/src/cmd/go/build.go
+++ b/src/cmd/go/build.go
@@ -389,7 +389,7 @@ func buildModeInit() {
                } else {
                        switch platform {
                        case "linux/386", "linux/amd64", "linux/arm", "linux/arm64":
-                               buildAsmflags = append(buildAsmflags, "-D=shared=1")
+                               buildAsmflags = append(buildAsmflags, "-D=GOBUILDMODE_shared=1")
                        default:
                                fatalf("-buildmode=shared not supported on %s\n", platform)
                        }
@@ -408,7 +408,7 @@ func buildModeInit() {
                } else {
                        switch platform {
                        case "linux/386", "linux/amd64", "linux/arm", "linux/arm64":
-                               buildAsmflags = append(buildAsmflags, "-D=shared=1")
+                               buildAsmflags = append(buildAsmflags, "-D=GOBUILDMODE_shared=1")
                        default:
                                fatalf("-buildmode=shared not supported on %s\n", platform)
                        }

diff --git a/src/runtime/sys_linux_386.s b/src/runtime/sys_linux_386.s
index f2beb184550809ebb4b2cf14a313d7c475d91036..9e0e87cafc2370149fc0536910f741024330b03d 100644 (file)
--- a/src/runtime/sys_linux_386.s
+++ b/src/runtime/sys_linux_386.s
@@ -10,7 +10,7 @@
 #include "go_tls.h"
 #include "textflag.h"
 
-#ifdef shared
+#ifdef GOBUILDMODE_shared
 #define INVOKE_SYSINFO CALL 0x10(GS)
 #else
 #define INVOKE_SYSINFO CALL *runtime·_vdso(SB)