[MLton-commit] r4031
Matthew Fluet
MLton@mlton.org
Thu, 25 Aug 2005 05:54:15 -0700
Reorganized platform dependency .mlb files for mlnlffi-lib.
New arch/os combinations should be added to
lib/mlnlffi/memory/platform/memory.ARCH-OS.mlb
I believe that all of our currently supported platforms are
effectively 32bit/unix platforms, so copying memory.x86-linux.mlb to
memory.ARCH-OS.mlb should work fine.
----------------------------------------------------------------------
U mlton/trunk/lib/mlnlffi/c.mlb
A mlton/trunk/lib/mlnlffi/internals/c-int.mlb
D mlton/trunk/lib/mlnlffi/internals/c-int.x86-unix.mlb
A mlton/trunk/lib/mlnlffi/memory/memory.32bit-unix.mlb
A mlton/trunk/lib/mlnlffi/memory/memory.mlb
D mlton/trunk/lib/mlnlffi/memory/memory.x86-unix.mlb
A mlton/trunk/lib/mlnlffi/memory/platform/
A mlton/trunk/lib/mlnlffi/memory/platform/memory.powerpc-darwin.mlb
A mlton/trunk/lib/mlnlffi/memory/platform/memory.powerpc-linux.mlb
A mlton/trunk/lib/mlnlffi/memory/platform/memory.sparc-linux.mlb
A mlton/trunk/lib/mlnlffi/memory/platform/memory.x86-linux.mlb
----------------------------------------------------------------------
Modified: mlton/trunk/lib/mlnlffi/c.mlb
===================================================================
--- mlton/trunk/lib/mlnlffi/c.mlb 2005-08-25 04:21:26 UTC (rev 4030)
+++ mlton/trunk/lib/mlnlffi/c.mlb 2005-08-25 12:54:10 UTC (rev 4031)
@@ -15,7 +15,7 @@
* author: Matthias Blume (blume@research.bell-labs.com)
*)
local
- internals/c-int.$(TARGET_ARCH)-$(TARGET_OS).mlb
+ internals/c-int.mlb
in
structure Tag
Copied: mlton/trunk/lib/mlnlffi/internals/c-int.mlb (from rev 4030, mlton/trunk/lib/mlnlffi/internals/c-int.x86-unix.mlb)
===================================================================
--- mlton/trunk/lib/mlnlffi/internals/c-int.x86-unix.mlb 2005-08-25 04:21:26 UTC (rev 4030)
+++ mlton/trunk/lib/mlnlffi/internals/c-int.mlb 2005-08-25 12:54:10 UTC (rev 4031)
@@ -0,0 +1,35 @@
+local
+ $(SML_LIB)/basis/basis.mlb
+
+ ../memory/memory.mlb
+
+ ../c.sig
+ ../c-debug.sig
+ c-int.sig
+ c-int.sml
+ c.sml
+ c-debug.sml
+
+ ../zstring.sig
+ zstring.sml
+ tag.sml
+in
+ structure Tag
+
+ structure MLRep
+ signature C
+ structure C
+ signature C_INT
+ structure C_Int
+ signature C_DEBUG
+ structure C_Debug
+
+ signature ZSTRING
+ structure ZString
+
+ signature DYN_LINKAGE
+ structure DynLinkage
+
+ signature CMEMORY
+ structure CMemory
+end
Deleted: mlton/trunk/lib/mlnlffi/internals/c-int.x86-unix.mlb
===================================================================
--- mlton/trunk/lib/mlnlffi/internals/c-int.x86-unix.mlb 2005-08-25 04:21:26 UTC (rev 4030)
+++ mlton/trunk/lib/mlnlffi/internals/c-int.x86-unix.mlb 2005-08-25 12:54:10 UTC (rev 4031)
@@ -1,35 +0,0 @@
-local
- $(MLTON_ROOT)/basis/basis.mlb
-
- ../memory/memory.x86-unix.mlb
-
- ../c.sig
- ../c-debug.sig
- c-int.sig
- c-int.sml
- c.sml
- c-debug.sml
-
- ../zstring.sig
- zstring.sml
- tag.sml
-in
- structure Tag
-
- structure MLRep
- signature C
- structure C
- signature C_INT
- structure C_Int
- signature C_DEBUG
- structure C_Debug
-
- signature ZSTRING
- structure ZString
-
- signature DYN_LINKAGE
- structure DynLinkage
-
- signature CMEMORY
- structure CMemory
-end
Copied: mlton/trunk/lib/mlnlffi/memory/memory.32bit-unix.mlb (from rev 4030, mlton/trunk/lib/mlnlffi/memory/memory.x86-unix.mlb)
===================================================================
--- mlton/trunk/lib/mlnlffi/memory/memory.x86-unix.mlb 2005-08-25 04:21:26 UTC (rev 4030)
+++ mlton/trunk/lib/mlnlffi/memory/memory.32bit-unix.mlb 2005-08-25 12:54:10 UTC (rev 4031)
@@ -0,0 +1,25 @@
+local
+ $(SML_LIB)/basis/basis.mlb
+ $(SML_LIB)/basis/mlton.mlb
+
+ linkage.sig
+ ann "allowFFI true" in
+ linkage-libdl.sml
+ end
+ bitop-fn.sml
+ mlrep-i8i16i32i32i64f32f64.sml
+ memaccess.sig
+ memaccess-a4c1s2i4l4ll8f4d8.sml
+ memalloc.sig
+ ann "allowFFI true" in
+ memalloc-a4-unix.sml
+ end
+ memory.sig
+ memory.sml
+in
+ signature CMEMORY
+ structure CMemory
+ signature DYN_LINKAGE
+ structure DynLinkage
+ structure MLRep
+end
Added: mlton/trunk/lib/mlnlffi/memory/memory.mlb
===================================================================
--- mlton/trunk/lib/mlnlffi/memory/memory.mlb 2005-08-25 04:21:26 UTC (rev 4030)
+++ mlton/trunk/lib/mlnlffi/memory/memory.mlb 2005-08-25 12:54:10 UTC (rev 4031)
@@ -0,0 +1 @@
+platform/memory.$(TARGET_ARCH)-$(TARGET_OS).mlb
Deleted: mlton/trunk/lib/mlnlffi/memory/memory.x86-unix.mlb
===================================================================
--- mlton/trunk/lib/mlnlffi/memory/memory.x86-unix.mlb 2005-08-25 04:21:26 UTC (rev 4030)
+++ mlton/trunk/lib/mlnlffi/memory/memory.x86-unix.mlb 2005-08-25 12:54:10 UTC (rev 4031)
@@ -1,25 +0,0 @@
-local
- $(MLTON_ROOT)/basis/basis.mlb
- $(MLTON_ROOT)/basis/mlton.mlb
-
- linkage.sig
- ann "allowFFI true" in
- linkage-libdl.sml
- end
- bitop-fn.sml
- mlrep-i8i16i32i32i64f32f64.sml
- memaccess.sig
- memaccess-a4c1s2i4l4ll8f4d8.sml
- memalloc.sig
- ann "allowFFI true" in
- memalloc-a4-unix.sml
- end
- memory.sig
- memory.sml
-in
- signature CMEMORY
- structure CMemory
- signature DYN_LINKAGE
- structure DynLinkage
- structure MLRep
-end
Added: mlton/trunk/lib/mlnlffi/memory/platform/memory.powerpc-darwin.mlb
===================================================================
--- mlton/trunk/lib/mlnlffi/memory/platform/memory.powerpc-darwin.mlb 2005-08-25 04:21:26 UTC (rev 4030)
+++ mlton/trunk/lib/mlnlffi/memory/platform/memory.powerpc-darwin.mlb 2005-08-25 12:54:10 UTC (rev 4031)
@@ -0,0 +1 @@
+../memory.32bit-unix.mlb
Added: mlton/trunk/lib/mlnlffi/memory/platform/memory.powerpc-linux.mlb
===================================================================
--- mlton/trunk/lib/mlnlffi/memory/platform/memory.powerpc-linux.mlb 2005-08-25 04:21:26 UTC (rev 4030)
+++ mlton/trunk/lib/mlnlffi/memory/platform/memory.powerpc-linux.mlb 2005-08-25 12:54:10 UTC (rev 4031)
@@ -0,0 +1 @@
+../memory.32bit-unix.mlb
Added: mlton/trunk/lib/mlnlffi/memory/platform/memory.sparc-linux.mlb
===================================================================
--- mlton/trunk/lib/mlnlffi/memory/platform/memory.sparc-linux.mlb 2005-08-25 04:21:26 UTC (rev 4030)
+++ mlton/trunk/lib/mlnlffi/memory/platform/memory.sparc-linux.mlb 2005-08-25 12:54:10 UTC (rev 4031)
@@ -0,0 +1 @@
+../memory.32bit-unix.mlb
Added: mlton/trunk/lib/mlnlffi/memory/platform/memory.x86-linux.mlb
===================================================================
--- mlton/trunk/lib/mlnlffi/memory/platform/memory.x86-linux.mlb 2005-08-25 04:21:26 UTC (rev 4030)
+++ mlton/trunk/lib/mlnlffi/memory/platform/memory.x86-linux.mlb 2005-08-25 12:54:10 UTC (rev 4031)
@@ -0,0 +1 @@
+../memory.32bit-unix.mlb