From: ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 22 Jun 2017 14:23:54 +0000 (+0000)
Subject:     runtime: build testprogcgo with -pthread
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=087c6ca76dd11b14f100a9effa54213b4e140c09;p=thirdparty%2Fgcc.git

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


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@249555 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 17df499a095b..d9839390c5b7 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 7d9d68ddd115..7b58f4a207e2 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();