endif
if PLATFORM_WIN32
-libmono_la_LDFLAGS=-no-undefined -avoid-version $(monoldflags)
+libmono_la_LDFLAGS=-no-undefined -avoid-version -Wl,--kill-at $(monoldflags)
else
libmono_la_LDFLAGS=$(monoldflags)
endif
mono_SOURCES = \
main.c
+if DTRACE_G_REQUIRED
+LIBMONO_DTRACE_OBJECT = .libs/mono-dtrace.$(OBJEXT)
+if STATIC_MONO
+MONO_DTRACE_OBJECT = mono-dtrace.$(OBJEXT)
+else
+MONO_DTRACE_OBJECT =
+endif
+else
+MONO_DTRACE_OBJECT =
+LIBMONO_DTRACE_OBJECT =
+endif
+
if STATIC_MONO
# Link libmono into mono statically
# This leads to higher performance, especially with TLS
mono_LDADD = \
$(MONO_LIB) \
$(GLIB_LIBS) \
- -lm
+ -lm \
+ $(MONO_DTRACE_OBJECT)
mono_LDFLAGS = \
$(static_flags) -export-dynamic $(monobinldflags)
+if DTRACE_G_REQUIRED
+
+mono-dtrace.$(OBJEXT): $(top_srcdir)/data/mono.d mini.lo $(monodir)/mono/metadata/libmonoruntime-static.la
+ DTRACE="$(DTRACE)" DTRACEFLAGS="$(DTRACEFLAGS)" AR="$(AR)" $(SHELL) $(top_srcdir)/dtrace-prelink.sh \
+ $@ $(top_srcdir)/data/mono.d $(monodir)/mono/metadata/libmonoruntime-static.la mini.lo
+
+.libs/mono-dtrace.$(OBJEXT): $(top_srcdir)/data/mono.d mini.lo $(monodir)/mono/metadata/libmonoruntime.la
+ DTRACE="$(DTRACE)" DTRACEFLAGS="$(DTRACEFLAGS)" AR="$(AR)" $(SHELL) $(top_srcdir)/dtrace-prelink.sh \
+ --pic $@ $(top_srcdir)/data/mono.d $(monodir)/mono/metadata/libmonoruntime.la mini.lo
+
+endif
+
# Create monow.exe, linked for the 'windows' subsystem
if PLATFORM_WIN32
monow_LDADD = $(mono_LDADD)
common_sources = \
mini.c \
+ ir-emit.h \
+ method-to-ir.c \
+ decompose.c \
mini.h \
version.h \
optflags-def.h \
declsec.h \
wapihandles.c \
branch-opts.c \
- generic-sharing.c
+ generic-sharing.c \
+ ssa2.c \
+ abcremoval2.c \
+ regalloc2.c
test_sources = \
basic-calls.cs \
if AMD64
mono_debugger_arch_sources = mdb-debug-info64.s
else
-if ALPHA
-mono_debugger_arch_sources = mdb-debug-info64.s
-else
+if X86
mono_debugger_arch_sources = mdb-debug-info32.s
endif
endif
mono_debugger_sources =
endif
-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 bench.exe
+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
common_BURGSRC= $(srcdir)/inssel.brg $(srcdir)/inssel-float.brg
libmono_la_SOURCES = $(common_sources) $(arch_sources)
+if DISABLE_JIT
+nodist_libmono_la_SOURCES = inssel.h
+else
nodist_libmono_la_SOURCES = inssel.c inssel.h
+endif
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)
+libmono_static_la_LIBADD = $(static_libs) $(MONO_DTRACE_OBJECT)
BURGSRC= $(common_BURGSRC) $(arch_BURGSRC)
libmonoinclude_HEADERS = jit.h
libmono_la_LIBADD = \
- $(libs)
+ $(libs) $(LIBMONO_DTRACE_OBJECT)
generics.exe: generics.cs TestDriver.dll generics-variant-types.dll
$(MCS) -out:$@ $< -r:TestDriver.dll -r:generics-variant-types.dll
# $(arch_define) is the preprocessor symbol that enables all the opcodes
# for the specific platform in mini-ops.h
if CROSS_COMPILING
-GENMDESC_PRG=perl genmdesc.pl $(arch_define) $(srcdir)
+GENMDESC_PRG=perl $(srcdir)/genmdesc.pl $(arch_define) $(srcdir)
else !CROSS_COMPILING
GENMDESC_PRG=./genmdesc
endif !CROSS_COMPILING
$(RUNTIME) --regression $(regtests)
aotcheck: mono $(regtests)
- for i in $(regtests); do $(RUNTIME) --aot $$i || exit 1; done
+ rm -f *.exe.so
+ $(RUNTIME) --aot $(regtests) || exit 1
for i in $(regtests); do $(RUNTIME_AOTCHECK) --regression $$i || exit 1; done
rm -f *.exe.so
$(hppa_sources) inssel-hppa.brg cpu-hppa.md
version.h: Makefile
- if test -d $(srcdir)/.svn; then \
- (cd $(srcdir); \
- LANG=C; \
- export LANG; \
- branch=`svn info | grep URL | sed -e 's/.*source//' -e 's,mono/mono/mini,,'`; \
- version=`svn info | grep Revision | sed 's/.*: //'`; \
+ if test -d $(top_srcdir)/.git/svn; then svn_info='git svn info'; fi; \
+ if test -d $(srcdir)/.svn; then svn_info='svn info'; fi; \
+ if test -n "$$svn_info"; then \
+ (cd $(top_srcdir); \
+ LANG=C; export LANG; \
+ branch=`$$svn_info | grep URL | sed -e 's/.*source//' -e 's,mono/?$$,,'`; \
+ version=`$$svn_info | grep Revision | sed 's/.*: //'`; \
echo "#define FULL_VERSION \"$$branch r$$version\""; \
); \
else \
echo "#define FULL_VERSION \"tarball\""; \
fi > version.h
-