Merge pull request #615 from nealef/master

[mono.git] / mono / mini / Makefile.am.in

diff --git a/mono/mini/Makefile.am.in b/mono/mini/Makefile.am.in
index 7cb26d65f7d7716ed4679a457a970b6fdd0a6dda..4cbf423c40de0ef70d37bdb6a1adda1140e9bcf0 100644 (file)
--- a/mono/mini/Makefile.am.in
+++ b/mono/mini/Makefile.am.in
@@ -293,12 +293,6 @@ sparc_sources = \
        exceptions-sparc.c      \
        tramp-sparc.c
 
-s390_sources = \
-       mini-s390.c             \
-       mini-s390.h             \
-       exceptions-s390.c       \
-       tramp-s390.c
-
 s390x_sources = \
        mini-s390x.c            \
        mini-s390x.h            \
@@ -311,12 +305,6 @@ ia64_sources = \
        exceptions-ia64.c       \
        tramp-ia64.c
 
-alpha_sources = \
-       mini-alpha.c            \
-       mini-alpha.h            \
-       exceptions-alpha.c      \
-       tramp-alpha.c
-
 darwin_sources = \
        mini-darwin.c
 
@@ -420,6 +408,10 @@ test_sources =                     \
        gshared.cs
 
 regtests=basic.exe basic-float.exe basic-long.exe basic-calls.exe objects.exe arrays.exe basic-math.exe exceptions.exe iltests.exe devirtualization.exe generics.exe basic-simd.exe
+if NACL_CODEGEN
+test_sources += nacl.cs
+regtests += nacl.exe
+endif
 
 if X86
 if MONO_DEBUGGER_SUPPORTED
@@ -484,12 +476,6 @@ arch_built=cpu-sparc.h
 arch_define=__sparc__
 endif
 
-if S390
-arch_sources = $(s390_sources)
-arch_built=cpu-s390.h
-arch_define=__s390__
-endif
-
 if S390x
 arch_sources = $(s390x_sources)
 arch_built=cpu-s390x.h
@@ -502,12 +488,6 @@ arch_built = cpu-ia64.h
 arch_define=__ia64__
 endif
 
-if ALPHA
-arch_sources = $(alpha_sources) $(mono_debugger_sources)
-arch_built = cpu-alpha.h
-arch_define=__alpha__
-endif
-
 if HOST_WIN32
 os_sources = $(windows_sources)
 monobin_platform_ldflags=
@@ -565,10 +545,10 @@ libmonoinclude_HEADERS = jit.h
 
 CSFLAGS = -unsafe -nowarn:0219,0169,0414,0649
 
-basic-simd.exe: basic-simd.cs
+basic-simd.exe: basic-simd.cs TestDriver.dll
        $(MCS) -out:$@ $(CSFLAGS) $< -r:TestDriver.dll -r:Mono.Simd.dll
 
-nacl.exe: nacl.cs
+nacl.exe: nacl.cs TestDriver.dll
        $(MCS) -out:$@ $(CSFLAGS) $< -r:TestDriver.dll -r:Mono.Simd.dll
 
 generics.exe: generics.cs TestDriver.dll generics-variant-types.dll
@@ -603,7 +583,11 @@ endif !NACL_CODEGEN
 if CROSS_COMPILING
 GENMDESC_PRG=perl $(srcdir)/genmdesc.pl $(arch_define) $(srcdir) $(GENMDESC_OPTS)
 else !CROSS_COMPILING
+if NACL_CODEGEN
+GENMDESC_PRG=perl $(srcdir)/genmdesc.pl $(arch_define) $(srcdir) $(GENMDESC_OPTS)
+else
 GENMDESC_PRG=./genmdesc $(GENMDESC_OPTS)
+endif
 endif !CROSS_COMPILING
 
 cpu-x86.h: cpu-x86.md genmdesc$(EXEEXT)
@@ -624,18 +608,12 @@ cpu-arm.h: cpu-arm.md genmdesc$(EXEEXT)
 cpu-sparc.h: cpu-sparc.md genmdesc$(EXEEXT)
        $(GENMDESC_PRG) cpu-sparc.h sparc_desc $(srcdir)/cpu-sparc.md
 
-cpu-s390.h: cpu-s390.md genmdesc$(EXEEXT)
-       $(GENMDESC_PRG) cpu-s390.h s390_cpu_desc $(srcdir)/cpu-s390.md
-
 cpu-s390x.h: cpu-s390x.md genmdesc$(EXEEXT)
        $(GENMDESC_PRG) cpu-s390x.h s390x_cpu_desc $(srcdir)/cpu-s390x.md
 
 cpu-ia64.h: cpu-ia64.md genmdesc$(EXEEXT)
        $(GENMDESC_PRG) cpu-ia64.h ia64_desc $(srcdir)/cpu-ia64.md
 
-cpu-alpha.h: cpu-alpha.md genmdesc$(EXEEXT)
-       $(GENMDESC_PRG) cpu-alpha.h alpha_desc $(srcdir)/cpu-alpha.md
-
 cpu-mips.h: cpu-mips.md genmdesc$(EXEEXT)
        $(GENMDESC_PRG) cpu-mips.h mips_desc $(srcdir)/cpu-mips.md
 
@@ -647,7 +625,11 @@ checktests: $(regtests)
        for i in $(regtests); do $(RUNTIME) $$i; done
 
 rcheck: mono $(regtests)
+if NACL_CODEGEN
+       for i in $(regtests); do echo "running test $$i"; $(RUNTIME) $$i --exclude 'NaClDisable' || exit 1; done
+else
        $(RUNTIME) --regression $(regtests)
+endif
 
 gctest: mono gc-test.exe
        MONO_DEBUG_OPTIONS=clear-nursery-at-gc $(RUNTIME) --regression gc-test.exe
@@ -729,13 +711,12 @@ EXTRA_DIST = TestDriver.cs ldscript ldscript.mono \
        $(arm_sources) cpu-arm.md               \
        $(mips_sources) cpu-mips.md             \
        $(sparc_sources) cpu-sparc.md           \
-       $(s390_sources) cpu-s390.md             \
        $(s390x_sources) cpu-s390x.md           \
        $(ia64_sources) cpu-ia64.md             \
-       $(alpha_sources) cpu-alpha.md           \
        $(windows_sources)                      \
        $(darwin_sources) Info.plist            \
-       $(posix_sources)
+       $(posix_sources)                                        \
+       Makefile.am.in
 
 version.h: Makefile
        if test -d $(top_srcdir)/.git; then \