From: Russ Cox Date: Fri, 12 Jul 2013 03:24:35 +0000 (-0400) Subject: misc/cgo/test: make test work with -linkmode=internal X-Git-Tag: go1.2rc2~1072 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=41fd4f988ce2297ea6d2bf7755e753638a8cf33a;p=gostls13.git misc/cgo/test: make test work with -linkmode=internal The static func named thread in issue5337.go's C snippet conflicts with the static func named thread in issue3350.go's C snippet. I don't know why (they're both static) but I also don't care, because -linkmode=internal only needs to be able to handle the cgo in the standard library, and it does. Change the test to avoid this problem. Fixes build (after run.bash is fixed to detect the breakage). R=minux.ma TBR=minux.ma CC=golang-dev https://golang.org/cl/11201043 --- diff --git a/misc/cgo/test/issue5337.go b/misc/cgo/test/issue5337.go index 7f14ff4261..8013b66a74 100644 --- a/misc/cgo/test/issue5337.go +++ b/misc/cgo/test/issue5337.go @@ -10,14 +10,14 @@ package cgotest #include #include -static void *thread(void *p) { +static void *thread1(void *p) { (void)p; pthread_kill(pthread_self(), SIGPROF); return NULL; } void test5337() { pthread_t tid; - pthread_create(&tid, 0, thread, NULL); + pthread_create(&tid, 0, thread1, NULL); pthread_join(tid, 0); } */