[MLton-commit] r6881

[spoons at mlton.org]

fixes for darwin

----------------------------------------------------------------------

U   mlton/branches/shared-heap-multicore/bin/mlton-script
U   mlton/branches/shared-heap-multicore/include/c-main.h

----------------------------------------------------------------------

Modified: mlton/branches/shared-heap-multicore/bin/mlton-script
===================================================================
--- mlton/branches/shared-heap-multicore/bin/mlton-script	2008-09-22 16:45:05 UTC (rev 6880)
+++ mlton/branches/shared-heap-multicore/bin/mlton-script	2008-09-23 07:04:05 UTC (rev 6881)
@@ -82,7 +82,7 @@
         -cc-opt-quote "-I$lib/include"                           \
         -cc-opt '-O1'                                            \
         -cc-opt '-fno-strict-aliasing -fomit-frame-pointer -w'   \
-        -link-opt '-lgdtoa -lm -lgmp -lpthread -lrt'             \
+        -link-opt '-lgdtoa -lm -lgmp'                            \
         -mlb-path-map "$lib/mlb-path-map"                        \
         -target-as-opt amd64 '-m64'                              \
         -target-cc-opt amd64 '-m64'                              \
@@ -102,9 +102,9 @@
                 -malign-jumps=2
                 -malign-loops=2'                                 \
         -target-link-opt amd64 '-m64'                            \
-        -target-link-opt darwin "$darwinLinkOpts"                \
+        -target-link-opt darwin "$darwinLinkOpts -pthread"       \
         -target-link-opt freebsd '-L/usr/local/lib/'             \
-        -target-link-opt linux '-lplpa_included'                 \
+        -target-link-opt linux '-lplpa_included -pthread -lrt'   \
         -target-link-opt mingw                                   \
                 '-lws2_32 -lkernel32 -lpsapi -lnetapi32'         \
         -target-link-opt netbsd                                  \

Modified: mlton/branches/shared-heap-multicore/include/c-main.h
===================================================================
--- mlton/branches/shared-heap-multicore/include/c-main.h	2008-09-22 16:45:05 UTC (rev 6880)
+++ mlton/branches/shared-heap-multicore/include/c-main.h	2008-09-23 07:04:05 UTC (rev 6881)
@@ -18,7 +18,7 @@
 
 #define Main(al, mg, mfs, mmc, pk, ps, gnr, mc, ml)                     \
 /* Globals */                                                           \
-pthread_key_t gcstate_key;                                              \
+C_Pthread_Key_t gcstate_key;                                            \
 void MLton_callFromC (uint32_t ffiOp) {                                 \
         struct cont cont;                                               \
         GC_state s = pthread_getspecific (gcstate_key);                 \