Update Valgrind and TSan.

Rebased local changes on:
http://valgrind-variant.googlecode.com/svn/trunk@125
http://data-race-test.googlecode.com/svn/trunk@3717

Change-Id: I4d7a227ad72fb8e9998015a5fe26e00496ec1da3
diff --git a/main/cachegrind/Makefile.am b/main/cachegrind/Makefile.am
index 8168081..0b6879c 100644
--- a/main/cachegrind/Makefile.am
+++ b/main/cachegrind/Makefile.am
@@ -41,10 +41,12 @@
 
 CACHEGRIND_SOURCES_COMMON = \
 	cg_main.c \
+	cg-arch.c \
 	cg-x86-amd64.c \
 	cg-ppc32.c \
 	cg-ppc64.c \
-	cg-arm.c
+	cg-arm.c   \
+	cg-s390x.c
 
 cachegrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES      = \
 	$(CACHEGRIND_SOURCES_COMMON)