* mini-s390x.c, mini-s390x.h: Check for presence of long displacement

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

diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am
index 1932492074d4213dfa6323d15d921c1217101b15..1a18d4ba01925d65ff819c2b1d83934eb5b40716 100644 (file)
--- a/mono/mini/Makefile.am
+++ b/mono/mini/Makefile.am
@@ -163,6 +163,7 @@ s390x_sources = \
        mini-s390x.c            \
        mini-s390x.h            \
        exceptions-s390x.c      \
+       mini-codegen.c          \
        tramp-s390x.c
 
 ia64_sources = \
@@ -218,13 +219,21 @@ test_sources =            \
        iltests.il              \
        test.cs
 
+test_sources2 = generics.2.cs
+
+if MONO_DEBUGGER_SUPPORTED
+mono_debugger_sources = debug-debugger.c debug-debugger.h
+else
+mono_debugger_sources =
+endif
+
 regtests=basic.exe arrays.exe basic-float.exe basic-math.exe basic-long.exe objects.exe basic-calls.exe iltests.exe exceptions.exe bench.exe
 regtests2=generics.exe
 common_BURGSRC= $(srcdir)/inssel.brg $(srcdir)/inssel-float.brg
 
 if X86
 libmono_la_SOURCES = \
-       $(common_sources) $(x86_sources)
+       $(common_sources) $(x86_sources) $(mono_debugger_sources)
 
 arch_BURGSRC= $(srcdir)/inssel-long32.brg $(srcdir)/inssel-x86.brg
 arch_built=cpu-pentium.h
@@ -232,7 +241,7 @@ endif
 
 if AMD64
 libmono_la_SOURCES = \
-       $(common_sources) $(amd64_sources)
+       $(common_sources) $(amd64_sources) $(mono_debugger_sources)
 arch_BURGSRC= $(srcdir)/inssel-long.brg $(srcdir)/inssel-amd64.brg
 arch_built=cpu-amd64.h
 endif
@@ -318,13 +327,13 @@ libmono_la_LIBADD = \
        $(GMCS) -out:$@ $< -r:TestDriver.dll 
 
 %.exe: %.cs TestDriver.dll
-       $(MCS) /out:$*.exe /unsafe $< /r:TestDriver.dll
+       $(MCS) -out:$@ -unsafe $< -r:TestDriver.dll
 
 %.exe: %.il
-       $(ILASM) /output=$*.exe $<
+       $(ILASM) -output=$@ $<
 
 TestDriver.dll: $(srcdir)/TestDriver.cs
-       $(MCS) /out:TestDriver.dll /target:library $(srcdir)/TestDriver.cs
+       $(MCS) -out:$@ -target:library $<
 
 if CROSS_COMPILING
 
@@ -427,7 +436,8 @@ BUILT_SOURCES= inssel.c inssel.h $(arch_built)
 endif
 
 CLEANFILES= $(BUILT_SOURCES) *.exe *.dll
-EXTRA_DIST = $(common_BURGSRC) jit-icalls.c cprop.c TestDriver.cs ldscript ldscript.mono $(test_sources) \
+EXTRA_DIST = $(common_BURGSRC) jit-icalls.c cprop.c TestDriver.cs ldscript ldscript.mono \
+       $(test_sources) $(test_sources2) \
        inssel-long.brg inssel-long32.brg \
        $(x86_sources) inssel-x86.brg cpu-pentium.md \
        $(amd64_sources) inssel-amd64.brg cpu-amd64.md \