diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 1996-05-07 13:09:26 +0000 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 1996-05-07 13:09:26 +0000 |
| commit | 757bc071411fdeb8286595ec0bd7cf244c9fdbf8 (patch) | |
| tree | a66c2603626b1431b3a2f7438371b93cbb4069c9 | |
| parent | ab756fbfe310fe1b25c0ea16554258520a579c87 (diff) | |
MAJ pour ocaml.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@800 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | asmcomp/emit_i386nt.mlp | 4 | ||||
| -rw-r--r-- | byterun/Makefile.nt | 2 | ||||
| -rw-r--r-- | config/Makefile.nt | 6 | ||||
| -rw-r--r-- | stdlib/Makefile.nt | 10 |
4 files changed, 11 insertions, 11 deletions
diff --git a/asmcomp/emit_i386nt.mlp b/asmcomp/emit_i386nt.mlp index 542cdc699..c7695ef26 100644 --- a/asmcomp/emit_i386nt.mlp +++ b/asmcomp/emit_i386nt.mlp @@ -36,11 +36,11 @@ let stack_offset = ref 0 let frame_size () = (* includes return address *) !stack_offset + 4 * num_stack_slots.(0) + 8 * num_stack_slots.(1) + 4 -let slot_offset loc class = +let slot_offset loc cl = match loc with Incoming n -> frame_size() + n | Local n -> - if class = 0 + if cl = 0 then !stack_offset + n * 4 else !stack_offset + num_stack_slots.(0) * 4 + n * 8 | Outgoing n -> n diff --git a/byterun/Makefile.nt b/byterun/Makefile.nt index 5ccf84c41..10a116bdb 100644 --- a/byterun/Makefile.nt +++ b/byterun/Makefile.nt @@ -16,7 +16,7 @@ PRIMS=array.c compare.c extern.c floats.c gc_ctrl.c hash.c \ all: ocamlrun.exe ocamlrun.exe: $(OBJS) prims.obj - $(BYTECC) $(BYTECCCOMPOPTS) $(BYTECCLINKOPTS) /Fecslrun.exe prims.obj $(OBJS) $(CCLIBS) + $(BYTECC) $(BYTECCCOMPOPTS) $(BYTECCLINKOPTS) -o ocamlrun.exe prims.obj $(OBJS) $(CCLIBS) install: cp ocamlrun.exe $(BINDIR)\ocamlrun.exe diff --git a/config/Makefile.nt b/config/Makefile.nt index 1b7ab562e..a77c1530c 100644 --- a/config/Makefile.nt +++ b/config/Makefile.nt @@ -3,13 +3,13 @@ ######### General configuration ### Where to install the binaries -BINDIR=c:\camlsl\bin +BINDIR=c:\ocaml\bin ### Where to install the standard library -LIBDIR=c:\camlsl\lib +LIBDIR=c:\ocaml\lib ### Where to install the info files -DISTRIB=c:\camlsl +DISTRIB=c:\ocaml ########## Configuration for the bytecode compiler diff --git a/stdlib/Makefile.nt b/stdlib/Makefile.nt index acbcc33c4..7f42beb22 100644 --- a/stdlib/Makefile.nt +++ b/stdlib/Makefile.nt @@ -13,12 +13,12 @@ OBJS=pervasives.cmo list.cmo string.cmo char.cmo array.cmo sys.cmo \ printf.cmo format.cmo arg.cmo printexc.cmo gc.cmo \ digest.cmo random.cmo oo.cmo -all: stdlib.cma std_exit.cmo ocamlheader +all: stdlib.cma std_exit.cmo camlheader allopt: stdlib.cmxa std_exit.cmx install: - cp stdlib.cma std_exit.cmo *.cmi *.mli ocamlheader $(LIBDIR) + cp stdlib.cma std_exit.cmo *.cmi *.mli camlheader $(LIBDIR) installopt: cp stdlib.cmxa stdlib.lib std_exit.obj *.cmx $(LIBDIR) @@ -29,11 +29,11 @@ stdlib.cma: $(OBJS) stdlib.cmxa: $(OBJS:.cmo=.cmx) $(CAMLOPT) -a -o stdlib.cmxa $(OBJS:.cmo=.cmx) -ocamlheader: headernt.c ..\config\Makefile.nt - $(BYTECC) $(BYTECCCOMPOPTS) $(BYTECCLINKOPTS) -Fecslheader. headernt.c +camlheader: headernt.c ..\config\Makefile.nt + $(BYTECC) $(BYTECCCOMPOPTS) $(BYTECCLINKOPTS) -o camlheader. headernt.c clean:: - rm -f ocamlheader + rm -f camlheader pervasives.cmi: pervasives.mli $(CAMLC) $(COMPFLAGS) -nopervasives -c pervasives.mli |