summaryrefslogtreecommitdiff
path: root/Makefile.nt
diff options
context:
space:
mode:
authorAlain Frisch <alain@frisch.fr>2014-09-02 15:07:59 +0000
committerAlain Frisch <alain@frisch.fr>2014-09-02 15:07:59 +0000
commit2478ce96ea83e0e2ea9b8b0a994beae5e4e8acf0 (patch)
tree5b4a552869bb215ea7a7b930340768ffda42f89a /Makefile.nt
parent8565699c41c0b5d162a887d7af51d82597cd347a (diff)
downloadocaml-2478ce96ea83e0e2ea9b8b0a994beae5e4e8acf0.tar.gz
Only include Intel_* modules when arch is i386 or amd64.
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/abstract_intel_emit@15180 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'Makefile.nt')
-rw-r--r--Makefile.nt24
1 files changed, 10 insertions, 14 deletions
diff --git a/Makefile.nt b/Makefile.nt
index 618ba64d78..c9ca88db6a 100644
--- a/Makefile.nt
+++ b/Makefile.nt
@@ -75,14 +75,16 @@ BYTECOMP=bytecomp/meta.cmo bytecomp/instruct.cmo bytecomp/bytegen.cmo \
bytecomp/bytelink.cmo bytecomp/bytelibrarian.cmo bytecomp/bytepackager.cmo \
driver/errors.cmo driver/compile.cmo
-INTEL_ASM=\
- asmcomp/intel_proc.cmo \
- asmcomp/intel_dsl.cmo \
- asmcomp/intel_gas.cmo \
- asmcomp/intel_masm.cmo
+ARCH_SPECIFIC_ASMCOMP=
+ifeq ($(ARCH),i386)
+ARCH_SPECIFIC_ASMCOMP=$(INTEL_ASM)
+endif
+ifeq ($(ARCH),amd64)
+ARCH_SPECIFIC_ASMCOMP=$(INTEL_ASM)
+endif
ASMCOMP=\
- $(INTEL_ASM) \
+ $(ARCH_SPECIFIC_ASMCOMP) \
asmcomp/arch.cmo asmcomp/debuginfo.cmo \
asmcomp/cmm.cmo asmcomp/printcmm.cmo \
asmcomp/reg.cmo asmcomp/mach.cmo asmcomp/proc.cmo \
@@ -507,12 +509,6 @@ partialclean::
beforedepend:: asmcomp/arch.ml
-#ifeq ($(TOOLCHAIN),msvc)
-#ASMCOMP_EMIT=asmcomp/$(ARCH)/emit_nt.mlp
-#else
-ASMCOMP_EMIT=asmcomp/$(ARCH)/emit.mlp
-#endif
-
asmcomp/proc.ml: asmcomp/$(ARCH)/proc.ml
cp asmcomp/$(ARCH)/proc.ml asmcomp/proc.ml
@@ -555,8 +551,8 @@ beforedepend:: asmcomp/scheduling.ml
# Preprocess the code emitters
-asmcomp/emit.ml: $(ASMCOMP_EMIT) tools/cvt_emit
- boot/ocamlrun tools/cvt_emit < $(ASMCOMP_EMIT) > asmcomp/emit.ml
+asmcomp/emit.ml: asmcomp/$(ARCH)/emit.mlp tools/cvt_emit
+ boot/ocamlrun tools/cvt_emit < asmcomp/$(ARCH)/emit.mlp > asmcomp/emit.ml
partialclean::
rm -f asmcomp/emit.ml