runtime/cgo: refactor

src/pkg/runtime/cgo/callbacks.c

Index: src/pkg/runtime/cgo/callbacks.c 
=================================================================== 
--- a/src/pkg/runtime/cgo/callbacks.c 
+++ b/src/pkg/runtime/cgo/callbacks.c 
@@ -13,7 +13,9 @@ 
 // 
 // We need to export the symbol crosscall2 in order to support 
 // callbacks from shared libraries. 
-#pragma dynexport crosscall2 crosscall2 
+//#pragma dynexport crosscall2 crosscall2 
+ 
+#pragma cgo_import_static crosscall2 
 
 // Allocate memory. This allocates the requested number of bytes in 
 // memory controlled by the Go runtime. The allocated memory will be 
@@ -77,3 +79,15 @@ 
 { 
	runtime·cgocallback((void(*)(void))_cgo_panic_internal, a, n); 
 } 
+ 
+#pragma cgo_import_static x_cgo_malloc 
+#pragma cgo_import_static x_cgo_free 
+#pragma cgo_import_static x_cgo_thread_start 
+ 
+void x_cgo_malloc(void*); 
+void x_cgo_free(void*); 
+void x_cgo_thread_start(void*); 
+ 
+void (*_cgo_malloc)(void*) = x_cgo_malloc; 
+void (*_cgo_free)(void*) = x_cgo_free; 
+void (*_cgo_thread_start)(void*) = x_cgo_thread_start;