Revert "Revert "Merge branch 'master' of https://github.com/mono/mono""

[mono.git] / mono / utils / Makefile.am

diff --git a/mono/utils/Makefile.am b/mono/utils/Makefile.am
index 9a2d57d13e5e11c9e824b651d1c1a3f871524b5d..c67434d7b4b8a5c7c90433bbe45d7a4d96427d75 100644 (file)
--- a/mono/utils/Makefile.am
+++ b/mono/utils/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libmonoutils.la
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CPPFLAGS) $(GLIB_CFLAGS)
 
 if ENABLE_DTRACE
 
@@ -32,6 +32,8 @@ monoutils_sources = \
        mono-math.c             \
        mono-mmap.c             \
        mono-mmap.h             \
+       mono-mutex.c            \
+       mono-mutex.h            \
        mono-networkinterfaces.c                \
        mono-networkinterfaces.h                \
        mono-proclib.c          \
@@ -84,14 +86,36 @@ monoutils_sources = \
        mono-stack-unwinding.h  \
        hazard-pointer.c        \
        hazard-pointer.h        \
+       lock-free-queue.c       \
+       lock-free-queue.h       \
+       lock-free-alloc.c       \
+       lock-free-alloc.h       \
+       lock-free-array-queue.c \
+       lock-free-array-queue.h \
        mono-linked-list-set.c  \
        mono-linked-list-set.h  \
        mono-threads.c  \
        mono-threads-posix.c    \
-       mono-threads.h
+       mono-threads-mach.c     \
+       mono-threads-mach-helper.c      \
+       mono-threads-windows.c  \
+       mono-threads.h  \
+       mono-tls.h      \
+       mono-tls.c      \
+       linux_magic.h   \
+       mono-memory-model.h     \
+       atomic.h        \
+       atomic.c        \
+       mono-hwcap.h    \
+       mono-hwcap.c    \
+       bsearch.h       \
+       bsearch.c       \
+       mono-signal-handler.h
 
 arch_sources = 
 
+if !CROSS_COMPILE
+
 if X86
 arch_sources += mach-support-x86.c
 endif
@@ -104,6 +128,60 @@ if ARM
 arch_sources += mach-support-arm.c
 endif
 
+if ARM64
+arch_sources += mach-support-arm.c
+endif
+
+else
+
+arch_sources += mach-support-unknown.c
+
+endif
+
+if X86
+arch_sources += mono-hwcap-x86.c mono-hwcap-x86.h
+endif
+
+if AMD64
+arch_sources += mono-hwcap-x86.c mono-hwcap-x86.h
+endif
+
+if ARM
+arch_sources += mono-hwcap-arm.c mono-hwcap-arm.h
+endif
+
+if ARM64
+arch_sources += mono-hwcap-arm64.c mono-hwcap-arm64.h
+endif
+
+if MIPS
+arch_sources += mono-hwcap-mips.c mono-hwcap-mips.h
+endif
+
+if POWERPC
+arch_sources += mono-hwcap-ppc.c mono-hwcap-ppc.h
+endif
+
+if POWERPC64
+arch_sources += mono-hwcap-ppc.c mono-hwcap-ppc.h
+endif
+
+if SPARC
+arch_sources += mono-hwcap-sparc.c mono-hwcap-sparc.h
+endif
+
+if SPARC64
+arch_sources += mono-hwcap-sparc.c mono-hwcap-sparc.h
+endif
+
+if IA64
+arch_sources += mono-hwcap-ia64.c mono-hwcap-ia64.h
+endif
+
+if S390X
+arch_sources += mono-hwcap-s390x.c mono-hwcap-s390x.h
+endif
+
 libmonoutils_la_SOURCES = $(monoutils_sources) $(arch_sources)
 libmonoutilsincludedir = $(includedir)/mono-$(API_VER)/mono/utils