summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--INSTALL.MPW2
-rw-r--r--Makefile.Mac.depend60
-rw-r--r--byterun/Makefile.Mac10
-rw-r--r--byterun/Makefile.Mac.depend34
-rw-r--r--byterun/floats.c4
-rw-r--r--stdlib/Makefile.Mac.depend2
6 files changed, 78 insertions, 34 deletions
diff --git a/INSTALL.MPW b/INSTALL.MPW
index e8fe64270..3b5a056b2 100644
--- a/INSTALL.MPW
+++ b/INSTALL.MPW
@@ -47,4 +47,4 @@ Echo "Set -e CAMLLIB `quote "{CAMLLIB}"`" >"{MPW}Startup Items:O'Caml"
DoMake world
DoMake bootstrap
DoMake install
-DoMake realclean
+DoMake clean
diff --git a/Makefile.Mac.depend b/Makefile.Mac.depend
index b2df9405a..d4fc34755 100644
--- a/Makefile.Mac.depend
+++ b/Makefile.Mac.depend
@@ -8,6 +8,8 @@
:utils:config.cmxÄ :utils:config.cmi
:utils:misc.cmoÄ :utils:misc.cmi
:utils:misc.cmxÄ :utils:misc.cmi
+:utils:nativeint.cmoÄ :utils:nativeint.cmi
+:utils:nativeint.cmxÄ :utils:nativeint.cmi
:utils:tbl.cmoÄ :utils:tbl.cmi
:utils:tbl.cmxÄ :utils:tbl.cmi
:utils:terminfo.cmoÄ :utils:terminfo.cmi
@@ -20,8 +22,12 @@
:parsing:pstream.cmiÄ :parsing:parsetree.cmi
:parsing:lexer.cmoÄ :utils:misc.cmi :parsing:parser.cmi :parsing:lexer.cmi
:parsing:lexer.cmxÄ :utils:misc.cmx :parsing:parser.cmx :parsing:lexer.cmi
-:parsing:location.cmoÄ :utils:terminfo.cmi :parsing:location.cmi
-:parsing:location.cmxÄ :utils:terminfo.cmx :parsing:location.cmi
+:parsing:linenum.cmoÄ :utils:misc.cmi :parsing:linenum.cmi
+:parsing:linenum.cmxÄ :utils:misc.cmx :parsing:linenum.cmi
+:parsing:location.cmoÄ :parsing:linenum.cmi :utils:terminfo.cmi ¶
+ :parsing:location.cmi
+:parsing:location.cmxÄ :parsing:linenum.cmx :utils:terminfo.cmx ¶
+ :parsing:location.cmi
:parsing:longident.cmoÄ :utils:misc.cmi :parsing:longident.cmi
:parsing:longident.cmxÄ :utils:misc.cmx :parsing:longident.cmi
:parsing:parse.cmoÄ :parsing:lexer.cmi :parsing:location.cmi ¶
@@ -101,12 +107,12 @@
:typing:types.cmx :typing:includecore.cmi
:typing:includemod.cmoÄ :typing:env.cmi :typing:ident.cmi ¶
:typing:includecore.cmi :utils:misc.cmi :typing:path.cmi ¶
- :typing:printtyp.cmi :utils:tbl.cmi :typing:typedtree.cmi ¶
- :typing:types.cmi :typing:includemod.cmi
+ :typing:printtyp.cmi :typing:subst.cmi :utils:tbl.cmi ¶
+ :typing:typedtree.cmi :typing:types.cmi :typing:includemod.cmi
:typing:includemod.cmxÄ :typing:env.cmx :typing:ident.cmx ¶
:typing:includecore.cmx :utils:misc.cmx :typing:path.cmx ¶
- :typing:printtyp.cmx :utils:tbl.cmx :typing:typedtree.cmx ¶
- :typing:types.cmx :typing:includemod.cmi
+ :typing:printtyp.cmx :typing:subst.cmx :utils:tbl.cmx ¶
+ :typing:typedtree.cmx :typing:types.cmx :typing:includemod.cmi
:typing:mtype.cmoÄ :typing:ctype.cmi :typing:env.cmi :typing:ident.cmi ¶
:typing:path.cmi :typing:types.cmi :typing:mtype.cmi
:typing:mtype.cmxÄ :typing:ctype.cmx :typing:env.cmx :typing:ident.cmx ¶
@@ -161,14 +167,16 @@
:typing:typecore.cmi
:typing:typedecl.cmoÄ :utils:config.cmi :typing:ctype.cmi :typing:env.cmi ¶
:typing:ident.cmi :typing:includecore.cmi :parsing:location.cmi ¶
- :parsing:parsetree.cmi :typing:primitive.cmi :typing:printtyp.cmi ¶
- :typing:subst.cmi :typing:typedtree.cmi :typing:types.cmi ¶
- :typing:typetexp.cmi :typing:typedecl.cmi
+ :utils:misc.cmi :parsing:parsetree.cmi :typing:path.cmi ¶
+ :typing:primitive.cmi :typing:printtyp.cmi :typing:subst.cmi ¶
+ :typing:typedtree.cmi :typing:types.cmi :typing:typetexp.cmi ¶
+ :typing:typedecl.cmi
:typing:typedecl.cmxÄ :utils:config.cmx :typing:ctype.cmx :typing:env.cmx ¶
:typing:ident.cmx :typing:includecore.cmx :parsing:location.cmx ¶
- :parsing:parsetree.cmi :typing:primitive.cmx :typing:printtyp.cmx ¶
- :typing:subst.cmx :typing:typedtree.cmx :typing:types.cmx ¶
- :typing:typetexp.cmx :typing:typedecl.cmi
+ :utils:misc.cmx :parsing:parsetree.cmi :typing:path.cmx ¶
+ :typing:primitive.cmx :typing:printtyp.cmx :typing:subst.cmx ¶
+ :typing:typedtree.cmx :typing:types.cmx :typing:typetexp.cmx ¶
+ :typing:typedecl.cmi
:typing:typedtree.cmoÄ :parsing:asttypes.cmi :typing:env.cmi ¶
:typing:ident.cmi :parsing:location.cmi :utils:misc.cmi :typing:path.cmi ¶
:typing:primitive.cmi :typing:types.cmi :typing:typedtree.cmi
@@ -221,13 +229,11 @@
:bytecomp:translmod.cmiÄ :bytecomp:lambda.cmi :typing:typedtree.cmi
:bytecomp:translobj.cmiÄ :typing:ident.cmi :bytecomp:lambda.cmi
:bytecomp:bytegen.cmoÄ :parsing:asttypes.cmi :typing:ident.cmi ¶
- :bytecomp:instruct.cmi :bytecomp:lambda.cmi :parsing:location.cmi ¶
- :utils:misc.cmi :typing:primitive.cmi :typing:types.cmi ¶
- :bytecomp:bytegen.cmi
+ :bytecomp:instruct.cmi :bytecomp:lambda.cmi :utils:misc.cmi ¶
+ :typing:primitive.cmi :typing:types.cmi :bytecomp:bytegen.cmi
:bytecomp:bytegen.cmxÄ :parsing:asttypes.cmi :typing:ident.cmx ¶
- :bytecomp:instruct.cmx :bytecomp:lambda.cmx :parsing:location.cmx ¶
- :utils:misc.cmx :typing:primitive.cmx :typing:types.cmx ¶
- :bytecomp:bytegen.cmi
+ :bytecomp:instruct.cmx :bytecomp:lambda.cmx :utils:misc.cmx ¶
+ :typing:primitive.cmx :typing:types.cmx :bytecomp:bytegen.cmi
:bytecomp:bytelibrarian.cmoÄ :utils:clflags.cmo :utils:config.cmi ¶
:bytecomp:emitcode.cmi :utils:misc.cmi :bytecomp:bytelibrarian.cmi
:bytecomp:bytelibrarian.cmxÄ :utils:clflags.cmx :utils:config.cmx ¶
@@ -240,14 +246,16 @@
:bytecomp:emitcode.cmx :typing:ident.cmx :bytecomp:instruct.cmx ¶
:utils:misc.cmx :bytecomp:opcodes.cmx :bytecomp:symtable.cmx ¶
:bytecomp:bytelink.cmi
-:bytecomp:emitcode.cmoÄ :parsing:asttypes.cmi :utils:config.cmi ¶
- :typing:env.cmi :typing:ident.cmi :bytecomp:instruct.cmi ¶
- :bytecomp:lambda.cmi :bytecomp:meta.cmi :utils:misc.cmi ¶
- :bytecomp:opcodes.cmo :bytecomp:translmod.cmi :bytecomp:emitcode.cmi
-:bytecomp:emitcode.cmxÄ :parsing:asttypes.cmi :utils:config.cmx ¶
- :typing:env.cmx :typing:ident.cmx :bytecomp:instruct.cmx ¶
- :bytecomp:lambda.cmx :bytecomp:meta.cmx :utils:misc.cmx ¶
- :bytecomp:opcodes.cmx :bytecomp:translmod.cmx :bytecomp:emitcode.cmi
+:bytecomp:emitcode.cmoÄ :parsing:asttypes.cmi :utils:clflags.cmo ¶
+ :utils:config.cmi :typing:env.cmi :typing:ident.cmi ¶
+ :bytecomp:instruct.cmi :bytecomp:lambda.cmi :bytecomp:meta.cmi ¶
+ :utils:misc.cmi :bytecomp:opcodes.cmo :bytecomp:translmod.cmi ¶
+ :typing:types.cmi :bytecomp:emitcode.cmi
+:bytecomp:emitcode.cmxÄ :parsing:asttypes.cmi :utils:clflags.cmx ¶
+ :utils:config.cmx :typing:env.cmx :typing:ident.cmx ¶
+ :bytecomp:instruct.cmx :bytecomp:lambda.cmx :bytecomp:meta.cmx ¶
+ :utils:misc.cmx :bytecomp:opcodes.cmx :bytecomp:translmod.cmx ¶
+ :typing:types.cmx :bytecomp:emitcode.cmi
:bytecomp:instruct.cmoÄ :typing:env.cmi :typing:ident.cmi ¶
:bytecomp:lambda.cmi :typing:types.cmi :bytecomp:instruct.cmi
:bytecomp:instruct.cmxÄ :typing:env.cmx :typing:ident.cmx ¶
diff --git a/byterun/Makefile.Mac b/byterun/Makefile.Mac
index f64833d52..536f11faf 100644
--- a/byterun/Makefile.Mac
+++ b/byterun/Makefile.Mac
@@ -1,5 +1,5 @@
C = sc
-COptions = -model far -d _STDC_ -w 7
+COptions = -model far -w 7
AOptions = -model far -wb
LinkOptions = -model far -msg nodup -compact -pad 0 -state nouse
Libs = "{libraries}IntEnv.far.o" "{libraries}MacRuntime.o" ¶
@@ -20,7 +20,7 @@ OBJS = interp.a.o misc.c.o stacks.c.o fix_code.c.o startup.c.o main.c.o ¶
intern.c.o ¶
hash.c.o sys.c.o meta.c.o parsing.c.o gc_ctrl.c.o terminfo.c.o md5.c.o ¶
obj.c.o lexing.c.o macintosh.c.o rotatecursor.c.o printexc.c.o callback.c.o ¶
- debugger.c.o
+ debugger.c.o weak.c.o
PPCOBJS = interp.c.x misc.c.x stacks.c.x fix_code.c.x startup.c.x main.c.x ¶
freelist.c.x major_gc.c.x minor_gc.c.x memory.c.x alloc.c.x roots.c.x ¶
@@ -29,11 +29,11 @@ PPCOBJS = interp.c.x misc.c.x stacks.c.x fix_code.c.x startup.c.x main.c.x ¶
intern.c.x ¶
hash.c.x sys.c.x meta.c.x parsing.c.x gc_ctrl.c.x terminfo.c.x md5.c.x ¶
obj.c.x lexing.c.x macintosh.c.x rotatecursor.c.x printexc.c.x callback.c.x ¶
- debugger.c.x
+ debugger.c.x weak.c.x
PRIMS = array.c compare.c extern.c floats.c gc_ctrl.c hash.c ¶
intern.c interp.c ints.c io.c lexing.c md5.c meta.c obj.c parsing.c ¶
- signals.c str.c sys.c terminfo.c callback.c
+ signals.c str.c sys.c terminfo.c callback.c weak.c
all Ä ocamlrun libcamlrun.o libcamlrun.x
@@ -80,7 +80,7 @@ clean Ä
delete -i ocamlrun primitives prims.c opnames.h
primitives Ä {PRIMS}
- streamedit -d -e "/Å ([a-z0-9_]*)¨0'('Å'* ML *'/ print ¨0" {PRIMS} > primitives
+ streamedit -d -e "/ ([a-z0-9_]+)¨0 *'('Å'* ML *'/ print ¨0" {PRIMS} > primitives
prims.c Ä primitives
echo '#include "mlvalues.h"' > prims.c
diff --git a/byterun/Makefile.Mac.depend b/byterun/Makefile.Mac.depend
index 227cb2695..5e54c1145 100644
--- a/byterun/Makefile.Mac.depend
+++ b/byterun/Makefile.Mac.depend
@@ -38,6 +38,7 @@
minor_gc.h ¶
interp.h ¶
instruct.h ¶
+ fix_code.h ¶
stacks.h
"compare.c.x" Ä compare.c ¶
@@ -281,7 +282,8 @@
gc.h ¶
gc_ctrl.h ¶
major_gc.h ¶
- roots.h
+ roots.h ¶
+ weak.h
"md5.c.x" Ä md5.c ¶
alloc.h ¶
@@ -487,6 +489,19 @@
fail.h ¶
io.h
+"weak.c.x" Ä weak.c ¶
+ alloc.h ¶
+ misc.h ¶
+ config.h ¶
+ ::config:sm-Mac.h ¶
+ mlvalues.h ¶
+ fail.h ¶
+ memory.h ¶
+ gc.h ¶
+ major_gc.h ¶
+ freelist.h ¶
+ minor_gc.h
+
"wincmdline.c.x" Ä wincmdline.c
@@ -529,6 +544,7 @@
minor_gc.h ¶
interp.h ¶
instruct.h ¶
+ fix_code.h ¶
stacks.h
"compare.c.o" Ä compare.c ¶
@@ -772,7 +788,8 @@
gc.h ¶
gc_ctrl.h ¶
major_gc.h ¶
- roots.h
+ roots.h ¶
+ weak.h
"md5.c.o" Ä md5.c ¶
alloc.h ¶
@@ -978,5 +995,18 @@
fail.h ¶
io.h
+"weak.c.o" Ä weak.c ¶
+ alloc.h ¶
+ misc.h ¶
+ config.h ¶
+ ::config:sm-Mac.h ¶
+ mlvalues.h ¶
+ fail.h ¶
+ memory.h ¶
+ gc.h ¶
+ major_gc.h ¶
+ freelist.h ¶
+ minor_gc.h
+
"wincmdline.c.o" Ä wincmdline.c
diff --git a/byterun/floats.c b/byterun/floats.c
index 8efa0966d..f30c08bb5 100644
--- a/byterun/floats.c
+++ b/byterun/floats.c
@@ -213,7 +213,11 @@ value log10_float(f) /* ML */
value modf_float(f) /* ML */
value f;
{
+#if macintosh
+ _float_eval fres;
+#else
double fres;
+#endif
value res;
Push_roots(r, 2);
diff --git a/stdlib/Makefile.Mac.depend b/stdlib/Makefile.Mac.depend
index 1ca2f6a02..a36acf8fd 100644
--- a/stdlib/Makefile.Mac.depend
+++ b/stdlib/Makefile.Mac.depend
@@ -56,3 +56,5 @@ string.cmoÄ char.cmi list.cmi string.cmi
string.cmxÄ char.cmx list.cmx string.cmi
sys.cmoÄ sys.cmi
sys.cmxÄ sys.cmi
+weak.cmoÄ obj.cmi weak.cmi
+weak.cmxÄ obj.cmx weak.cmi
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-03-24 16:29:04 +0000