[MLton-commit] r4452

[Matthew Fluet]

Include platform.h with proper defines
----------------------------------------------------------------------

U   mlton/branches/on-20050822-x86_64-branch/Makefile
U   mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/primitive/basis-ffi.sml
U   mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/primitive/prim-mlton.sml
U   mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/primitive/prim2.sml
U   mlton/branches/on-20050822-x86_64-branch/runtime/Makefile

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

Modified: mlton/branches/on-20050822-x86_64-branch/Makefile
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/Makefile	2006-05-04 19:38:40 UTC (rev 4451)
+++ mlton/branches/on-20050822-x86_64-branch/Makefile	2006-05-04 19:39:16 UTC (rev 4452)
@@ -69,7 +69,7 @@
 basis-no-check:
 	mkdir -p $(LIB)/sml
 	rm -rf $(LIB)/sml/basis
-	$(CP) $(SRC)/basis-library/. $(LIB)/sml/basis
+	$(CP) $(SRC)/basis-library.refactor/. $(LIB)/sml/basis
 	find $(LIB)/sml/basis -type d -name .svn | xargs rm -rf
 	find $(LIB)/sml/basis -type f -name .ignore | xargs rm -rf
 

Modified: mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/primitive/basis-ffi.sml
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/primitive/basis-ffi.sml	2006-05-04 19:38:40 UTC (rev 4451)
+++ mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/primitive/basis-ffi.sml	2006-05-04 19:39:16 UTC (rev 4452)
@@ -61,6 +61,7 @@
 end
 structure MLton = 
 struct
+val bug = _import "MLton_bug" : NullString8.t -> unit;
 structure Itimer = 
 struct
 val PROF = _const "MLton_Itimer_PROF" : C_Int.t;

Modified: mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/primitive/prim-mlton.sml
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/primitive/prim-mlton.sml	2006-05-04 19:38:40 UTC (rev 4451)
+++ mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/primitive/prim-mlton.sml	2006-05-04 19:39:16 UTC (rev 4452)
@@ -14,7 +14,7 @@
 
 structure MLton = struct
 
-val bug = _import "MLton_bug": NullString8.t -> unit;
+
 val eq = _prim "MLton_eq": 'a * 'a -> bool;
 (* val deserialize = _prim "MLton_deserialize": Word8Vector.vector -> 'a ref; *)
 val halt = _prim "MLton_halt": C_Status.t -> unit;

Modified: mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/primitive/prim2.sml
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/primitive/prim2.sml	2006-05-04 19:38:40 UTC (rev 4451)
+++ mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/primitive/prim2.sml	2006-05-04 19:39:16 UTC (rev 4452)
@@ -10,6 +10,12 @@
    struct
       open Primitive
 
+      structure MLton =
+         struct
+            open MLton
+            val bug = PrimitiveFFI.MLton.bug
+         end
+
       val dontInline: (unit -> 'a) -> 'a =
          fn f =>
          let

Modified: mlton/branches/on-20050822-x86_64-branch/runtime/Makefile
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/Makefile	2006-05-04 19:38:40 UTC (rev 4451)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/Makefile	2006-05-04 19:39:16 UTC (rev 4452)
@@ -192,7 +192,13 @@
 
 
 runtime.c: $(CFILES)
-	cat $(CFILES) >runtime.c
+	rm -f runtime.c
+	( echo "#define MLTON_GC_INTERNAL_TYPES"; 	\
+	  echo "#define MLTON_GC_INTERNAL_FUNCS";	\
+	  echo "#define MLTON_GC_INTERNAL_BASIS";	\
+	  echo "#include \"platform.h\""; )		\
+		> runtime.c
+	cat $(CFILES) >> runtime.c
 
 
 util/%-gdb.o: util/%.c util.h $(UTILHFILES)