Skip to content

Commit d2b9e5d

Browse files
agoodeagoode
committed
module
1 parent af7f6ea commit d2b9e5d

File tree

9 files changed

+34
-8
lines changed

9 files changed

+34
-8
lines changed

‎basis-library/mlton/exit.sml

+1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ structure Exit =
7474
Archive => suffixArchiveOrLibrary
7575
| Executable => suffixExecutable
7676
| LibArchive => suffixArchiveOrLibrary
77+
| LibExecutable => suffixArchiveOrLibrary
7778
| Library => suffixArchiveOrLibrary
7879
end
7980
in

‎basis-library/mlton/platform.sig

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ signature MLTON_PLATFORM =
1919

2020
structure Format:
2121
sig
22-
datatype t = Archive | Executable | LibArchive | Library
22+
datatype t = Archive | Executable | LibArchive | LibExecutable | Library
2323

2424
val fromString: string -> t option
2525
val host: t

‎basis-library/mlton/platform.sml

+3
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,14 @@ structure MLtonPlatform: MLTON_PLATFORM =
9696
Archive
9797
| Executable
9898
| LibArchive
99+
| LibExecutable
99100
| Library
100101

101102
val all =
102103
(Archive, "Archive")::
103104
(Executable, "Executable")::
104105
(LibArchive, "LibArchive")::
106+
(LibExecutable, "LibExecutable")::
105107
(Library, "Library")::
106108
nil
107109

@@ -113,6 +115,7 @@ structure MLtonPlatform: MLTON_PLATFORM =
113115
"archive" => Archive
114116
| "executable" => Executable
115117
| "libarchive" => LibArchive
118+
| "libexecutable" => LibExecutable
116119
| "library" => Library
117120
| _ => raise Fail "strange MLton_Platform_Format_host"
118121
end

‎doc/guide/src/LibrarySupport.adoc

+10
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,20 @@ The symbol `libname_open` is a function which must be called before any other sy
8181
The `libname` is controlled by the `-libname` compile option and defaults to the name of the output, with any prefixing lib stripped (eg: `foo` -> `foo`, `libfoo` -> `foo`).
8282
The symbol `libname_close` is a function which should be called to clean up memory once done.
8383

84+
For WebAssembly (Wasm), there is little distinction between libraries and executables.
85+
A `.wasm` binary is loaded by a browser or other runtime engine, and one or more exported functions are called as needed.
86+
Executables export a standard entry point, while libraries export arbitrary functions.
87+
A standard set of imports are defined by WASI (the WebAssembly System Interface), though custom imports can be declared.
88+
From MLton's perspective, building a Wasm library is just like building a regular executable but with library-style exports.
89+
Such a library can be built with `-format libexecutable`.
90+
8491
Summary of `-format` options:
8592

8693
* `executable`: create an executable (a DSO)
8794
* `library`: create a dynamic shared library (a DSO)
8895
* `archive`: create an archive of symbols (not a DSO) that can be linked into an executable
8996
* `libarchive`: create an archive of symbols (not a DSO) that can be linked into a library
97+
* `libexecutable`: create a library with exported symbols, but in an executable format (a DSO)
9098

9199
Related options:
92100

@@ -141,3 +149,5 @@ The linker will pick one or the other, usually preferring the dynamic library.
141149
While a quirk of the operating system allows external import to work for both archives and libraries,
142150
portable projects should not depend on this behaviour.
143151
On other systems it can matter how the library is linked (static or dynamic).
152+
153+
See above for WebAssembly considerations.

‎mlton/atoms/ffi.fun

