Merge branch 'upstream'

Former-commit-id: db8a79ec442802615285f953b00da9fcdf7d459b

libgc/Makefile.am

@@ -185,3 +185,6 @@ EXTRA_DIST += configure.host
 .S.s:
 	if $(CPP) $< >$@ ; then :; else rm -f $@; fi
 
+test:
+
+test-bundle:

libgc/Makefile.in

@@ -1149,6 +1149,10 @@ include/private/gc_hdrs.h include/gc.h include/gc_gcj.h include/gc_mark.h
 .S.s:
 	if $(CPP) $< >$@ ; then :; else rm -f $@; fi
 
+test:
+
+test-bundle:
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

libgc/include/gc_pthread_redirects.h

@@ -5,6 +5,14 @@
 
 #define GC_PTHREAD_REDIRECTS_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+  void * GC_dlopen(const char *path, int mode);
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #if defined(GC_SOLARIS_THREADS)
 /* We need to intercept calls to many of the threads primitives, so 	*/
 /* that we can locate thread stacks and stop the world.			*/
@@ -26,7 +34,6 @@ extern "C" {
   int GC_thr_join(thread_t wait_for, thread_t *departed, void **status);
   int GC_thr_suspend(thread_t target_thread);
   int GC_thr_continue(thread_t target_thread);
-  void * GC_dlopen(const char *path, int mode);
 # define thr_create GC_thr_create
 # define thr_join GC_thr_join
 # define thr_suspend GC_thr_suspend
@@ -66,7 +73,6 @@ extern "C" {
 # define dlopen GC_dlopen
 #endif /* SOLARIS_THREADS || SOLARIS_PTHREADS */
 
-
 #if !defined(GC_USE_LD_WRAP) && (defined(GC_PTHREADS) || defined(GC_DARWIN_THREADS) || defined(GC_MACOSX_THREADS)) && !defined(GC_SOLARIS_PTHREADS)
 /* We treat these similarly. */
 # include <pthread.h>