X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2FMakefile.am;h=f31a152aac971e13bd0fd86b8f4b91c6c543ced0;hb=c39145af2464b19374fac41b252e07480ae1a197;hp=4667fc70722a9dc276397e064b8125815934321f;hpb=81b4185368fe9a18a67b9fc4b0d7cf1ee6dd58dc;p=mono.git

diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am
index 4667fc70722..f31a152aac9 100644
--- a/mono/mini/Makefile.am
+++ b/mono/mini/Makefile.am
@@ -1,16 +1,40 @@
 count=100000
 mtest=for_loop
 monodir=$(top_builddir)
+
+# This is needed for automake dependency generation
+if INCLUDED_LIBGC
+libgc_libs=$(monodir)/libgc/libmonogc.la
+libgc_static_libs=$(monodir)/libgc/libmonogc-static.la
+else
+libgc_libs=$(LIBGC_LIBS)
+libgc_static_libs=$(LIBGC_STATIC_LIBS)
+endif
+
 libs=	\
 	$(monodir)/mono/metadata/libmonoruntime.la	\
 	$(monodir)/mono/metadata/libmetadata.la	\
 	$(monodir)/mono/io-layer/libwapi.la	\
 	$(monodir)/mono/utils/libmonoutils.la \
-	$(LIBGC_LIBS)	\
+	$(GMODULE_LIBS)	\
+	$(GLIB_LIBS)	\
+	$(libgc_libs)	\
 	$(ICU_LIBS)
 
-MCS=mcs
-RUNTIME=mono
+static_libs=	\
+	$(monodir)/mono/metadata/libmonoruntime-static.la	\
+	$(monodir)/mono/metadata/libmetadata-static.la	\
+	$(monodir)/mono/io-layer/libwapi.la	\
+	$(monodir)/mono/utils/libmonoutils.la \
+	$(GMODULE_LIBS)	\
+	$(GLIB_LIBS)	\
+	$(libgc_static_libs) \
+	$(ICU_LIBS)
+
+RUNTIME = MONO_PATH=$(mcs_topdir)/class/lib/default MONO_SHARED_DIR=$(mono_build_root)/runtime ./mono --config $(top_builddir)/data/config
+
+MCS = $(RUNTIME) $(mcs_topdir)/class/lib/default/mcs.exe --unsafe -nowarn:0162
+ILASM = $(RUNTIME) $(mcs_topdir)/ilasm/ilasm.exe
 
 INCLUDES = \
 	-I$(top_srcdir) 	\
@@ -33,7 +57,12 @@ monoldflags=
 else
 monoldflags=-Wl,-version-script=$(srcdir)/ldscript
 endif
+
+if PLATFORM_WIN32
+libmono_la_LDFLAGS=-no-undefined -version-info 1:0:0 $(monoldflags)
+else
 libmono_la_LDFLAGS=$(monoldflags)
+endif
 
 if JIT_SUPPORTED
 bin_PROGRAMS = mono
@@ -41,37 +70,52 @@ bin_PROGRAMS = mono
 noinst_PROGRAMS = genmdesc
 
 lib_LTLIBRARIES = libmono.la
+noinst_LTLIBRARIES = libmono-static.la
 endif
 
 mono_SOURCES = \
 	main.c
 
+if STATIC_MONO
+# Link libmono into mono statically
+# This leads to higher performance, especially with TLS
+MONO_LIB=libmono-static.la
+else 
+MONO_LIB=libmono.la
+endif
+
 mono_LDADD = \
-	libmono.la		\
+	$(MONO_LIB)			\
 	$(GLIB_LIBS)		\
 	$(GMODULE_LIBS) -lm	\
 	$(ICU_LIBS)
 
 mono_LDFLAGS = \
-	-export-dynamic
+	$(static_flags) -export-dynamic $(monoldflags)
 
 genmdesc_SOURCES = \
 	mini.h		\
 	genmdesc.c	\
 	helpers.c
 
+# Don't link this against libmetadata to speed up rebuilds
 genmdesc_LDADD = \
-	$(libs) -lm	\
+	$(monodir)/mono/utils/libmonoutils.la $(monodir)/mono/metadata/opcodes.lo -lm	\
 	$(GLIB_LIBS)		\
 	$(GMODULE_LIBS)
 
 x86_sources = \
-    mini-exceptions.c	\
 	mini-x86.c		\
 	mini-x86.h		\
 	exceptions-x86.c	\
 	tramp-x86.c
 
+amd64_sources = \
+	mini-amd64.c		\
+	mini-amd64.h		\
+	exceptions-amd64.c	\
+	tramp-amd64.c
+
 ppc_sources = \
 	mini-ppc.c		\
 	mini-ppc.h		\