+5-4
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,11 @@ fun exportHeader f =
160160
(* How do programs link against this library by default *)
161161
val defaultLinkage =
162162
case !Control.format of
163-
Control.Archive => "STATIC_LINK"
164-
| Control.Executable => "PART_OF"
165-
| Control.LibArchive => "NO_DEFAULT_LINK"
166-
| Control.Library => "DYNAMIC_LINK"
163+
Control.Archive => "STATIC_LINK"
164+
| Control.Executable => "PART_OF"
165+
| Control.LibArchive => "NO_DEFAULT_LINK"
166+
| Control.LibExecutable => "NO_DEFAULT_LINK"
167+
| Control.Library => "DYNAMIC_LINK"
167168
val _ =
168169
print ("#if !defined(PART_OF_" ^ libcap ^ ") && \\\n\
169170
\ !defined(STATIC_LINK_" ^ libcap ^ ") && \\\n\

‎mlton/codegen/c-codegen/c-codegen.fun

+1
Original file line numberDiff line numberDiff line change
@@ -758,6 +758,7 @@ fun outputDeclarations
758758
Control.Archive => "MLtonLibrary"
759759
| Control.Executable => "MLtonMain"
760760
| Control.LibArchive => "MLtonLibrary"
761+
| Control.LibExecutable => "MLtonLibrary"
761762
| Control.Library => "MLtonLibrary",
762763
[C.int align,
763764
WordX.toC magic,

‎mlton/control/control-flags.sig

+1
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ signature CONTROL_FLAGS =
222222
Archive
223223
| Executable
224224
| LibArchive
225+
| LibExecutable
225226
| Library
226227
val all: t list
227228
val toString: t -> string

‎mlton/control/control-flags.sml

+4-1
Original file line numberDiff line numberDiff line change
@@ -943,15 +943,17 @@ structure Format =
943943
Archive
944944
| Executable
945945
| LibArchive
946+
| LibExecutable
946947
| Library
947948

948949
(* Default option first for usage message. *)
949-
val all = [Executable, Archive, LibArchive, Library]
950+
val all = [Executable, Archive, LibArchive, LibExecutable, Library]
950951

951952
val toString: t -> string =
952953
fn Archive => "archive"
953954
| Executable => "executable"
954955
| LibArchive => "libarchive"
956+
| LibExecutable => "libexecutable"
955957
| Library => "library"
956958
end
957959

@@ -1763,6 +1765,7 @@ val buildConsts =
17631765
Archive => "archive"
17641766
| Executable => "executable"
17651767
| LibArchive => "libarchive"
1768+
| LibExecutable => "libexecutable"
17661769
| Library => "library")),
17671770
("MLton_Profile_isOn", bool (case !profile of
17681771
ProfileNone => false

‎mlton/main/main.fun

+8-2
Original file line numberDiff line numberDiff line change
@@ -1060,10 +1060,11 @@ fun commandLine (_: string, args: string list): unit =
10601060
case (targetOS, targetArch, !format) of
10611061
(MinGW, _, _) => NONE
10621062
| (Cygwin, _, _) => NONE
1063-
| (_, _, Executable) => NONE
10641063
| (_, _, Archive) => NONE
1065-
| (_, _, Library) => SOME Control.PositionIndependentStyle.PIC
1064+
| (_, _, Executable) => NONE
10661065
| (_, _, LibArchive) => SOME Control.PositionIndependentStyle.PIC
1066+
| (_, _, LibExecutable) => NONE
1067+
| (_, _, Library) => SOME Control.PositionIndependentStyle.PIC
10671068
val () =
10681069
positionIndependentStyle
10691070
:= (case (!positionIndependentStyle, pisFormat) of
@@ -1392,6 +1393,7 @@ fun commandLine (_: string, args: string list): unit =
13921393
(Archive, _) => maybeOut ".a"
13931394
| (Executable, _) => maybeOut ""
13941395
| (LibArchive, _) => maybeOut ".a"
1396+
| (LibExecutable, _) => maybeOut ""
13951397
| (Library, Darwin) => maybeOut ".dylib"
13961398
| (Library, Cygwin) => !libname ^ ".dll"
13971399
| (Library, MinGW) => !libname ^ ".dll"
@@ -1428,6 +1430,10 @@ fun commandLine (_: string, args: string list): unit =
14281430
Executable =>
14291431
Control.PositionIndependentStyle.linkOpts
14301432
positionIndependentStyle
1433+
| LibExecutable =>
1434+
"-Wl,--export-dynamic" ::
1435+
Control.PositionIndependentStyle.linkOpts
1436+
positionIndependentStyle
14311437
| Library => libOpts
14321438
| _ => [],
14331439
["-o", output],

0 commit comments

Comments
 (0)