projects / mono.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
* Makefile.am (AM_CFLAGS): Don't use += to append inside conditionals. Use ...
[mono.git] / mono / mini / Makefile.am
diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am
index ba59e7490628bb5eff67b87f9ef8684c3b01f295..df38cc86681869d23f5efa17c565d9006e432f34 100644 (file)
--- a/mono/mini/Makefile.am
+++ b/mono/mini/Makefile.am
@@ -29,22 +29,23 @@ static_libs=        \
        $(libgc_static_libs) \
        $(ICU_LIBS)
 
-RUNTIME = MONO_PATH=$(mcs_topdir)/class/lib/default MONO_SHARED_DIR=$(mono_build_root)/runtime MONO_CFG_DIR=$(mono_cfg_dir) ./mono --config $(top_builddir)/data/config
+RUNTIME = MONO_PATH=$(mcs_topdir)/class/lib/default $(top_builddir)/runtime/mono-wrapper
 
 MCS = $(RUNTIME) $(mcs_topdir)/class/lib/default/mcs.exe -unsafe -nowarn:0162
 ILASM = $(RUNTIME) $(mcs_topdir)/ilasm/ilasm.exe
 
-INCLUDES = \
+AM_CFLAGS = \
        -I$(top_srcdir)         \
        $(LIBGC_CFLAGS)         \
        $(GMODULE_CFLAGS)               \
        $(GLIB_CFLAGS)
+       $(PLATFORM_CFLAGS) $(ARCH_CFLAGS)
 
 if PLATFORM_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
-AM_CFLAGS = -O
+PLATFORM_CFLAGS = -O
 PLATFORM_LIB = ../os/libmonoos.la
 endif
 
@@ -53,8 +54,10 @@ genmdesc_CFLAGS = $(AM_CFLAGS)
 
 if NO_VERSION_SCRIPT
 monoldflags=
+monobinldflags=
 else
 monoldflags=-Wl,-version-script=$(srcdir)/ldscript
+monobinldflags=-Wl,-version-script=$(srcdir)/ldscript.mono
 endif
 
 if PLATFORM_WIN32
@@ -91,7 +94,7 @@ mono_LDADD = \
        $(ICU_LIBS)
 
 mono_LDFLAGS = \
-       $(static_flags) -export-dynamic $(monoldflags)
+       $(static_flags) -export-dynamic $(monobinldflags)
 
 genmdesc_SOURCES = \
        mini.h          \
@@ -109,13 +112,17 @@ x86_sources = \
        mini-x86.c              \
        mini-x86.h              \
        exceptions-x86.c        \
-       tramp-x86.c
+       tramp-x86.c                     \
+       mini-codegen.c          \
+       mini-trampolines.c
 
 amd64_sources = \
        mini-amd64.c            \
        mini-amd64.h            \
        exceptions-amd64.c      \
-       tramp-amd64.c
+       tramp-amd64.c           \
+       mini-codegen.c          \
+       mini-trampolines.c
 
 ppc_sources = \
        mini-ppc.c              \
@@ -123,11 +130,20 @@ ppc_sources = \
        exceptions-ppc.c        \
        tramp-ppc.c
 
+arm_sources = \
+       mini-arm.c              \
+       mini-arm.h              \
+       exceptions-arm.c        \
+       tramp-arm.c             \
+       mini-codegen.c
+
 sparc_sources = \
        mini-sparc.c            \
        mini-sparc.h            \
        exceptions-sparc.c      \
-       tramp-sparc.c
+       tramp-sparc.c           \
+       mini-codegen.c          \
+       mini-trampolines.c
 
 s390_sources = \
        mini-s390.c             \
@@ -141,6 +157,14 @@ s390x_sources = \
        exceptions-s390x.c      \
        tramp-s390x.c
 
+ia64_sources = \
+       mini-ia64.c                     \
+       mini-ia64.h                     \
+       exceptions-ia64.c       \
+       tramp-ia64.c            \
+       mini-codegen.c          \
+       mini-trampolines.c
+
 common_sources = \
        mini.c          \
        mini.h          \
@@ -210,6 +234,18 @@ arch_BURGSRC= $(srcdir)/inssel-long32.brg $(srcdir)/inssel-ppc.brg
 arch_built=cpu-g4.h
 endif
 