@@ -81,7 +125,6 @@ ppc_sources = \
 sparc_sources = \
 	mini-sparc.c		\
 	mini-sparc.h		\
-    mini-exceptions.c	\
 	exceptions-sparc.c	\
 	tramp-sparc.c
 
@@ -91,6 +134,12 @@ s390_sources = \
 	exceptions-s390.c	\
 	tramp-s390.c
 
+s390x_sources = \
+	mini-s390x.c		\
+	mini-s390x.h		\
+	exceptions-s390x.c	\
+	tramp-s390x.c
+
 common_sources = \
 	mini.c		\
 	mini.h		\
@@ -107,11 +156,18 @@ common_sources = \
 	ssa.c		\
 	abcremoval.c	\
 	abcremoval.h	\
+	ssapre.c	\
+	ssapre.h	\
+	ssapre-cee-ops.h \
+	ssapre-mini-ops.h \
 	driver.c	\
 	debug-mini.c	\
 	linear-scan.c	\
 	aot.c		\
-	graph.c	
+	graph.c		\
+	mini-exceptions.c	\
+	declsec.c	\
+	declsec.h
 
 test_sources = 		\
 	basic-calls.cs 	\
@@ -128,21 +184,28 @@ test_sources = 		\
 
 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
 
-common_BURGSRC= $(srcdir)/inssel.brg $(srcdir)/inssel-long32.brg $(srcdir)/inssel-float.brg
+common_BURGSRC= $(srcdir)/inssel.brg $(srcdir)/inssel-float.brg
 
 if X86
 libmono_la_SOURCES = \
 	$(common_sources) $(x86_sources)
 
-arch_BURGSRC= $(srcdir)/inssel-x86.brg
+arch_BURGSRC= $(srcdir)/inssel-long32.brg $(srcdir)/inssel-x86.brg
 arch_built=cpu-pentium.h
 endif
 
+if AMD64
+libmono_la_SOURCES = \
+	$(common_sources) $(amd64_sources)
+arch_BURGSRC= $(srcdir)/inssel-long.brg $(srcdir)/inssel-amd64.brg
+arch_built=cpu-amd64.h
+endif
+
 if POWERPC
 libmono_la_SOURCES = \
 	$(common_sources) $(ppc_sources)
 
-arch_BURGSRC= $(srcdir)/inssel-ppc.brg
+arch_BURGSRC= $(srcdir)/inssel-long32.brg $(srcdir)/inssel-ppc.brg
 arch_built=cpu-g4.h
 endif
 
@@ -150,7 +213,15 @@ if SPARC
 libmono_la_SOURCES = \
 	$(common_sources) $(sparc_sources)
 
-arch_BURGSRC= $(srcdir)/inssel-sparc.brg
+arch_BURGSRC= $(srcdir)/inssel-long32.brg $(srcdir)/inssel-sparc.brg
+arch_built=cpu-sparc.h
+endif
+
+if SPARC64
+libmono_la_SOURCES = \
+	$(common_sources) $(sparc_sources)
+
+arch_BURGSRC= $(srcdir)/inssel-long.brg $(srcdir)/inssel-sparc.brg
 arch_built=cpu-sparc.h
 endif
 
@@ -158,12 +229,25 @@ if S390
 libmono_la_SOURCES = \
 	$(common_sources) $(s390_sources)
 
-arch_BURGSRC= $(srcdir)/inssel-s390.brg
+arch_BURGSRC= $(srcdir)/inssel-long32.brg $(srcdir)/inssel-s390.brg
 arch_built=cpu-s390.h
 endif
 
+if S390x
+libmono_la_SOURCES = \
+	$(common_sources) $(s390x_sources)
+
+arch_BURGSRC= $(srcdir)/inssel-long.brg $(srcdir)/inssel-s390x.brg
+arch_built=cpu-s390x.h
+endif
+
 nodist_libmono_la_SOURCES = inssel.c inssel.h
 
+libmono_static_la_SOURCES = $(libmono_la_SOURCES)
+nodist_libmono_static_la_SOURCES = $(nodist_libmono_la_SOURCES)
+libmono_static_la_LDFLAGS = -static
+libmono_static_la_LIBADD = $(static_libs)
+
 BURGSRC= $(common_BURGSRC) $(arch_BURGSRC)
 
 libmonoincludedir = $(includedir)/mono/jit
@@ -174,17 +258,20 @@ libmono_la_LIBADD = \
 	$(libs)
 
 %.exe: %.cs TestDriver.dll
-	$(MCS) /unsafe $< /r:TestDriver.dll
+	$(MCS) /out:$*.exe /unsafe $< /r:TestDriver.dll
 
 %.exe: %.il
-	ilasm /output=$*.exe $<
+	$(ILASM) /output=$*.exe $<
 
