diff -Naur valgrind-3.12.0.orig/coregrind/Makefile.am valgrind-3.12.0/coregrind/Makefile.am
--- valgrind-3.12.0.orig/coregrind/Makefile.am	2016-10-21 06:37:39.000000000 -0400
+++ valgrind-3.12.0/coregrind/Makefile.am	2016-10-23 16:05:46.904546117 -0400
@@ -359,21 +359,6 @@
 	m_demangle/dyn-string.c \
 	m_demangle/d-demangle.c \
 	m_demangle/safe-ctype.c \
-	m_dispatch/dispatch-x86-linux.S \
-	m_dispatch/dispatch-amd64-linux.S \
-	m_dispatch/dispatch-ppc32-linux.S \
-	m_dispatch/dispatch-ppc64be-linux.S \
-	m_dispatch/dispatch-ppc64le-linux.S \
-	m_dispatch/dispatch-arm-linux.S \
-	m_dispatch/dispatch-arm64-linux.S \
-	m_dispatch/dispatch-s390x-linux.S \
-	m_dispatch/dispatch-mips32-linux.S \
-	m_dispatch/dispatch-mips64-linux.S \
-	m_dispatch/dispatch-tilegx-linux.S \
-	m_dispatch/dispatch-x86-darwin.S \
-	m_dispatch/dispatch-amd64-darwin.S \
-	m_dispatch/dispatch-x86-solaris.S \
-	m_dispatch/dispatch-amd64-solaris.S \
 	m_gdbserver/inferiors.c \
 	m_gdbserver/m_gdbserver.c \
 	m_gdbserver/regcache.c \
@@ -399,8 +384,6 @@
 	m_initimg/initimg-pathscan.c \
 	m_mach/mach_basics.c \
 	m_mach/mach_msg.c \
-	m_mach/mach_traps-x86-darwin.S \
-	m_mach/mach_traps-amd64-darwin.S \
 	m_replacemalloc/replacemalloc_core.c \
 	m_scheduler/sched-lock.c \
 	m_scheduler/sched-lock-generic.c \
@@ -420,21 +403,6 @@
 	m_sigframe/sigframe-x86-darwin.c \
 	m_sigframe/sigframe-amd64-darwin.c \
 	m_sigframe/sigframe-solaris.c \
-	m_syswrap/syscall-x86-linux.S \
-	m_syswrap/syscall-amd64-linux.S \
-	m_syswrap/syscall-ppc32-linux.S \
-	m_syswrap/syscall-ppc64be-linux.S \
-	m_syswrap/syscall-ppc64le-linux.S \
-	m_syswrap/syscall-arm-linux.S \
-	m_syswrap/syscall-arm64-linux.S \
-	m_syswrap/syscall-s390x-linux.S \
-	m_syswrap/syscall-mips32-linux.S \
-	m_syswrap/syscall-mips64-linux.S \
-	m_syswrap/syscall-tilegx-linux.S \
-	m_syswrap/syscall-x86-darwin.S \
-	m_syswrap/syscall-amd64-darwin.S \
-	m_syswrap/syscall-x86-solaris.S \
-	m_syswrap/syscall-amd64-solaris.S \
 	m_syswrap/syswrap-main.c \
 	m_syswrap/syswrap-generic.c \
 	m_syswrap/syswrap-linux.c \
@@ -461,6 +429,29 @@
 	m_ume/main.c \
 	m_ume/script.c
 
+COREGRIND_SOURCES_COMMON += \
+	m_dispatch/dispatch-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S \
+	m_syswrap/syscall-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S
+
+if VGCONF_HAVE_PLATFORM_SEC
+COREGRIND_SOURCES_COMMON += \
+	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S \
+	m_syswrap/syscall-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S
+endif
+
+if VGCONF_OS_IS_DARWIN
+COREGRIND_SOURCES_COMMON += \
+	m_dispatch/dispatch-@VGCONF_ARCH_PRI@-darwin.S \
+	m_syswrap/syscall-@VGCONF_ARCH_PRI@-darwin.S \
+	m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S
+if VGCONF_HAVE_PLATFORM_SEC
+COREGRIND_SOURCES_COMMON += \
+	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-darwin.S \
+	m_syswrap/syscall-@VGCONF_ARCH_SEC@-darwin.S \
+	m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
+endif
+endif
+
 libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
     $(COREGRIND_SOURCES_COMMON)
 nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \