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 9a8c7a1cbe1a240bf947520c3876b25c3cb5ecaf..c67434d7b4b8a5c7c90433bbe45d7a4d96427d75 100644 (file)
--- a/mono/utils/Makefile.am
+++ b/mono/utils/Makefile.am
@@ -97,15 +97,20 @@ monoutils_sources = \
        mono-threads.c  \
        mono-threads-posix.c    \
        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
+       mono-hwcap.c    \
+       bsearch.h       \
+       bsearch.c       \
+       mono-signal-handler.h
 
 arch_sources = 
 
@@ -123,14 +128,16 @@ 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 !CROSS_COMPILE
-
 if X86
 arch_sources += mono-hwcap-x86.c mono-hwcap-x86.h
 endif
@@ -143,6 +150,10 @@ 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
@@ -171,12 +182,6 @@ if S390X
 arch_sources += mono-hwcap-s390x.c mono-hwcap-s390x.h
 endif
 
-else
-
-arch_sources += mono-hwcap-empty.c
-
-endif
-
 libmonoutils_la_SOURCES = $(monoutils_sources) $(arch_sources)
 libmonoutilsincludedir = $(includedir)/mono-$(API_VER)/mono/utils