Amaury Forgeot d'Arc avatar Amaury Forgeot d'Arc committed c470cec

Another attempt to fix the boehm/thread interaction.

Comments (0)

Files changed (2)

pypy/translator/c/gc.py

 
         eci = eci.merge(ExternalCompilationInfo(
             pre_include_bits=pre_include_bits,
-            post_include_bits=['#define PYPY_USING_BOEHM_GC'],
+            # The following define is required by the thread module,
+            # See module/thread/test/test_ll_thread.py
+            compile_extra=['-DPYPY_USING_BOEHM_GC'],
             ))
 
         return eci

pypy/translator/c/src/thread.c

 /* Thread implementation */
 #include "src/thread.h"
 
+#ifdef PYPY_USING_BOEHM_GC
+/* The following include is required by the Boehm GC, which apparently
+ * crashes when pthread_create_thread() is not redefined to call a
+ * Boehm wrapper function instead.  Ugly.
+ */
+#include "common_header.h"
+#endif
+
 #ifdef _WIN32
 #include "src/thread_nt.c"
 #else
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.