diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 2011-12-16 17:02:48 +0000 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 2011-12-16 17:02:48 +0000 |
| commit | e10723e701f219df799548e8b07025585eafbecf (patch) | |
| tree | 3521e670f81318e8aa6a9263e0957700743a6c7b /Makefile.nt | |
| parent | 7ff9d50434e589968380c988dded37cda384b96c (diff) | |
Merged proc_nt.ml into proc.ml in directories asmcomp/i386 and asmcomp/amd64.
This avoids much code duplication and is a baby step towards Mingw-64 bits
support (PR#5179). (There will be no need to create a third proc_xxx.ml
file for this configuration.)
Also, in amd64/emit_nt.mlp, the ml64 assembler didn't like my label subtractions, so I put the jumptable in code area instead of in data area.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11319 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'Makefile.nt')
| -rw-r--r-- | Makefile.nt | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Makefile.nt b/Makefile.nt index 870374566..69b8d6a4d 100644 --- a/Makefile.nt +++ b/Makefile.nt @@ -432,15 +432,13 @@ partialclean:: beforedepend:: asmcomp/arch.ml ifeq ($(TOOLCHAIN),msvc) -ASMCOMP_PROC=asmcomp/$(ARCH)/proc_nt.ml ASMCOMP_EMIT=asmcomp/$(ARCH)/emit_nt.mlp else -ASMCOMP_PROC=asmcomp/$(ARCH)/proc.ml ASMCOMP_EMIT=asmcomp/$(ARCH)/emit.mlp endif -asmcomp/proc.ml: $(ASMCOMP_PROC) - cp $(ASMCOMP_PROC) asmcomp/proc.ml +asmcomp/proc.ml: asmcomp/$(ARCH)/proc.ml + cp asmcomp/$(ARCH)/proc.ml asmcomp/proc.ml partialclean:: rm -f asmcomp/proc.ml |