+if ARM
+
+# pick up arm_dpimacros.h and arm_fpamacros.h
+ARCH_CFLAGS = -I../arch/arm
+
+libmono_la_SOURCES = \
+       $(common_sources) $(arm_sources)
+
+arch_BURGSRC= $(srcdir)/inssel-long32.brg $(srcdir)/inssel-arm.brg
+arch_built=cpu-arm.h
+endif
+
 if SPARC
 libmono_la_SOURCES = \
        $(common_sources) $(sparc_sources)
@@ -242,6 +278,14 @@ arch_BURGSRC= $(srcdir)/inssel-long.brg $(srcdir)/inssel-s390x.brg
 arch_built=cpu-s390x.h
 endif
 
+if IA64
+libmono_la_SOURCES = \
+    $(common_sources) $(ia64_sources)
+
+arch_BURGSRC = $(srcdir)/inssel-long.brg $(srcdir)/inssel-ia64.brg
+arch_built = cpu-ia64.h
+endif
+
 nodist_libmono_la_SOURCES = inssel.c inssel.h
 
 libmono_static_la_SOURCES = $(libmono_la_SOURCES)
@@ -268,6 +312,24 @@ libmono_la_LIBADD = \
 TestDriver.dll: $(srcdir)/TestDriver.cs
        $(MCS) /out:TestDriver.dll /target:library $(srcdir)/TestDriver.cs
 
+if CROSS_COMPILING
+
+cpu-pentium.h: cpu-pentium.md
+cpu-amd64.h: cpu-amd64.md
+cpu-g4.h: cpu-g4.md
+cpu-arm.h: cpu-arm.md
+cpu-sparc.h: cpu-sparc.md
+cpu-s390.h: cpu-s390.md
+cpu-s390x.h: cpu-s390x.md
+cpu-ia64.h: cpu-ia64.md
+
+## Gross hack.  Making 'genmdesc' a host binary takes more effort
+$(arch_built):
+       echo "*** please build $(arch_built) on a native build tree and copy it here"
+       exit 1
+
+else !CROSS_COMPILING
+
 cpu-pentium.h: cpu-pentium.md genmdesc$(EXEEXT)
        ./genmdesc $(srcdir)/cpu-pentium.md cpu-pentium.h pentium_desc
 
@@ -277,6 +339,9 @@ cpu-amd64.h: cpu-amd64.md genmdesc$(EXEEXT)
 cpu-g4.h: cpu-g4.md genmdesc$(EXEEXT)
        ./genmdesc $(srcdir)/cpu-g4.md cpu-g4.h ppcg4
 
+cpu-arm.h: cpu-arm.md genmdesc$(EXEEXT)
+       ./genmdesc $(srcdir)/cpu-arm.md cpu-arm.h arm_cpu_desc
+
 cpu-sparc.h: cpu-sparc.md genmdesc$(EXEEXT)
        ./genmdesc $(srcdir)/cpu-sparc.md cpu-sparc.h sparc_desc
 
@@ -286,6 +351,11 @@ cpu-s390.h: cpu-s390.md genmdesc$(EXEEXT)
 cpu-s390x.h: cpu-s390x.md genmdesc$(EXEEXT)
        ./genmdesc $(srcdir)/cpu-s390x.md cpu-s390x.h s390x
 
+cpu-ia64.h: cpu-ia64.md genmdesc$(EXEEXT)
+       ./genmdesc $(srcdir)/cpu-ia64.md cpu-ia64.h ia64_desc
+
+endif !CROSS_COMPILING
+
 inssel.c inssel.h: $(BURGSRC)
        $(monodir)/mono/monoburg/monoburg -c 1 -p -e $(BURGSRC) -d inssel.h -s inssel.c
 
@@ -337,11 +407,13 @@ 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 $(test_sources) \
+EXTRA_DIST = $(common_BURGSRC) jit-icalls.c cprop.c TestDriver.cs ldscript ldscript.mono $(test_sources) \
        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 \
+       $(arm_sources) inssel-arm.brg cpu-arm.md \
        $(sparc_sources) inssel-sparc.brg cpu-sparc.md \
        $(s390_sources) inssel-s390.brg cpu-s390.md \
-       $(s390x_sources) inssel-s390x.brg cpu-s390x.md
+       $(s390x_sources) inssel-s390x.brg cpu-s390x.md \
+       $(ia64_sources) inssel-ia64.brg cpu-ia64.md
my mono mirror. check out Moved to http://github.com/mono/mono