diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2017-06-22 14:23:54 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2017-06-22 14:23:54 +0000 |
| commit | 7d8c7b26c811748fc606085bf169dcd8a426eaf4 (patch) | |
| tree | cbbe41462f4c5e03b73912f7bb8d2e7a54e61297 | |
| parent | b6d03af0b128d4a1f923f18aff52549f5fad1453 (diff) | |
| download | gcc-7d8c7b26c811748fc606085bf169dcd8a426eaf4.zip gcc-7d8c7b26c811748fc606085bf169dcd8a426eaf4.tar.gz gcc-7d8c7b26c811748fc606085bf169dcd8a426eaf4.tar.bz2 | |
runtime: build testprogcgo with -pthread
Building this test with gccgo requires an explicit -pthread option to
be passed to the C compiler, so that it links against -lpthread.
This test is not built today, but it will be soon with a future patch.
Reviewed-on: https://go-review.googlesource.com/46451
From-SVN: r249555
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/go/runtime/testdata/testprogcgo/callback.go | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 17df499..d983939 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -f70ef19badafb85b1caa72b51b0082deb48d433a +bbc4f30a027ee09475d08aa4aeed1f2f7067e2e9 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/go/runtime/testdata/testprogcgo/callback.go b/libgo/go/runtime/testdata/testprogcgo/callback.go index 7d9d68d..7b58f4a 100644 --- a/libgo/go/runtime/testdata/testprogcgo/callback.go +++ b/libgo/go/runtime/testdata/testprogcgo/callback.go @@ -7,6 +7,9 @@ package main /* +#cgo CFLAGS: -pthread +#cgo LDFLAGS: -pthread + #include <pthread.h> void go_callback(); |