X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2FMakefile.am.in;h=98fbf90fede8c2dc242a2d86403b040638c2e906;hb=56ad8f4e5dfb8198e4671f631a3103b1e8b83dd3;hp=2366d17c3377b188fad1685e65a70182d3a17d61;hpb=65e51c54aab07ba067c3563b7f32a5d096e2cd7d;p=mono.git

diff --git a/mono/mini/Makefile.am.in b/mono/mini/Makefile.am.in
index 2366d17c337..98fbf90fede 100755
--- a/mono/mini/Makefile.am.in
+++ b/mono/mini/Makefile.am.in
@@ -304,13 +304,18 @@ x86_sources = \
 	mini-x86.c		\
 	mini-x86.h		\
 	exceptions-x86.c	\
-	tramp-x86.c
+	tramp-x86.c	\
+	mini-x86-gsharedvt.c	\
+	tramp-x86-gsharedvt.c
 
 amd64_sources = \
 	mini-amd64.c		\
 	mini-amd64.h		\
 	exceptions-amd64.c	\
-	tramp-amd64.c
+	tramp-amd64.c	\
+	mini-amd64-gsharedvt.c	\
+	mini-amd64-gsharedvt.h	\
+	tramp-amd64-gsharedvt.c
 
 ppc_sources = \
 	mini-ppc.c		\
@@ -324,13 +329,17 @@ arm_sources = \
 	mini-arm.h		\
 	mini-arm-tls.h		\
 	exceptions-arm.c	\
-	tramp-arm.c
+	tramp-arm.c	\
+	mini-arm-gsharedvt.c	\
+	tramp-arm-gsharedvt.c
 
 arm64_sources = \
 	mini-arm64.c		\
 	mini-arm64.h		\
 	exceptions-arm64.c	\
-	tramp-arm64.c
+	tramp-arm64.c	\
+	mini-arm64-gsharedvt.c	\
+	tramp-arm64-gsharedvt.c
 
 mips_sources = \
 	mini-mips.c		\
@@ -425,9 +434,11 @@ common_sources = \
 	graph.c			\
 	mini-codegen.c		\
 	mini-exceptions.c	\
+	mini-exceptions-native-unwinder.c	\
 	mini-trampolines.c  	\
 	branch-opts.c		\
 	mini-generic-sharing.c	\
+	mini-generic-sharing-gsharedvt.c	\
 	simd-methods.h		\
 	tasklets.c		\
 	tasklets.h		\
@@ -725,9 +736,9 @@ FULLAOT_LIBS = \
 fullaotcheck: $(mono) $(fullaot_regtests)
 	rm -rf fullaot-tmp
 	mkdir fullaot-tmp
-	$(MAKE) fullaot-libs AOT_FLAGS=full GSHAREDVT=$(GSHAREDVT)
+	$(MAKE) fullaot-libs AOT_FLAGS="full,$(MONO_FULLAOT_ADDITIONAL_ARGS)" GSHAREDVT=$(GSHAREDVT)
 	cp $(regtests) $(fullaot_regtests) generics-variant-types.dll TestDriver.dll fullaot-tmp/
-	MONO_PATH=fullaot-tmp $(top_builddir)/runtime/mono-wrapper $(LLVM_AOT_RUNTIME_OPTS) $(GSHAREDVT_RUNTIME_OPTS) --aot=full fullaot-tmp/{generics-variant-types.dll,TestDriver.dll,*.exe} || exit 1
+	MONO_PATH=fullaot-tmp $(top_builddir)/runtime/mono-wrapper $(LLVM_AOT_RUNTIME_OPTS) $(GSHAREDVT_RUNTIME_OPTS) --aot="full,$(MONO_FULLAOT_ADDITIONAL_ARGS)" fullaot-tmp/{generics-variant-types.dll,TestDriver.dll,*.exe} || exit 1
 	ln -s $(if $(MONO_EXECUTABLE),$(MONO_EXECUTABLE),$$PWD/mono) fullaot-tmp/
 	for i in $(fullaot_regtests); do echo $$i; MONO_PATH=fullaot-tmp $(top_builddir)/runtime/mono-wrapper --full-aot fullaot-tmp/$$i --exclude '!FULLAOT' $(ARCH_FULLAOT_EXCLUDE) || exit 1; done
 
@@ -748,7 +759,7 @@ llvmonly_regtests = $(fullaot_regtests) gshared.exe
 llvmonlycheck: mono $(llvmonly_regtests)
 	rm -rf fullaot-tmp
 	mkdir fullaot-tmp
-	$(MAKE) fullaot-libs AOT_FLAGS=llvmonly
+	$(MAKE) fullaot-libs AOT_FLAGS="llvmonly,$(MONO_FULLAOT_ADDITIONAL_ARGS)"
 	cp $(llvmonly_regtests) generics-variant-types.dll TestDriver.dll fullaot-tmp/
 	MONO_PATH=fullaot-tmp $(top_builddir)/runtime/mono-wrapper  --aot=llvmonly fullaot-tmp/{generics-variant-types.dll,TestDriver.dll,*.exe} || exit 1
 	ln -s $$PWD/mono fullaot-tmp/