diff options
author | Shenghou Ma <minux@golang.org> | 2015-09-10 02:32:12 -0400 |
---|---|---|
committer | Austin Clements <austin@google.com> | 2015-11-17 02:20:12 +0000 |
commit | 2cfde4152050063d8fa66b8c28f3b4b137d08a7a (patch) | |
tree | ebfbfcb5ea2a3ac0b008b9b46f45cb0a19bb3af6 | |
parent | 095710b39ec15e4df62eab0781a9d685dbe575a5 (diff) | |
download | go-2cfde4152050063d8fa66b8c28f3b4b137d08a7a.tar.gz go-2cfde4152050063d8fa66b8c28f3b4b137d08a7a.zip |
[release-branch.go1.5] runtime/cgo: explicitly link msvcrt on windows
It's because runtime links to ntdll, and ntdll exports a couple
incompatible libc functions. We must link to msvcrt first and
then try ntdll.
Fixes #12030.
Change-Id: I0105417bada108da55f5ae4482c2423ac7a92957
Reviewed-on: https://go-review.googlesource.com/14472
Reviewed-by: Alex Brainman <alex.brainman@gmail.com>
Run-TryBot: Minux Ma <minux@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-on: https://go-review.googlesource.com/16966
Run-TryBot: Austin Clements <austin@google.com>
Reviewed-by: Minux Ma <minux@golang.org>
Reviewed-by: Russ Cox <rsc@golang.org>
-rw-r--r-- | misc/cgo/test/cgo_test.go | 1 | ||||
-rw-r--r-- | misc/cgo/test/issue12030.go | 35 | ||||
-rw-r--r-- | src/runtime/cgo/cgo.go | 4 |
3 files changed, 39 insertions, 1 deletions
diff --git a/misc/cgo/test/cgo_test.go b/misc/cgo/test/cgo_test.go index 9af31e8a20..4060338b65 100644 --- a/misc/cgo/test/cgo_test.go +++ b/misc/cgo/test/cgo_test.go @@ -65,5 +65,6 @@ func Test9026(t *testing.T) { test9026(t) } func Test9557(t *testing.T) { test9557(t) } func Test10303(t *testing.T) { test10303(t, 10) } func Test11925(t *testing.T) { test11925(t) } +func Test12030(t *testing.T) { test12030(t) } func BenchmarkCgoCall(b *testing.B) { benchCgoCall(b) } diff --git a/misc/cgo/test/issue12030.go b/misc/cgo/test/issue12030.go new file mode 100644 index 0000000000..ef8f86f53e --- /dev/null +++ b/misc/cgo/test/issue12030.go @@ -0,0 +1,35 @@ +// Copyright 2015 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. + +// Issue 12030. sprintf is defined in both ntdll and msvcrt, +// Normally we want the one in the msvcrt. + +package cgotest + +/* +#include <stdio.h> +#include <stdlib.h> +void issue12030conv(char *buf, double x) { + sprintf(buf, "d=%g", x); +} +*/ +import "C" + +import ( + "fmt" + "testing" + "unsafe" +) + +func test12030(t *testing.T) { + buf := (*C.char)(C.malloc(256)) + defer C.free(unsafe.Pointer(buf)) + for _, f := range []float64{1.0, 2.0, 3.14} { + C.issue12030conv(buf, C.double(f)) + got := C.GoString(buf) + if want := fmt.Sprintf("d=%g", f); got != want { + t.Fatalf("C.sprintf failed for %g: %q != %q", f, got, want) + } + } +} diff --git a/src/runtime/cgo/cgo.go b/src/runtime/cgo/cgo.go index cb24678bf0..8f3e66fa4d 100644 --- a/src/runtime/cgo/cgo.go +++ b/src/runtime/cgo/cgo.go @@ -20,7 +20,9 @@ package cgo #cgo !android,linux LDFLAGS: -lpthread #cgo netbsd LDFLAGS: -lpthread #cgo openbsd LDFLAGS: -lpthread -#cgo windows LDFLAGS: -lm -mthreads +// we must explicitly link msvcrt, because runtime needs ntdll, and ntdll +// exports some incompatible libc functions. See golang.org/issue/12030. +#cgo windows LDFLAGS: -lmsvcrt -lm -mthreads #cgo CFLAGS: -Wall -Werror |