$(GLIB_LIBS) \
$(libgc_libs)
+sgen_libs = \
+ $(monodir)/mono/metadata/libmonoruntimesgen.la \
+ $(monodir)/mono/io-layer/libwapi.la \
+ $(monodir)/mono/utils/libmonoutils.la \
+ $(GLIB_LIBS)
+
+moon_libs = \
+ $(monodir)/mono/metadata/libmonoruntimemoon.la \
+ $(monodir)/mono/io-layer/libwapi.la \
+ $(monodir)/mono/utils/libmonoutils.la \
+ $(GLIB_LIBS) \
+ $(libgc_libs)
+
static_libs= \
$(monodir)/mono/metadata/libmonoruntime-static.la \
$(monodir)/mono/io-layer/libwapi.la \
$(GLIB_LIBS) \
$(libgc_static_libs)
+sgenstatic_libs = \
+ $(monodir)/mono/metadata/libmonoruntimesgen-static.la \
+ $(monodir)/mono/io-layer/libwapi.la \
+ $(monodir)/mono/utils/libmonoutils.la \
+ $(GLIB_LIBS)
+
CLASS=$(mcs_topdir)/class/lib/net_2_0
-RUNTIME = MONO_PATH=$(CLASS) $(top_builddir)/runtime/mono-wrapper
-RUNTIME_AOTCHECK = MONO_PATH=$(CLASS):. $(top_builddir)/runtime/mono-wrapper
+RUNTIME_EXECUTABLE = $(if $(SGEN),$(top_builddir)/mono/mini/mono-sgen,$(top_builddir)/runtime/mono-wrapper)
+
+RUNTIME = MONO_PATH=$(CLASS) $(RUNTIME_EXECUTABLE)
+RUNTIME_AOTCHECK = MONO_PATH=$(CLASS):. $(RUNTIME_EXECUTABLE)
MCS = $(RUNTIME) $(CLASS)/gmcs.exe -unsafe -nowarn:0162
ILASM = $(RUNTIME) $(CLASS)/ilasm.exe
AM_CFLAGS = \
-I$(top_srcdir) \
- $(LIBGC_CFLAGS) \
- $(GLIB_CFLAGS)
+ $(GLIB_CFLAGS) \
+ $(LLVM_CFLAGS) \
$(PLATFORM_CFLAGS) $(ARCH_CFLAGS)
-AM_CXXFLAGS = $(LLVM_CXXFLAGS)
+AM_CXXFLAGS = $(LLVM_CXXFLAGS) $(GLIB_CFLAGS)
-if PLATFORM_WIN32
+if HOST_WIN32
export HOST_CC
# The mingw math.h has "extern inline" functions that dont appear in libs, so
# optimisation is required to actually inline them
monobinldflags=-Wl,-version-script=$(srcdir)/ldscript.mono $(export_ldflags)
endif
-if PLATFORM_WIN32
-libmono_la_LDFLAGS=-no-undefined -avoid-version -Wl,--kill-at $(monoldflags)
+if HOST_WIN32
+libmono_2_0_la_LDFLAGS=-no-undefined -avoid-version -Wl,--kill-at $(monoldflags)
else
-libmono_la_LDFLAGS=$(monoldflags)
+libmono_2_0_la_LDFLAGS=$(monoldflags) -version-info 1:0:0
endif
if JIT_SUPPORTED
-if PLATFORM_WIN32
+if SUPPORT_SGEN
+sgen_binaries = mono-sgen
+sgen_libraries = libmonosgen-2.0.la
+sgen_static_libraries = libmonosgen-static.la
+endif
+
+if HOST_WIN32
bin_PROGRAMS = mono monow
else
-bin_PROGRAMS = mono
+bin_PROGRAMS = mono $(sgen_binaries)
endif
noinst_PROGRAMS = genmdesc
-lib_LTLIBRARIES = libmono.la
-noinst_LTLIBRARIES = libmono-static.la
+if SHARED_MONO
+shared_libraries = libmono-2.0.la
+endif
+
+lib_LTLIBRARIES = $(shared_libraries) $(sgen_libraries)
+noinst_LTLIBRARIES = libmono-static.la $(sgen_static_libraries)
+
+if MOONLIGHT
+noinst_LTLIBRARIES += libmono-moon.la
+endif
+
+if LOADED_LLVM
+lib_LTLIBRARIES += libmono-llvm.la
+libmono_llvm_la_SOURCES = mini-llvm.c mini-llvm-cpp.cpp
+libmono_llvm_la_LIBADD = $(top_builddir)/mono/mini/libmono-$(API_VER).la $(LLVM_LIBS) $(LLVM_LDFLAGS) $(libs)
+endif
+
endif
mono_SOURCES = \
main.c
+mono_CFLAGS = $(AM_CFLAGS) $(BOEHM_DEFINES) $(LIBGC_CFLAGS)
+
+mono_sgen_SOURCES = $(mono_SOURCES)
+mono_sgen_CFLAGS = $(SGEN_DEFINES) $(AM_CFLAGS)
+
# We build this after libmono was built so it contains the date when the final
# link was done
buildver.h: libmono-static.la
@echo "const char *build_date = \"`date`\";" > buildver.h
-main.$(OBJEXT): buildver.h
+mono-main.$(OBJEXT): buildver.h
+mono_sgen-main.$(OBJEXT): buildver.h
if DTRACE_G_REQUIRED
LIBMONO_DTRACE_OBJECT = .libs/mono-dtrace.$(OBJEXT)
# Link libmono into mono statically
# This leads to higher performance, especially with TLS
MONO_LIB=libmono-static.la
+MONO_SGEN_LIB=libmonosgen-static.la
else
-MONO_LIB=libmono.la
+MONO_LIB=libmono-2.0.la
+MONO_SGEN_LIB=libmonosgen-2.0.la
+endif
+
+if LOADED_LLVM
+LLVMMONOF=
+else
+LLVMMONOF=$(LLVM_LIBS) $(LLVM_LDFLAGS)
endif
mono_LDADD = \
- $(MONO_LIB) \
+ $(MONO_LIB) \
$(GLIB_LIBS) \
- $(LLVM_LIBS) \
- -lm \
+ $(LLVMMONOF) \
+ -lm \
$(MONO_DTRACE_OBJECT)
mono_LDFLAGS = \
- $(static_flags) -export-dynamic $(monobinldflags)
+ $(static_flags) -export-dynamic $(monobinldflags) $(monobin_platform_ldflags)
+
+mono_sgen_LDADD = \
+ $(MONO_SGEN_LIB) \
+ $(GLIB_LIBS) \
+ $(LLVMMONOF) \
+ -lm \
+ $(MONO_DTRACE_OBJECT)
+
+mono_sgen_LDFLAGS = $(static_flags) -export-dynamic $(monobinldflags) $(monobin_platform_ldflags)
if DTRACE_G_REQUIRED
endif
# Create monow.exe, linked for the 'windows' subsystem
-if PLATFORM_WIN32
+if HOST_WIN32
monow_LDADD = $(mono_LDADD)
monow_LDFLAGS = $(mono_LDFLAGS) -mwindows
monow_SOURCES = $(mono_SOURCES)
genmdesc_SOURCES = \
mini.h \
genmdesc.c \
- helpers.c
+ helpers.c \
+ ../metadata/opcodes.c
# Don't link this against libmonoruntime to speed up rebuilds
genmdesc_LDADD = \
- $(monodir)/mono/utils/libmonoutils.la $(monodir)/mono/metadata/opcodes.lo -lm \
+ $(monodir)/mono/utils/libmonoutils.la -lm \
$(GLIB_LIBS)
x86_sources = \
mini-posix.c
if ENABLE_LLVM
-#llvm_sources = \
-# mini-llvm.c \
-# mini-llvm-cpp.cpp
+if LOADED_LLVM
+llvm_sources =
+else
+llvm_sources = \
+ mini-llvm.c \
+ mini-llvm-cpp.cpp
+endif
endif
common_sources = \
mini-generic-sharing.c \
regalloc2.c \
simd-methods.h \
+ tasklets.c \
+ tasklets.h \
simd-intrinsics.c \
- unwind.h \
+ mini-unwind.h \
unwind.c \
- image-writer.h \
- image-writer.c \
- dwarfwriter.h \
- dwarfwriter.c
+ image-writer.h \
+ image-writer.c \
+ dwarfwriter.h \
+ dwarfwriter.c \
+ mini-gc.h \
+ mini-gc.c \
+ debugger-agent.h \
+ debugger-agent.c \
+ debug-debugger.c \
+ debug-debugger.h \
+ xdebug.c \
+ mini-llvm.h \
+ mini-llvm-cpp.h
test_sources = \
basic-calls.cs \
generics-variant-types.il\
basic-simd.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
+fsatests=basic.exe basic-float.exe basic-long.exe basic-calls.exe objects.exe arrays.exe basic-math.exe exceptions.exe devirtualization.exe basic-simd.exe
+
+if X86
if MONO_DEBUGGER_SUPPORTED
-if AMD64
-mono_debugger_arch_sources = mdb-debug-info64.s
+if PLATFORM_DARWIN
+mdb_x86 = mdb-debug-info32-darwin.s
else
-if X86
-mono_debugger_arch_sources = mdb-debug-info32.s
-endif
+mdb_x86 = mdb-debug-info32.s
endif
-mono_debugger_sources = debug-debugger.c debug-debugger.h $(mono_debugger_arch_sources)
else
-mono_debugger_sources =
+mdb_x86 =
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 basic-simd.exe
-
-if X86
-arch_sources = $(x86_sources) $(mono_debugger_sources)
+arch_sources = $(x86_sources) $(mdb_x86)
arch_built=cpu-x86.h
arch_define=__i386__
endif
if AMD64
-arch_sources = $(amd64_sources) $(mono_debugger_sources)
+if MONO_DEBUGGER_SUPPORTED
+arch_sources = $(amd64_sources) mdb-debug-info64.s
+else
+arch_sources = $(amd64_sources)
+endif
arch_built=cpu-amd64.h
arch_define=__x86_64__
endif
if S390
arch_sources = $(s390_sources)
-arch_BURGSRC= $(srcdir)/inssel-long32.brg $(srcdir)/inssel-s390.brg
arch_built=cpu-s390.h
arch_define=__s390__
endif
arch_define=__hppa__
endif
-if PLATFORM_WIN32
+if HOST_WIN32
os_sources = $(windows_sources)
+monobin_platform_ldflags=
endif
if PLATFORM_SIGPOSIX
os_sources = $(posix_sources)
+monobin_platform_ldflags=
endif
if PLATFORM_DARWIN
os_sources = $(darwin_sources) $(posix_sources)
+#monobin_platform_ldflags=-sectcreate __TEXT __info_plist $(top_srcdir)/mono/mini/Info.plist -framework CoreFoundation
+monobin_platform_ldflags=-framework CoreFoundation
endif
-libmono_la_SOURCES = $(common_sources) $(llvm_sources) $(arch_sources) $(os_sources)
+libmono_2_0_la_SOURCES = $(common_sources) $(llvm_sources) $(arch_sources) $(os_sources)
+libmono_2_0_la_CFLAGS = $(AM_CFLAGS) $(BOEHM_DEFINES) $(LIBGC_CFLAGS)
-libmono_static_la_SOURCES = $(libmono_la_SOURCES)
-nodist_libmono_static_la_SOURCES = $(nodist_libmono_la_SOURCES)
+libmonosgen_2_0_la_SOURCES = $(libmono_2_0_la_SOURCES)
+libmonosgen_2_0_la_CFLAGS = $(AM_CFLAGS) $(SGEN_DEFINES)
+
+if MOONLIGHT
+libmono_moon_la_SOURCES = $(libmono_2_0_la_SOURCES)
+libmono_moon_la_CFLAGS = $(AM_CFLAGS) $(MOONLIGHT_DEFINES)
+libmono_moon_la_LIBADD = $(moon_libs) $(LIBMONO_DTRACE_OBJECT)
+endif
+
+libmono_static_la_SOURCES = $(libmono_2_0_la_SOURCES)
+libmono_static_la_CFLAGS = $(AM_CFLAGS) $(BOEHM_DEFINES) $(LIBGC_CFLAGS)
libmono_static_la_LDFLAGS = -static
libmono_static_la_LIBADD = $(static_libs) $(MONO_DTRACE_OBJECT)
+libmonosgen_static_la_SOURCES = $(libmono_2_0_la_SOURCES)
+libmonosgen_static_la_CFLAGS = $(AM_CFLAGS) $(SGEN_DEFINES)
+libmonosgen_static_la_LDFLAGS = -static
+libmonosgen_static_la_LIBADD = $(sgenstatic_libs) $(MONO_DTRACE_OBJECT)
+
+nodist_libmono_static_la_SOURCES = $(nodist_libmono_la_SOURCES)
+nodist_libmono_static_la_CFLAGS = $(AM_CFLAGS) $(BOEHM_DEFINES) $(LIBGC_CFLAGS)
+
BURGSRC= $(common_BURGSRC) $(arch_BURGSRC)
libmonoincludedir = $(includedir)/mono-$(API_VER)/mono/jit
libmonoinclude_HEADERS = jit.h
-libmono_la_LIBADD = \
+libmono_2_0_la_LIBADD = \
$(libs) $(LIBMONO_DTRACE_OBJECT)
+libmonosgen_2_0_la_LIBADD = \
+ $(sgen_libs) $(LIBMONO_DTRACE_OBJECT)
+
basic-simd.exe: basic-simd.cs
$(MCS) -out:$@ $< -r:TestDriver.dll -r:Mono.Simd.dll
generics-variant-types.dll: generics-variant-types.il
$(ILASM) -dll -output=$@ $<
+if NACL_CODEGEN
+GENMDESC_OPTS=--nacl
+else !NACL_CODEGEN
+GENMDESC_OPTS=
+endif !NACL_CODEGEN
+
# we don't always use the perl impl because it's an additional
# build dependency for the poor windows users
# $(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 $(srcdir)/genmdesc.pl $(arch_define) $(srcdir)
+GENMDESC_PRG=perl $(srcdir)/genmdesc.pl $(arch_define) $(srcdir) $(GENMDESC_OPTS)
else !CROSS_COMPILING
-GENMDESC_PRG=./genmdesc
+GENMDESC_PRG=./genmdesc $(GENMDESC_OPTS)
endif !CROSS_COMPILING
cpu-x86.h: cpu-x86.md genmdesc$(EXEEXT)
- $(GENMDESC_PRG) $(srcdir)/cpu-x86.md cpu-x86.h x86_desc
+ $(GENMDESC_PRG) cpu-x86.h x86_desc $(srcdir)/cpu-x86.md
cpu-amd64.h: cpu-amd64.md genmdesc$(EXEEXT)
- $(GENMDESC_PRG) $(srcdir)/cpu-amd64.md cpu-amd64.h amd64_desc
+ $(GENMDESC_PRG) cpu-amd64.h amd64_desc $(srcdir)/cpu-amd64.md
cpu-ppc.h: cpu-ppc.md genmdesc$(EXEEXT)
- $(GENMDESC_PRG) $(srcdir)/cpu-ppc.md cpu-ppc.h ppcg4
+ $(GENMDESC_PRG) cpu-ppc.h ppcg4 $(srcdir)/cpu-ppc.md
cpu-ppc64.h: cpu-ppc64.md genmdesc$(EXEEXT)
- $(GENMDESC_PRG) $(srcdir)/cpu-ppc64.md cpu-ppc64.h ppc64_cpu_desc
+ $(GENMDESC_PRG) cpu-ppc64.h ppc64_cpu_desc $(srcdir)/cpu-ppc64.md
cpu-arm.h: cpu-arm.md genmdesc$(EXEEXT)
- $(GENMDESC_PRG) $(srcdir)/cpu-arm.md cpu-arm.h arm_cpu_desc
+ $(GENMDESC_PRG) cpu-arm.h arm_cpu_desc $(srcdir)/cpu-arm.md
cpu-sparc.h: cpu-sparc.md genmdesc$(EXEEXT)
- $(GENMDESC_PRG) $(srcdir)/cpu-sparc.md cpu-sparc.h sparc_desc
+ $(GENMDESC_PRG) cpu-sparc.h sparc_desc $(srcdir)/cpu-sparc.md
cpu-s390.h: cpu-s390.md genmdesc$(EXEEXT)
- $(GENMDESC_PRG) $(srcdir)/cpu-s390.md cpu-s390.h s390_cpu_desc
+ $(GENMDESC_PRG) cpu-s390.h s390_cpu_desc $(srcdir)/cpu-s390.md
cpu-s390x.h: cpu-s390x.md genmdesc$(EXEEXT)
- $(GENMDESC_PRG) $(srcdir)/cpu-s390x.md cpu-s390x.h s390x_cpu_desc
+ $(GENMDESC_PRG) cpu-s390x.h s390x_cpu_desc $(srcdir)/cpu-s390x.md
cpu-ia64.h: cpu-ia64.md genmdesc$(EXEEXT)
- $(GENMDESC_PRG) $(srcdir)/cpu-ia64.md cpu-ia64.h ia64_desc
+ $(GENMDESC_PRG) cpu-ia64.h ia64_desc $(srcdir)/cpu-ia64.md
cpu-alpha.h: cpu-alpha.md genmdesc$(EXEEXT)
- $(GENMDESC_PRG) $(srcdir)/cpu-alpha.md cpu-alpha.h alpha_desc
+ $(GENMDESC_PRG) cpu-alpha.h alpha_desc $(srcdir)/cpu-alpha.md
cpu-hppa.h: cpu-hppa.md genmdesc$(EXEEXT)
- $(GENMDESC_PRG) $(srcdir)/cpu-hppa.md cpu-hppa.h hppa_desc
+ $(GENMDESC_PRG) cpu-hppa.h hppa_desc $(srcdir)/cpu-hppa.md
cpu-mips.h: cpu-mips.md genmdesc$(EXEEXT)
- $(GENMDESC_PRG) $(srcdir)/cpu-mips.md cpu-mips.h mips_desc
+ $(GENMDESC_PRG) cpu-mips.h mips_desc $(srcdir)/cpu-mips.md
testi: mono test.exe
$(RUNTIME) -v -v --ncompile 1 --compile Test:$(mtest) test.exe
for i in $(regtests); do $(RUNTIME_AOTCHECK) --regression $$i || exit 1; done
rm -f *.exe.so
-# This is not expected to run successfully
+# This currently only works on amd64/arm
fullaotcheck: mono $(regtests)
rm -rf fullaot-tmp
mkdir fullaot-tmp
- cp $(CLASS)/mscorlib.dll $(CLASS)/Mono.Simd.dll $(regtests) generics-variant-types.dll TestDriver.dll fullaot-tmp/
+ cp $(CLASS)/mscorlib.dll $(CLASS)/System.Core.dll $(CLASS)/System.dll $(CLASS)/Mono.Posix.dll $(CLASS)/System.Configuration.dll $(CLASS)/System.Security.dll $(CLASS)/System.Xml.dll $(CLASS)/Mono.Security.dll $(CLASS)/Mono.Simd.dll $(regtests) generics-variant-types.dll TestDriver.dll fullaot-tmp/
cp $(regtests) fullaot-tmp/
MONO_PATH=fullaot-tmp $(top_builddir)/runtime/mono-wrapper --aot=full fullaot-tmp/* || exit 1
- for i in $(regtests); do echo $$i; if [ $$i != generics.exe ]; then MONO_PATH=fullaot-tmp $(top_builddir)/runtime/mono-wrapper --full-aot fullaot-tmp/$$i || exit 1; fi; done
+ for i in $(regtests); do echo $$i; MONO_PATH=fullaot-tmp $(top_builddir)/runtime/mono-wrapper --full-aot fullaot-tmp/$$i --exclude '!FULLAOT' || exit 1; done
+
+fsacheck: mono $(fsatests) fsacheck.c generics.exe
+ rm -rf fsa-tmp
+ mkdir fsa-tmp
+ cp $(CLASS)/mscorlib.dll $(CLASS)/System.Core.dll $(CLASS)/System.dll $(CLASS)/Mono.Posix.dll $(CLASS)/System.Configuration.dll $(CLASS)/System.Security.dll $(CLASS)/System.Xml.dll $(CLASS)/Mono.Security.dll $(CLASS)/Mono.Simd.dll \
+ $(fsatests) generics-variant-types.dll TestDriver.dll fsa-tmp/
+ cp $(fsatests) fsa-tmp/
+ MONO_PATH=fsa-tmp $(top_builddir)/runtime/mono-wrapper --aot=full,static fsa-tmp/*.dll || exit 1
+ MONO_PATH=fsa-tmp $(top_builddir)/runtime/mono-wrapper --aot=full,static fsa-tmp/*.exe || exit 1
+ $(CC) -o $@.out -g -static $(VPATH)/fsacheck.c fsa-tmp/*.o \
+ -lmono-2.0 -lpthread -lm -ldl -lrt \
+ -DTARGET_X86 -L.libs -I${prefix}/include/mono-2.0 \
+ -I${prefix} -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
+ for i in $(fsatests); do echo $$i; MONO_PATH=fsa-tmp ./$@.out $$i || exit 1; done
bench: mono test.exe
time env $(RUNTIME) --ncompile $(count) --compile Test:$(mtest) test.exe
endif
CLEANFILES= $(BUILT_SOURCES) *.exe *.dll
-EXTRA_DIST = $(common_BURGSRC) cprop.c TestDriver.cs ldscript ldscript.mono \
- genmdesc.pl \
- $(test_sources) \
- $(x86_sources) cpu-x86.md \
- $(amd64_sources) cpu-amd64.md \
- $(ppc_sources) cpu-ppc.md cpu-ppc64.md \
- $(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 \
- $(hppa_sources) cpu-hppa.md \
- $(windows_sources) \
- $(darwin_sources) \
+EXTRA_DIST = $(common_BURGSRC) TestDriver.cs ldscript ldscript.mono \
+ genmdesc.pl \
+ $(test_sources) \
+ $(x86_sources) cpu-x86.md \
+ $(amd64_sources) cpu-amd64.md \
+ $(ppc_sources) cpu-ppc.md cpu-ppc64.md \
+ $(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 \
+ $(hppa_sources) cpu-hppa.md \
+ $(windows_sources) \
+ $(darwin_sources) Info.plist \
$(posix_sources)
version.h: Makefile
- 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 \
+ if test -d $(top_srcdir)/.git; 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\""; \
+ branch=`git branch | grep '^\*' | cut -d ' ' -f 2`; \
+ version=`git log --no-color --first-parent -n1 --pretty=format:%h`; \
+ echo "#define FULL_VERSION \"$$branch/$$version\""; \
); \
else \
echo "#define FULL_VERSION \"tarball\""; \
patch-libtool:
sed -e 's,if (for obj in $$oldobjs,if (for obj in "",g' < ../../libtool > 2; mv 2 ../../libtool
chmod a+x ../../libtool
+
+tags:
+ etags -o TAGS `find .. -name "*.h" -o -name "*.c"`
projects / mono.git / blobdiff