summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.Mac2
-rw-r--r--Makefile.Mac.depend19
-rw-r--r--byterun/Makefile.Mac2
-rw-r--r--byterun/Makefile.Mac.depend6
-rw-r--r--byterun/rotatecursor.c4
-rw-r--r--byterun/rotatecursor.h6
-rw-r--r--otherlibs/win32unix/.depend3
-rw-r--r--stdlib/Makefile.Mac2
-rw-r--r--stdlib/Makefile.Mac.depend10
-rw-r--r--tools/Makefile.Mac.depend16
-rw-r--r--yacc/Makefile.Mac2
11 files changed, 43 insertions, 29 deletions
diff --git a/Makefile.Mac b/Makefile.Mac
index 3a5636919..df14a3c98 100644
--- a/Makefile.Mac
+++ b/Makefile.Mac
@@ -65,7 +65,7 @@ EXPUNGEOBJS = :utils:misc.cmo :utils:tbl.cmo ¶
PERVASIVES = arg array char digest filename format gc hashtbl lexing list map ¶
obj parsing pervasives printexc printf queue random set sort ¶
- stack string stream sys oo genlex topdirs weak
+ stack string stream sys oo genlex topdirs toploop weak
# Recompile the system using the bootstrap compiler
all Ä runtime ocamlc ocamllex ocamlyacc ocamltools library ocaml otherlibraries
diff --git a/Makefile.Mac.depend b/Makefile.Mac.depend
index 781d26905..61fec11a3 100644
--- a/Makefile.Mac.depend
+++ b/Makefile.Mac.depend
@@ -20,6 +20,7 @@
:parsing:parsetree.cmiÄ :parsing:asttypes.cmi :parsing:location.cmi ¶
:parsing:longident.cmi
:parsing:pstream.cmiÄ :parsing:parsetree.cmi
+:parsing:syntaxerr.cmiÄ :parsing:location.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:linenum.cmoÄ :utils:misc.cmi :parsing:linenum.cmi
@@ -31,19 +32,21 @@
: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 ¶
- :parsing:parser.cmi :parsing:parse.cmi
+ :parsing:parser.cmi :parsing:syntaxerr.cmi :parsing:parse.cmi
:parsing:parse.cmxÄ :parsing:lexer.cmx :parsing:location.cmx ¶
- :parsing:parser.cmx :parsing:parse.cmi
+ :parsing:parser.cmx :parsing:syntaxerr.cmx :parsing:parse.cmi
:parsing:parser.cmoÄ :parsing:asttypes.cmi :utils:clflags.cmo ¶
:parsing:location.cmi :parsing:longident.cmi :parsing:parsetree.cmi ¶
- :parsing:pstream.cmi :parsing:parser.cmi
+ :parsing:pstream.cmi :parsing:syntaxerr.cmi :parsing:parser.cmi
:parsing:parser.cmxÄ :parsing:asttypes.cmi :utils:clflags.cmx ¶
:parsing:location.cmx :parsing:longident.cmx :parsing:parsetree.cmi ¶
- :parsing:pstream.cmx :parsing:parser.cmi
+ :parsing:pstream.cmx :parsing:syntaxerr.cmx :parsing:parser.cmi
:parsing:pstream.cmoÄ :parsing:asttypes.cmi :parsing:location.cmi ¶
:parsing:longident.cmi :parsing:parsetree.cmi :parsing:pstream.cmi
:parsing:pstream.cmxÄ :parsing:asttypes.cmi :parsing:location.cmx ¶
:parsing:longident.cmx :parsing:parsetree.cmi :parsing:pstream.cmi
+:parsing:syntaxerr.cmoÄ :parsing:location.cmi :parsing:syntaxerr.cmi
+:parsing:syntaxerr.cmxÄ :parsing:location.cmx :parsing:syntaxerr.cmi
:typing:btype.cmiÄ :typing:path.cmi :typing:types.cmi
:typing:ctype.cmiÄ :parsing:asttypes.cmi :typing:env.cmi :typing:ident.cmi ¶
:typing:types.cmi
@@ -361,13 +364,13 @@
:driver:compile.cmi
:driver:errors.cmoÄ :bytecomp:bytelibrarian.cmi :bytecomp:bytelink.cmi ¶
:typing:env.cmi :typing:includemod.cmi :parsing:lexer.cmi ¶
- :parsing:location.cmi :parsing:parse.cmi :bytecomp:symtable.cmi ¶
+ :parsing:location.cmi :bytecomp:symtable.cmi :parsing:syntaxerr.cmi ¶
:bytecomp:translcore.cmi :typing:typeclass.cmi :typing:typecore.cmi ¶
:typing:typedecl.cmi :typing:typemod.cmi :typing:typetexp.cmi ¶
:driver:errors.cmi
:driver:errors.cmxÄ :bytecomp:bytelibrarian.cmx :bytecomp:bytelink.cmx ¶
:typing:env.cmx :typing:includemod.cmx :parsing:lexer.cmx ¶
- :parsing:location.cmx :parsing:parse.cmx :bytecomp:symtable.cmx ¶
+ :parsing:location.cmx :bytecomp:symtable.cmx :parsing:syntaxerr.cmx ¶
:bytecomp:translcore.cmx :typing:typeclass.cmx :typing:typecore.cmx ¶
:typing:typedecl.cmx :typing:typemod.cmx :typing:typetexp.cmx ¶
:driver:errors.cmi
@@ -388,12 +391,12 @@
:typing:printtyp.cmx :bytecomp:simplif.cmx :bytecomp:translmod.cmx ¶
:typing:typedtree.cmx :typing:typemod.cmx :driver:optcompile.cmi
:driver:opterrors.cmoÄ :typing:env.cmi :typing:includemod.cmi ¶
- :parsing:lexer.cmi :parsing:location.cmi :parsing:parse.cmi ¶
+ :parsing:lexer.cmi :parsing:location.cmi :parsing:syntaxerr.cmi ¶
:bytecomp:translcore.cmi :typing:typeclass.cmi :typing:typecore.cmi ¶
:typing:typedecl.cmi :typing:typemod.cmi :typing:typetexp.cmi ¶
:driver:opterrors.cmi
:driver:opterrors.cmxÄ :typing:env.cmx :typing:includemod.cmx ¶
- :parsing:lexer.cmx :parsing:location.cmx :parsing:parse.cmx ¶
+ :parsing:lexer.cmx :parsing:location.cmx :parsing:syntaxerr.cmx ¶
:bytecomp:translcore.cmx :typing:typeclass.cmx :typing:typecore.cmx ¶
:typing:typedecl.cmx :typing:typemod.cmx :typing:typetexp.cmx ¶
:driver:opterrors.cmi
diff --git a/byterun/Makefile.Mac b/byterun/Makefile.Mac
index 93eadc71c..64cb99f69 100644
--- a/byterun/Makefile.Mac
+++ b/byterun/Makefile.Mac
@@ -1,7 +1,7 @@
C = sc
COptions = -model far
AOptions = -model far -wb
-LinkOptions = -model far -msg nodup -compact -pad 0 -state nouse
+LinkOptions = -model far -msg nodup -compact -pad 0 -state nouse -br 68k
Libs = "{libraries}IntEnv.far.o" "{libraries}MacRuntime.o" ¶
"{clibraries}StdCLib.far.o" "{libraries}MathLib.far.o" ¶
"{libraries}ToolLibs.o" "{libraries}Interface.o"
diff --git a/byterun/Makefile.Mac.depend b/byterun/Makefile.Mac.depend
index 1144afb40..5995dc2c0 100644
--- a/byterun/Makefile.Mac.depend
+++ b/byterun/Makefile.Mac.depend
@@ -112,6 +112,7 @@
::config:sm-Mac.h ¶
mlvalues.h ¶
fail.h ¶
+ io.h ¶
gc.h ¶
memory.h ¶
major_gc.h ¶
@@ -306,6 +307,8 @@
gc_ctrl.h ¶
major_gc.h ¶
roots.h ¶
+ memory.h ¶
+ minor_gc.h ¶
weak.h
"md5.c.x" Ä md5.c ¶
@@ -644,6 +647,7 @@
::config:sm-Mac.h ¶
mlvalues.h ¶
fail.h ¶
+ io.h ¶
gc.h ¶
memory.h ¶
major_gc.h ¶
@@ -838,6 +842,8 @@
gc_ctrl.h ¶
major_gc.h ¶
roots.h ¶
+ memory.h ¶
+ minor_gc.h ¶
weak.h
"md5.c.o" Ä md5.c ¶
diff --git a/byterun/rotatecursor.c b/byterun/rotatecursor.c
index 85eb31161..36715b567 100644
--- a/byterun/rotatecursor.c
+++ b/byterun/rotatecursor.c
@@ -70,9 +70,9 @@ void rotatecursor_init (int volatile *p1, int volatile *p2)
atexit (remove_task);
}
-int rotatecursor_action (int direction)
+int rotatecursor_action (int reverse)
{
PrimeTime ((QElemPtr) &mytmtask, 50); /* 20 Hz */
- RotateCursor (direction ? 32 : -32);
+ RotateCursor (reverse ? -32 : 32);
return 0;
}
diff --git a/byterun/rotatecursor.h b/byterun/rotatecursor.h
index 11230d23e..c15226e8d 100644
--- a/byterun/rotatecursor.h
+++ b/byterun/rotatecursor.h
@@ -21,9 +21,9 @@
*/
void rotatecursor_init (int volatile *p1, int volatile *p2);
-/* [direction] is 1 to rotate the cursor clockwise, 0 to rotate
- counterclockwise. This function always returns 0.
+/* [reverse] is 0 to rotate the cursor clockwise, anything else to
+ rotate counterclockwise. This function always returns 0.
*/
-int rotatecursor_action (int direction);
+int rotatecursor_action (int reverse);
#endif /* _rotatecursor_ */
diff --git a/otherlibs/win32unix/.depend b/otherlibs/win32unix/.depend
index 34d97d87e..c4d3aaa13 100644
--- a/otherlibs/win32unix/.depend
+++ b/otherlibs/win32unix/.depend
@@ -1,3 +1,6 @@
envir.o: envir.c
+
errmsg.o: errmsg.c
+
startup.o: startup.c
+
diff --git a/stdlib/Makefile.Mac b/stdlib/Makefile.Mac
index 2cec6694c..f582bcd9d 100644
--- a/stdlib/Makefile.Mac
+++ b/stdlib/Makefile.Mac
@@ -4,7 +4,7 @@ CAMLC = {RUNTIME} {COMPILER}
CAMLDEP = ::boot:ocamlrun ::tools:ocamldep
OBJS = pervasives.cmo list.cmo char.cmo string.cmo array.cmo sys.cmo ¶
- hashtbl.cmo sort.cmo filename.cmo obj.cmo marshal.cmo ¶
+ hashtbl.cmo sort.cmo filename.cmo marshal.cmo obj.cmo ¶
lexing.cmo parsing.cmo ¶
set.cmo map.cmo stack.cmo queue.cmo stream.cmo ¶
printf.cmo format.cmo arg.cmo printexc.cmo gc.cmo ¶
diff --git a/stdlib/Makefile.Mac.depend b/stdlib/Makefile.Mac.depend
index d18f94709..5c9ddcbbc 100644
--- a/stdlib/Makefile.Mac.depend
+++ b/stdlib/Makefile.Mac.depend
@@ -12,14 +12,16 @@ digest.cmoÄ string.cmi digest.cmi
digest.cmxÄ string.cmx digest.cmi
filename.cmoÄ string.cmi sys.cmi filename.cmi
filename.cmxÄ string.cmx sys.cmx filename.cmi
-format.cmoÄ string.cmi format.cmi
-format.cmxÄ string.cmx format.cmi
+format.cmoÄ obj.cmi string.cmi format.cmi
+format.cmxÄ obj.cmx string.cmx format.cmi
gc.cmoÄ printf.cmi gc.cmi
gc.cmxÄ printf.cmx gc.cmi
genlex.cmoÄ char.cmi hashtbl.cmi list.cmi stream.cmi string.cmi genlex.cmi
genlex.cmxÄ char.cmx hashtbl.cmx list.cmx stream.cmx string.cmx genlex.cmi
hashtbl.cmoÄ array.cmi hashtbl.cmi
hashtbl.cmxÄ array.cmx hashtbl.cmi
+lazy.cmoÄ lazy.cmi
+lazy.cmxÄ lazy.cmi
lexing.cmoÄ string.cmi lexing.cmi
lexing.cmxÄ string.cmx lexing.cmi
list.cmoÄ list.cmi
@@ -28,8 +30,8 @@ map.cmoÄ map.cmi
map.cmxÄ map.cmi
marshal.cmoÄ string.cmi marshal.cmi
marshal.cmxÄ string.cmx marshal.cmi
-obj.cmoÄ obj.cmi
-obj.cmxÄ obj.cmi
+obj.cmoÄ marshal.cmi obj.cmi
+obj.cmxÄ marshal.cmx obj.cmi
oo.cmoÄ array.cmi hashtbl.cmi list.cmi map.cmi obj.cmi random.cmi sort.cmi ¶
sys.cmi oo.cmi
oo.cmxÄ array.cmx hashtbl.cmx list.cmx map.cmx obj.cmx random.cmx sort.cmx ¶
diff --git a/tools/Makefile.Mac.depend b/tools/Makefile.Mac.depend
index c88b76109..d6a626bd1 100644
--- a/tools/Makefile.Mac.depend
+++ b/tools/Makefile.Mac.depend
@@ -1,22 +1,22 @@
dumpapprox.cmoÄ ::asmcomp:clambda.cmi ::asmcomp:compilenv.cmi ¶
::utils:config.cmi
dumpapprox.cmxÄ ::asmcomp:clambda.cmx ::asmcomp:compilenv.cmx ¶
- ::utils:config.cmx
+ ::utils:config.cmi
dumpobj.cmoÄ ::parsing:asttypes.cmi ::utils:config.cmi ¶
::bytecomp:emitcode.cmi ::typing:ident.cmi ::bytecomp:lambda.cmi ¶
- ::bytecomp:opcodes.cmo opnames.cmo ::utils:tbl.cmi
-dumpobj.cmxÄ ::parsing:asttypes.cmi ::utils:config.cmx ¶
+ opnames.cmo ::utils:tbl.cmi
+dumpobj.cmxÄ ::parsing:asttypes.cmi ::utils:config.cmi ¶
::bytecomp:emitcode.cmx ::typing:ident.cmx ::bytecomp:lambda.cmx ¶
- ::bytecomp:opcodes.cmx opnames.cmx ::utils:tbl.cmx
+ opnames.cmx ::utils:tbl.cmx
objinfo.cmoÄ ::utils:config.cmi ::bytecomp:emitcode.cmi
-objinfo.cmxÄ ::utils:config.cmx ::bytecomp:emitcode.cmx
+objinfo.cmxÄ ::utils:config.cmi ::bytecomp:emitcode.cmx
ocamldep.cmoÄ ::utils:misc.cmi
ocamldep.cmxÄ ::utils:misc.cmx
ocamlprof.cmoÄ ::utils:clflags.cmo ::utils:config.cmi ::parsing:lexer.cmi ¶
::parsing:location.cmi ::utils:misc.cmi ::parsing:parse.cmi ¶
- ::parsing:parsetree.cmi
-ocamlprof.cmxÄ ::utils:clflags.cmx ::utils:config.cmx ::parsing:lexer.cmx ¶
+ ::parsing:parsetree.cmi ::parsing:syntaxerr.cmi
+ocamlprof.cmxÄ ::utils:clflags.cmx ::utils:config.cmi ::parsing:lexer.cmi ¶
::parsing:location.cmx ::utils:misc.cmx ::parsing:parse.cmx ¶
- ::parsing:parsetree.cmi
+ ::parsing:parsetree.cmi ::parsing:syntaxerr.cmx
profiling.cmoÄ profiling.cmi
profiling.cmxÄ profiling.cmi
diff --git a/yacc/Makefile.Mac b/yacc/Makefile.Mac
index 1c3632d51..4b4c62e70 100644
--- a/yacc/Makefile.Mac
+++ b/yacc/Makefile.Mac
@@ -2,7 +2,7 @@
C = sc
COptions = -d NDEBUG -model far -w 2
-LinkOptions = -model far -msg nodup -compact -state nouse
+LinkOptions = -model far -msg nodup -compact -state nouse -br 68k
Libs = "{libraries}IntEnv.far.o" "{libraries}MacRuntime.o" ¶
"{clibraries}StdCLib.far.o" "{libraries}MathLib.far.o" ¶
"{libraries}ToolLibs.o" "{libraries}Interface.o"
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-03-20 08:48:15 +0000