-TestDriver.dll: TestDriver.cs
-	$(MCS) /out:TestDriver.dll /target:library TestDriver.cs
+TestDriver.dll: $(srcdir)/TestDriver.cs
+	$(MCS) /out:TestDriver.dll /target:library $(srcdir)/TestDriver.cs
 
 cpu-pentium.h: cpu-pentium.md genmdesc$(EXEEXT)
 	./genmdesc $(srcdir)/cpu-pentium.md cpu-pentium.h pentium_desc
 
+cpu-amd64.h: cpu-amd64.md genmdesc$(EXEEXT)
+	./genmdesc $(srcdir)/cpu-amd64.md cpu-amd64.h amd64_desc
+
 cpu-g4.h: cpu-g4.md genmdesc$(EXEEXT)
 	./genmdesc $(srcdir)/cpu-g4.md cpu-g4.h ppcg4
 
@@ -194,46 +281,51 @@ cpu-sparc.h: cpu-sparc.md genmdesc$(EXEEXT)
 cpu-s390.h: cpu-s390.md genmdesc$(EXEEXT)
 	./genmdesc $(srcdir)/cpu-s390.md cpu-s390.h s390
 
+cpu-s390x.h: cpu-s390x.md genmdesc$(EXEEXT)
+	./genmdesc $(srcdir)/cpu-s390x.md cpu-s390x.h s390x
+
 inssel.c inssel.h: $(BURGSRC)
 	$(monodir)/mono/monoburg/monoburg -c 1 -p -e $(BURGSRC) -d inssel.h -s inssel.c
 
 testi: mono test.exe
-	./mono -v -v --ncompile 1 --compile Test:$(mtest) test.exe
+	$(RUNTIME) -v -v --ncompile 1 --compile Test:$(mtest) test.exe
 
 # ensure the tests are actually correct
 checktests: $(regtests)
 	for i in $(regtests); do $(RUNTIME) $$i; done
 
 rcheck: mono $(regtests)
-	./mono --regression $(regtests)
+	$(RUNTIME) --regression $(regtests)
 
 aotcheck: mono $(regtests)
-	for i in $(regtests); do ./mono --aot $$i; done
-	./mono --verbose --regression $(regtests)
+	for i in $(regtests); do $(RUNTIME) --aot $$i; done
+	$(RUNTIME) --verbose --regression $(regtests)
 	rm -f *.exe.so
 
 bench: mono test.exe
-	time ./mono --ncompile $(count) --compile Test:$(mtest) test.exe
+	time env $(RUNTIME) --ncompile $(count) --compile Test:$(mtest) test.exe
 
 mbench: test.exe
 	time $(monodir)/mono/jit/mono --ncompile $(count) --compile Test:$(mtest) test.exe
 
 stat1: mono bench.exe
-	./mono --verbose --statfile stats.pl --regression bench.exe
+	$(RUNTIME) --verbose --statfile stats.pl --regression bench.exe
 	perl viewstat.pl stats.pl
 
 stat2: mono basic.exe
-	./mono --verbose --statfile stats.pl --regression basic.exe
+	$(RUNTIME) --verbose --statfile stats.pl --regression basic.exe
 	perl viewstat.pl -e stats.pl
 
 stat3: mono bench.exe
-	./mono --statfile stats.pl --ncompile 1000 --compile Tests:test_0_many_nested_loops bench.exe 
+	$(RUNTIME) --statfile stats.pl --ncompile 1000 --compile Tests:test_0_many_nested_loops bench.exe 
 	perl viewstat.pl stats.pl
 
 docu: mini.sgm
 	docbook2txt mini.sgm
 
-clean:
+check-local: rcheck
+
+clean-local:
 	rm -f mono a.out gmon.out *.o test.exe
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -242,11 +334,12 @@ if JIT_SUPPORTED
 BUILT_SOURCES= inssel.c inssel.h $(arch_built)
 endif
 
-CLEANFILES= $(BUILT_SOURCES)
+CLEANFILES= $(BUILT_SOURCES) *.exe *.dll
 EXTRA_DIST = $(common_BURGSRC) jit-icalls.c cprop.c TestDriver.cs ldscript $(test_sources) \
-	propagated_relations_table.def build_relations_propagation_table.pl \
+	inssel-long.brg inssel-long32.brg \
 	$(x86_sources) inssel-x86.brg cpu-pentium.md \
+	$(amd64_sources) inssel-amd64.brg cpu-amd64.md \
 	$(ppc_sources) inssel-ppc.brg cpu-g4.md \
 	$(sparc_sources) inssel-sparc.brg cpu-sparc.md \
-	$(s390_sources) inssel-s390.brg cpu-s390.md
-
+	$(s390_sources) inssel-s390.brg cpu-s390.md \
+	$(s390x_sources) inssel-s390x.brg cpu-s390x.md