From e4f810e64f4f774cd6ae3575e6a61cbb3201c375 Mon Sep 17 00:00:00 2001 From: Damien Doligez Date: Apr 30 2013 09:25:14 +0000 Subject: last fixes to make the testsuite work under mingw git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13636 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02 --- diff --git a/asmrun/Makefile.nt b/asmrun/Makefile.nt index 1c214e3..876fe60 100644 --- a/asmrun/Makefile.nt +++ b/asmrun/Makefile.nt @@ -51,10 +51,10 @@ amd64nt.obj: amd64nt.asm $(ASM)amd64nt.obj amd64nt.asm i386.o: i386.S - $(CC) -c -DSYS_$(SYSTEM) i386.S + $(ASPP) -DSYS_$(SYSTEM) i386.S amd64.o: amd64.S - $(CC) -c -DSYS_$(SYSTEM) amd64.S + $(ASPP) -DSYS_$(SYSTEM) amd64.S install: cp libasmrun.$(A) $(LIBDIR) diff --git a/config/Makefile.mingw b/config/Makefile.mingw index 395e82c..f43e820 100644 --- a/config/Makefile.mingw +++ b/config/Makefile.mingw @@ -65,7 +65,7 @@ MKSHAREDLIBRPATH= NATIVECCPROFOPTS= NATIVECCRPATH= ASM=$(TOOLPREF)as -ASPP=gcc +ASPP=gcc -c ASPPPROFFLAGS= PROFILING=noprof DYNLINKOPTS= diff --git a/testsuite/tests/asmcomp/Makefile b/testsuite/tests/asmcomp/Makefile index bbdf5bc..d28ae8c 100644 --- a/testsuite/tests/asmcomp/Makefile +++ b/testsuite/tests/asmcomp/Makefile @@ -16,95 +16,95 @@ CC=$(NATIVECC) CFLAGS=$(NATIVECCCOMPOPTS) -g INCLUDES=\ - -I $(TOPDIR)/utils \ - -I $(TOPDIR)/typing \ - -I $(TOPDIR)/bytecomp \ - -I $(TOPDIR)/asmcomp + -I $(TTOP)/utils \ + -I $(TTOP)/typing \ + -I $(TTOP)/bytecomp \ + -I $(TTOP)/asmcomp OTHEROBJS=\ - $(TOPDIR)/utils/misc.cmo \ - $(TOPDIR)/utils/tbl.cmo \ - $(TOPDIR)/utils/config.cmo \ - $(TOPDIR)/utils/clflags.cmo \ - $(TOPDIR)/utils/terminfo.cmo \ - $(TOPDIR)/utils/ccomp.cmo \ - $(TOPDIR)/utils/warnings.cmo \ - $(TOPDIR)/utils/consistbl.cmo \ - $(TOPDIR)/parsing/location.cmo \ - $(TOPDIR)/parsing/longident.cmo \ - $(TOPDIR)/parsing/syntaxerr.cmo \ - $(TOPDIR)/parsing/parser.cmo \ - $(TOPDIR)/parsing/lexer.cmo \ - $(TOPDIR)/parsing/parse.cmo \ - $(TOPDIR)/parsing/printast.cmo \ - $(TOPDIR)/typing/ident.cmo \ - $(TOPDIR)/typing/path.cmo \ - $(TOPDIR)/typing/primitive.cmo \ - $(TOPDIR)/typing/types.cmo \ - $(TOPDIR)/typing/btype.cmo \ - $(TOPDIR)/typing/oprint.cmo \ - $(TOPDIR)/typing/subst.cmo \ - $(TOPDIR)/typing/predef.cmo \ - $(TOPDIR)/typing/datarepr.cmo \ - $(TOPDIR)/typing/cmi_format.cmo \ - $(TOPDIR)/typing/env.cmo \ - $(TOPDIR)/typing/typedtree.cmo \ - $(TOPDIR)/typing/ctype.cmo \ - $(TOPDIR)/typing/printtyp.cmo \ - $(TOPDIR)/typing/includeclass.cmo \ - $(TOPDIR)/typing/mtype.cmo \ - $(TOPDIR)/typing/includecore.cmo \ - $(TOPDIR)/typing/includemod.cmo \ - $(TOPDIR)/typing/parmatch.cmo \ - $(TOPDIR)/typing/typetexp.cmo \ - $(TOPDIR)/typing/typedtreeMap.cmo \ - $(TOPDIR)/typing/cmt_format.cmo \ - $(TOPDIR)/typing/stypes.cmo \ - $(TOPDIR)/typing/typecore.cmo \ - $(TOPDIR)/typing/typedecl.cmo \ - $(TOPDIR)/typing/typeclass.cmo \ - $(TOPDIR)/typing/typemod.cmo \ - $(TOPDIR)/bytecomp/lambda.cmo \ - $(TOPDIR)/bytecomp/printlambda.cmo \ - $(TOPDIR)/bytecomp/typeopt.cmo \ - $(TOPDIR)/bytecomp/switch.cmo \ - $(TOPDIR)/bytecomp/matching.cmo \ - $(TOPDIR)/bytecomp/translobj.cmo \ - $(TOPDIR)/bytecomp/translcore.cmo \ - $(TOPDIR)/bytecomp/translclass.cmo \ - $(TOPDIR)/bytecomp/translmod.cmo \ - $(TOPDIR)/bytecomp/simplif.cmo \ - $(TOPDIR)/bytecomp/runtimedef.cmo \ - $(TOPDIR)/asmcomp/arch.cmo \ - $(TOPDIR)/asmcomp/debuginfo.cmo \ - $(TOPDIR)/asmcomp/cmm.cmo \ - $(TOPDIR)/asmcomp/printcmm.cmo \ - $(TOPDIR)/asmcomp/reg.cmo \ - $(TOPDIR)/asmcomp/mach.cmo \ - $(TOPDIR)/asmcomp/proc.cmo \ - $(TOPDIR)/asmcomp/clambda.cmo \ - $(TOPDIR)/asmcomp/compilenv.cmo \ - $(TOPDIR)/asmcomp/closure.cmo \ - $(TOPDIR)/asmcomp/cmmgen.cmo \ - $(TOPDIR)/asmcomp/printmach.cmo \ - $(TOPDIR)/asmcomp/selectgen.cmo \ - $(TOPDIR)/asmcomp/selection.cmo \ - $(TOPDIR)/asmcomp/comballoc.cmo \ - $(TOPDIR)/asmcomp/liveness.cmo \ - $(TOPDIR)/asmcomp/spill.cmo \ - $(TOPDIR)/asmcomp/split.cmo \ - $(TOPDIR)/asmcomp/interf.cmo \ - $(TOPDIR)/asmcomp/coloring.cmo \ - $(TOPDIR)/asmcomp/reloadgen.cmo \ - $(TOPDIR)/asmcomp/reload.cmo \ - $(TOPDIR)/asmcomp/printlinear.cmo \ - $(TOPDIR)/asmcomp/linearize.cmo \ - $(TOPDIR)/asmcomp/schedgen.cmo \ - $(TOPDIR)/asmcomp/scheduling.cmo \ - $(TOPDIR)/asmcomp/emitaux.cmo \ - $(TOPDIR)/asmcomp/emit.cmo \ - $(TOPDIR)/asmcomp/printclambda.cmo \ - $(TOPDIR)/asmcomp/asmgen.cmo + $(TTOP)/utils/misc.cmo \ + $(TTOP)/utils/tbl.cmo \ + $(TTOP)/utils/config.cmo \ + $(TTOP)/utils/clflags.cmo \ + $(TTOP)/utils/terminfo.cmo \ + $(TTOP)/utils/ccomp.cmo \ + $(TTOP)/utils/warnings.cmo \ + $(TTOP)/utils/consistbl.cmo \ + $(TTOP)/parsing/location.cmo \ + $(TTOP)/parsing/longident.cmo \ + $(TTOP)/parsing/syntaxerr.cmo \ + $(TTOP)/parsing/parser.cmo \ + $(TTOP)/parsing/lexer.cmo \ + $(TTOP)/parsing/parse.cmo \ + $(TTOP)/parsing/printast.cmo \ + $(TTOP)/typing/ident.cmo \ + $(TTOP)/typing/path.cmo \ + $(TTOP)/typing/primitive.cmo \ + $(TTOP)/typing/types.cmo \ + $(TTOP)/typing/btype.cmo \ + $(TTOP)/typing/oprint.cmo \ + $(TTOP)/typing/subst.cmo \ + $(TTOP)/typing/predef.cmo \ + $(TTOP)/typing/datarepr.cmo \ + $(TTOP)/typing/cmi_format.cmo \ + $(TTOP)/typing/env.cmo \ + $(TTOP)/typing/typedtree.cmo \ + $(TTOP)/typing/ctype.cmo \ + $(TTOP)/typing/printtyp.cmo \ + $(TTOP)/typing/includeclass.cmo \ + $(TTOP)/typing/mtype.cmo \ + $(TTOP)/typing/includecore.cmo \ + $(TTOP)/typing/includemod.cmo \ + $(TTOP)/typing/parmatch.cmo \ + $(TTOP)/typing/typetexp.cmo \ + $(TTOP)/typing/typedtreeMap.cmo \ + $(TTOP)/typing/cmt_format.cmo \ + $(TTOP)/typing/stypes.cmo \ + $(TTOP)/typing/typecore.cmo \ + $(TTOP)/typing/typedecl.cmo \ + $(TTOP)/typing/typeclass.cmo \ + $(TTOP)/typing/typemod.cmo \ + $(TTOP)/bytecomp/lambda.cmo \ + $(TTOP)/bytecomp/printlambda.cmo \ + $(TTOP)/bytecomp/typeopt.cmo \ + $(TTOP)/bytecomp/switch.cmo \ + $(TTOP)/bytecomp/matching.cmo \ + $(TTOP)/bytecomp/translobj.cmo \ + $(TTOP)/bytecomp/translcore.cmo \ + $(TTOP)/bytecomp/translclass.cmo \ + $(TTOP)/bytecomp/translmod.cmo \ + $(TTOP)/bytecomp/simplif.cmo \ + $(TTOP)/bytecomp/runtimedef.cmo \ + $(TTOP)/asmcomp/arch.cmo \ + $(TTOP)/asmcomp/debuginfo.cmo \ + $(TTOP)/asmcomp/cmm.cmo \ + $(TTOP)/asmcomp/printcmm.cmo \ + $(TTOP)/asmcomp/reg.cmo \ + $(TTOP)/asmcomp/mach.cmo \ + $(TTOP)/asmcomp/proc.cmo \ + $(TTOP)/asmcomp/clambda.cmo \ + $(TTOP)/asmcomp/compilenv.cmo \ + $(TTOP)/asmcomp/closure.cmo \ + $(TTOP)/asmcomp/cmmgen.cmo \ + $(TTOP)/asmcomp/printmach.cmo \ + $(TTOP)/asmcomp/selectgen.cmo \ + $(TTOP)/asmcomp/selection.cmo \ + $(TTOP)/asmcomp/comballoc.cmo \ + $(TTOP)/asmcomp/liveness.cmo \ + $(TTOP)/asmcomp/spill.cmo \ + $(TTOP)/asmcomp/split.cmo \ + $(TTOP)/asmcomp/interf.cmo \ + $(TTOP)/asmcomp/coloring.cmo \ + $(TTOP)/asmcomp/reloadgen.cmo \ + $(TTOP)/asmcomp/reload.cmo \ + $(TTOP)/asmcomp/printlinear.cmo \ + $(TTOP)/asmcomp/linearize.cmo \ + $(TTOP)/asmcomp/schedgen.cmo \ + $(TTOP)/asmcomp/scheduling.cmo \ + $(TTOP)/asmcomp/emitaux.cmo \ + $(TTOP)/asmcomp/emit.cmo \ + $(TTOP)/asmcomp/printclambda.cmo \ + $(TTOP)/asmcomp/asmgen.cmo OBJS=parsecmmaux.cmo parsecmm.cmo lexcmm.cmo diff --git a/testsuite/tests/utils/Makefile b/testsuite/tests/utils/Makefile index 61c55d8..ff1648f 100644 --- a/testsuite/tests/utils/Makefile +++ b/testsuite/tests/utils/Makefile @@ -1,6 +1,6 @@ BASEDIR=../.. MODULES=testing misc -INCLUDES= -I "$(TTOP)/utils" +INCLUDES= -I $(TTOP)/utils ADD_COMPFLAGS=$(INCLUDES) CMO_FILES+="misc.cmo"