From 72ae2f30d0fcfd5d67c95f2168d007238c6039c0 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@redhat.com>
Date: Mar 20 2013 18:03:32 +0000
Subject: 3.8.1-12 add valgrind-3.8.1-text-segment.patch KDE#317091


---

diff --git a/valgrind-3.8.1-text-segment.patch b/valgrind-3.8.1-text-segment.patch
new file mode 100644
index 0000000..7e60899
--- /dev/null
+++ b/valgrind-3.8.1-text-segment.patch
@@ -0,0 +1,1045 @@
+diff --git a/Makefile.tool.am b/Makefile.tool.am
+index b6c1509..f26724d 100644
+--- a/Makefile.tool.am
++++ b/Makefile.tool.am
+@@ -26,12 +26,8 @@ TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@ = \
+ endif
+ 
+ 
+-# -Wl,--build-id=none is needed when linking tools on Linux. Without this
+-# flag newer ld versions (2.20 and later) create a .note.gnu.build-id at the
+-# default text segment address, which of course means the resulting executable
+-# is unusable. So we have to tell ld not to generate that, with --build-id=none.
+ TOOL_LDFLAGS_COMMON_LINUX = \
+-	-static -nodefaultlibs -nostartfiles -u _start @FLAG_NO_BUILD_ID@
++	-static -nodefaultlibs -nostartfiles -u _start
+ TOOL_LDFLAGS_COMMON_DARWIN = \
+ 	-nodefaultlibs -nostartfiles -Wl,-u,__start -Wl,-e,__start
+ 
+diff --git a/configure.in b/configure.in
+index 391b763..9aadfa2 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1701,23 +1701,32 @@ AM_CONDITIONAL(DWARF4, test x$ac_have_dwarf4 = xyes)
+ CFLAGS=$safe_CFLAGS
+ 
+ 
+-# does the linker support -Wl,--build-id=none ?  Note, it's
+-# important that we test indirectly via whichever C compiler
+-# is selected, rather than testing /usr/bin/ld or whatever
+-# directly.
++# We want to use use the -Ttext-segment option to the linker.
++# GNU (bfd) ld supports this directly. Newer GNU gold linkers
++# support it as an alias of -Ttext. Sadly GNU (bfd) ld's -Ttext
++# semantics are NOT what we want (GNU gold -Ttext is fine).
++#
++# For GNU (bfd) ld -Ttext-segment chooses the base at which ELF headers
++# will reside. -Ttext aligns just the .text section start (but not any
++# other section).
++#
++# So test for -Ttext-segment which is supported by all bfd ld versions
++# and use that if it exists. If it doesn't exist it must be an older
++# version of gold and we can fall back to using -Ttext which has the
++# right semantics.
+ 
+-AC_MSG_CHECKING([if the linker accepts -Wl,--build-id=none])
++AC_MSG_CHECKING([if the linker accepts -Wl,-Ttext-segment])
+ 
+ safe_CFLAGS=$CFLAGS
+-CFLAGS="-Wl,--build-id=none"
++CFLAGS="-Wl,-Ttext-segment=$valt_load_address_pri_norml"
+ 
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([ ], [return 0;])],
+ [
+-  AC_SUBST([FLAG_NO_BUILD_ID], ["-Wl,--build-id=none"])
++  AC_SUBST([FLAG_T_TEXT], ["-Ttext-segment"])
+   AC_MSG_RESULT([yes])
+ ], [
+-  AC_SUBST([FLAG_NO_BUILD_ID], [""])
++  AC_SUBST([FLAG_T_TEXT], ["-Ttext"])
+   AC_MSG_RESULT([no])
+ ])
+ CFLAGS=$safe_CFLAGS
+--- valgrind-3.8.1.orig/coregrind/link_tool_exe_linux.in	2013-03-20 16:59:08.834198437 +0100
++++ valgrind-3.8.1/coregrind/link_tool_exe_linux.in	2013-03-20 17:02:20.184864053 +0100
+@@ -27,24 +27,20 @@
+ # directly.  It is only run as part of the build process, with 
+ # carefully constrained inputs.
+ #
+-# Linux specific complications:
++# Linux specific complication:
+ #
+ # - need to support both old GNU ld and gold: use -Ttext= to
+-#   set the text segment address.
+-#
+-# - need to pass --build-id=none (that is, -Wl,--build-id=none to
+-#   gcc) if it accepts it, to ensure the linker doesn't add a
+-#   notes section which ends up at the default load address and
+-#   so defeats our attempts to keep that address clear for the
+-#   client.  However, older linkers don't support this flag, so it
+-#   is tested for by configure.in and is shipped to us as part of
+-#   argv[2 ..].
++#   set the text segment address if that is all we have. We really
++#   need -Ttext-segment. Otherwise with GNU ld sections or notes
++#   (like the build-id) don't get at the desired address. Luckily
++#   -Ttext does the right thing for gold. So configure checks for
++#   us and sets FLAG_T_TEXT.
+ #
+ #
+ # So: what we actually do:
+ # 
+ #   pass the specified command to the linker as-is, except, add
+-#   "-static" and "-Ttext=<argv[1]>" to it.
++#   "-static" and "-Ttext[-segment]=<argv[1]>" to it.
+ #
+ 
+ use warnings;
+@@ -66,7 +62,7 @@
+ # and the 'restargs' are argv[2 ..]
+ 
+ # so, build up the complete command here:
+-# 'cc' -static -Ttext='ala' 'restargs'
++# 'cc' -static -Ttext[-segment]='ala' 'restargs'
+ 
+ # For mips we need to use "--section-start=.reginfo=$ala" because
+ # "--section-start=.reginfo=$ala" will put all the sections to the 
+@@ -78,7 +74,7 @@
+ if (($arch eq 'mips') || ($arch eq 'mipsel')) {
+    $cmd = "$cc -static -Wl,--section-start=.reginfo=$ala";
+ } else {
+-   $cmd = "$cc -static -Wl,-Ttext=$ala";
++   $cmd = "$cc -static -Wl,@FLAG_T_TEXT@=$ala";
+ }
+ 
+ # Add the rest of the parameters
+Only in valgrind-3.8.1: autom4te.cache
+diff -ur valgrind-3.8.1.orig/auxprogs/Makefile.in valgrind-3.8.1/auxprogs/Makefile.in
+--- valgrind-3.8.1.orig/auxprogs/Makefile.in	2013-03-20 17:11:49.645124306 +0100
++++ valgrind-3.8.1/auxprogs/Makefile.in	2013-03-20 17:12:41.810330715 +0100
+@@ -119,7 +119,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/cachegrind/Makefile.in valgrind-3.8.1/cachegrind/Makefile.in
+--- valgrind-3.8.1.orig/cachegrind/Makefile.in	2013-03-20 17:11:49.625124227 +0100
++++ valgrind-3.8.1/cachegrind/Makefile.in	2013-03-20 17:12:41.902331079 +0100
+@@ -221,7 +221,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+@@ -466,13 +466,8 @@
+ @VGCONF_HAVE_PLATFORM_SEC_TRUE@TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@ = \
+ @VGCONF_HAVE_PLATFORM_SEC_TRUE@	$(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@) $(TOOL_LDADD_COMMON)
+ 
+-
+-# -Wl,--build-id=none is needed when linking tools on Linux. Without this
+-# flag newer ld versions (2.20 and later) create a .note.gnu.build-id at the
+-# default text segment address, which of course means the resulting executable
+-# is unusable. So we have to tell ld not to generate that, with --build-id=none.
+ TOOL_LDFLAGS_COMMON_LINUX = \
+-	-static -nodefaultlibs -nostartfiles -u _start @FLAG_NO_BUILD_ID@
++	-static -nodefaultlibs -nostartfiles -u _start
+ 
+ TOOL_LDFLAGS_COMMON_DARWIN = \
+ 	-nodefaultlibs -nostartfiles -Wl,-u,__start -Wl,-e,__start
+diff -ur valgrind-3.8.1.orig/cachegrind/tests/Makefile.in valgrind-3.8.1/cachegrind/tests/Makefile.in
+--- valgrind-3.8.1.orig/cachegrind/tests/Makefile.in	2013-03-20 17:11:49.624124223 +0100
++++ valgrind-3.8.1/cachegrind/tests/Makefile.in	2013-03-20 17:12:41.952331277 +0100
+@@ -167,7 +167,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/cachegrind/tests/x86/Makefile.in valgrind-3.8.1/cachegrind/tests/x86/Makefile.in
+--- valgrind-3.8.1.orig/cachegrind/tests/x86/Makefile.in	2013-03-20 17:11:49.625124227 +0100
++++ valgrind-3.8.1/cachegrind/tests/x86/Makefile.in	2013-03-20 17:12:41.996331450 +0100
+@@ -119,7 +119,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/callgrind/Makefile.in valgrind-3.8.1/callgrind/Makefile.in
+--- valgrind-3.8.1.orig/callgrind/Makefile.in	2013-03-20 17:11:49.746124707 +0100
++++ valgrind-3.8.1/callgrind/Makefile.in	2013-03-20 17:12:42.139332015 +0100
+@@ -238,7 +238,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+@@ -483,13 +483,8 @@
+ @VGCONF_HAVE_PLATFORM_SEC_TRUE@TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@ = \
+ @VGCONF_HAVE_PLATFORM_SEC_TRUE@	$(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@) $(TOOL_LDADD_COMMON)
+ 
+-
+-# -Wl,--build-id=none is needed when linking tools on Linux. Without this
+-# flag newer ld versions (2.20 and later) create a .note.gnu.build-id at the
+-# default text segment address, which of course means the resulting executable
+-# is unusable. So we have to tell ld not to generate that, with --build-id=none.
+ TOOL_LDFLAGS_COMMON_LINUX = \
+-	-static -nodefaultlibs -nostartfiles -u _start @FLAG_NO_BUILD_ID@
++	-static -nodefaultlibs -nostartfiles -u _start
+ 
+ TOOL_LDFLAGS_COMMON_DARWIN = \
+ 	-nodefaultlibs -nostartfiles -Wl,-u,__start -Wl,-e,__start
+diff -ur valgrind-3.8.1.orig/callgrind/tests/Makefile.in valgrind-3.8.1/callgrind/tests/Makefile.in
+--- valgrind-3.8.1.orig/callgrind/tests/Makefile.in	2013-03-20 17:11:49.746124707 +0100
++++ valgrind-3.8.1/callgrind/tests/Makefile.in	2013-03-20 17:12:42.185332197 +0100
+@@ -160,7 +160,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/configure valgrind-3.8.1/configure
+--- valgrind-3.8.1.orig/configure	2013-03-20 17:11:49.759124759 +0100
++++ valgrind-3.8.1/configure	2013-03-20 17:12:46.271348354 +0100
+@@ -656,7 +656,7 @@
+ BUILD_SSSE3_TESTS_TRUE
+ BUILD_SSE3_TESTS_FALSE
+ BUILD_SSE3_TESTS_TRUE
+-FLAG_NO_BUILD_ID
++FLAG_T_TEXT
+ DWARF4_FALSE
+ DWARF4_TRUE
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH
+@@ -5328,7 +5328,7 @@
+         ARCH_MAX="s390x"
+         ;;
+ 
+-     armv[57]*)
++     armv57*)
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (${host_cpu})" >&5
+ $as_echo "ok (${host_cpu})" >&6; }
+ 	ARCH_MAX="arm"
+@@ -7913,16 +7913,25 @@
+ CFLAGS=$safe_CFLAGS
+ 
+ 
+-# does the linker support -Wl,--build-id=none ?  Note, it's
+-# important that we test indirectly via whichever C compiler
+-# is selected, rather than testing /usr/bin/ld or whatever
+-# directly.
++# We want to use use the -Ttext-segment option to the linker.
++# GNU (bfd) ld supports this directly. Newer GNU gold linkers
++# support it as an alias of -Ttext. Sadly GNU (bfd) ld's -Ttext
++# semantics are NOT what we want (GNU gold -Ttext is fine).
++#
++# For GNU (bfd) ld -Ttext-segment chooses the base at which ELF headers
++# will reside. -Ttext aligns just the .text section start (but not any
++# other section).
++#
++# So test for -Ttext-segment which is supported by all bfd ld versions
++# and use that if it exists. If it doesn't exist it must be an older
++# version of gold and we can fall back to using -Ttext which has the
++# right semantics.
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker accepts -Wl,--build-id=none" >&5
+-$as_echo_n "checking if the linker accepts -Wl,--build-id=none... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker accepts -Wl,-Ttext-segment" >&5
++$as_echo_n "checking if the linker accepts -Wl,-Ttext-segment... " >&6; }
+ 
+ safe_CFLAGS=$CFLAGS
+-CFLAGS="-Wl,--build-id=none"
++CFLAGS="-Wl,-Ttext-segment=$valt_load_address_pri_norml"
+ 
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+@@ -7937,14 +7946,14 @@
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+ 
+-  FLAG_NO_BUILD_ID="-Wl,--build-id=none"
++  FLAG_T_TEXT="-Ttext-segment"
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 
+ else
+ 
+-  FLAG_NO_BUILD_ID=""
++  FLAG_T_TEXT="-Ttext"
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+diff -ur valgrind-3.8.1.orig/coregrind/Makefile.in valgrind-3.8.1/coregrind/Makefile.in
+--- valgrind-3.8.1.orig/coregrind/Makefile.in	2013-03-20 17:11:49.715124584 +0100
++++ valgrind-3.8.1/coregrind/Makefile.in	2013-03-20 17:12:42.839334783 +0100
+@@ -702,7 +702,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/docs/Makefile.in valgrind-3.8.1/docs/Makefile.in
+--- valgrind-3.8.1.orig/docs/Makefile.in	2013-03-20 17:11:49.759124758 +0100
++++ valgrind-3.8.1/docs/Makefile.in	2013-03-20 17:12:42.876334929 +0100
+@@ -82,7 +82,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/drd/Makefile.in valgrind-3.8.1/drd/Makefile.in
+--- valgrind-3.8.1.orig/drd/Makefile.in	2013-03-20 17:11:49.644124302 +0100
++++ valgrind-3.8.1/drd/Makefile.in	2013-03-20 17:12:43.013335471 +0100
+@@ -267,7 +267,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+@@ -512,13 +512,8 @@
+ @VGCONF_HAVE_PLATFORM_SEC_TRUE@TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@ = \
+ @VGCONF_HAVE_PLATFORM_SEC_TRUE@	$(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@) $(TOOL_LDADD_COMMON)
+ 
+-
+-# -Wl,--build-id=none is needed when linking tools on Linux. Without this
+-# flag newer ld versions (2.20 and later) create a .note.gnu.build-id at the
+-# default text segment address, which of course means the resulting executable
+-# is unusable. So we have to tell ld not to generate that, with --build-id=none.
+ TOOL_LDFLAGS_COMMON_LINUX = \
+-	-static -nodefaultlibs -nostartfiles -u _start @FLAG_NO_BUILD_ID@
++	-static -nodefaultlibs -nostartfiles -u _start
+ 
+ TOOL_LDFLAGS_COMMON_DARWIN = \
+ 	-nodefaultlibs -nostartfiles -Wl,-u,__start -Wl,-e,__start
+diff -ur valgrind-3.8.1.orig/drd/tests/Makefile.in valgrind-3.8.1/drd/tests/Makefile.in
+--- valgrind-3.8.1.orig/drd/tests/Makefile.in	2013-03-20 17:11:49.638124278 +0100
++++ valgrind-3.8.1/drd/tests/Makefile.in	2013-03-20 17:12:43.137335961 +0100
+@@ -476,7 +476,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/exp-bbv/Makefile.in valgrind-3.8.1/exp-bbv/Makefile.in
+--- valgrind-3.8.1.orig/exp-bbv/Makefile.in	2013-03-20 17:11:49.764124777 +0100
++++ valgrind-3.8.1/exp-bbv/Makefile.in	2013-03-20 17:12:43.194336187 +0100
+@@ -167,7 +167,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+@@ -412,13 +412,8 @@
+ @VGCONF_HAVE_PLATFORM_SEC_TRUE@TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@ = \
+ @VGCONF_HAVE_PLATFORM_SEC_TRUE@	$(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@) $(TOOL_LDADD_COMMON)
+ 
+-
+-# -Wl,--build-id=none is needed when linking tools on Linux. Without this
+-# flag newer ld versions (2.20 and later) create a .note.gnu.build-id at the
+-# default text segment address, which of course means the resulting executable
+-# is unusable. So we have to tell ld not to generate that, with --build-id=none.
+ TOOL_LDFLAGS_COMMON_LINUX = \
+-	-static -nodefaultlibs -nostartfiles -u _start @FLAG_NO_BUILD_ID@
++	-static -nodefaultlibs -nostartfiles -u _start
+ 
+ TOOL_LDFLAGS_COMMON_DARWIN = \
+ 	-nodefaultlibs -nostartfiles -Wl,-u,__start -Wl,-e,__start
+diff -ur valgrind-3.8.1.orig/exp-bbv/tests/amd64-linux/Makefile.in valgrind-3.8.1/exp-bbv/tests/amd64-linux/Makefile.in
+--- valgrind-3.8.1.orig/exp-bbv/tests/amd64-linux/Makefile.in	2013-03-20 17:11:49.763124773 +0100
++++ valgrind-3.8.1/exp-bbv/tests/amd64-linux/Makefile.in	2013-03-20 17:12:43.286336551 +0100
+@@ -139,7 +139,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/exp-bbv/tests/arm-linux/Makefile.in valgrind-3.8.1/exp-bbv/tests/arm-linux/Makefile.in
+--- valgrind-3.8.1.orig/exp-bbv/tests/arm-linux/Makefile.in	2013-03-20 17:11:49.762124769 +0100
++++ valgrind-3.8.1/exp-bbv/tests/arm-linux/Makefile.in	2013-03-20 17:12:43.331336729 +0100
+@@ -122,7 +122,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/exp-bbv/tests/Makefile.in valgrind-3.8.1/exp-bbv/tests/Makefile.in
+--- valgrind-3.8.1.orig/exp-bbv/tests/Makefile.in	2013-03-20 17:11:49.763124773 +0100
++++ valgrind-3.8.1/exp-bbv/tests/Makefile.in	2013-03-20 17:12:43.237336357 +0100
+@@ -150,7 +150,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/exp-bbv/tests/ppc32-linux/Makefile.in valgrind-3.8.1/exp-bbv/tests/ppc32-linux/Makefile.in
+--- valgrind-3.8.1.orig/exp-bbv/tests/ppc32-linux/Makefile.in	2013-03-20 17:11:49.761124765 +0100
++++ valgrind-3.8.1/exp-bbv/tests/ppc32-linux/Makefile.in	2013-03-20 17:12:43.376336907 +0100
+@@ -122,7 +122,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/exp-bbv/tests/x86/Makefile.in valgrind-3.8.1/exp-bbv/tests/x86/Makefile.in
+--- valgrind-3.8.1.orig/exp-bbv/tests/x86/Makefile.in	2013-03-20 17:11:49.764124777 +0100
++++ valgrind-3.8.1/exp-bbv/tests/x86/Makefile.in	2013-03-20 17:12:43.468337271 +0100
+@@ -131,7 +131,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/exp-bbv/tests/x86-linux/Makefile.in valgrind-3.8.1/exp-bbv/tests/x86-linux/Makefile.in
+--- valgrind-3.8.1.orig/exp-bbv/tests/x86-linux/Makefile.in	2013-03-20 17:11:49.761124765 +0100
++++ valgrind-3.8.1/exp-bbv/tests/x86-linux/Makefile.in	2013-03-20 17:12:43.421337085 +0100
+@@ -122,7 +122,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/exp-dhat/Makefile.in valgrind-3.8.1/exp-dhat/Makefile.in
+--- valgrind-3.8.1.orig/exp-dhat/Makefile.in	2013-03-20 17:11:49.744124698 +0100
++++ valgrind-3.8.1/exp-dhat/Makefile.in	2013-03-20 17:12:43.528337507 +0100
+@@ -191,7 +191,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+@@ -436,13 +436,8 @@
+ @VGCONF_HAVE_PLATFORM_SEC_TRUE@TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@ = \
+ @VGCONF_HAVE_PLATFORM_SEC_TRUE@	$(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@) $(TOOL_LDADD_COMMON)
+ 
+-
+-# -Wl,--build-id=none is needed when linking tools on Linux. Without this
+-# flag newer ld versions (2.20 and later) create a .note.gnu.build-id at the
+-# default text segment address, which of course means the resulting executable
+-# is unusable. So we have to tell ld not to generate that, with --build-id=none.
+ TOOL_LDFLAGS_COMMON_LINUX = \
+-	-static -nodefaultlibs -nostartfiles -u _start @FLAG_NO_BUILD_ID@
++	-static -nodefaultlibs -nostartfiles -u _start
+ 
+ TOOL_LDFLAGS_COMMON_DARWIN = \
+ 	-nodefaultlibs -nostartfiles -Wl,-u,__start -Wl,-e,__start
+diff -ur valgrind-3.8.1.orig/exp-dhat/tests/Makefile.in valgrind-3.8.1/exp-dhat/tests/Makefile.in
+--- valgrind-3.8.1.orig/exp-dhat/tests/Makefile.in	2013-03-20 17:11:49.744124698 +0100
++++ valgrind-3.8.1/exp-dhat/tests/Makefile.in	2013-03-20 17:12:43.557337623 +0100
+@@ -82,7 +82,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/exp-sgcheck/Makefile.in valgrind-3.8.1/exp-sgcheck/Makefile.in
+--- valgrind-3.8.1.orig/exp-sgcheck/Makefile.in	2013-03-20 17:11:49.727124630 +0100
++++ valgrind-3.8.1/exp-sgcheck/Makefile.in	2013-03-20 17:12:43.636337935 +0100
+@@ -210,7 +210,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+@@ -455,13 +455,8 @@
+ @VGCONF_HAVE_PLATFORM_SEC_TRUE@TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@ = \
+ @VGCONF_HAVE_PLATFORM_SEC_TRUE@	$(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@) $(TOOL_LDADD_COMMON)
+ 
+-
+-# -Wl,--build-id=none is needed when linking tools on Linux. Without this
+-# flag newer ld versions (2.20 and later) create a .note.gnu.build-id at the
+-# default text segment address, which of course means the resulting executable
+-# is unusable. So we have to tell ld not to generate that, with --build-id=none.
+ TOOL_LDFLAGS_COMMON_LINUX = \
+-	-static -nodefaultlibs -nostartfiles -u _start @FLAG_NO_BUILD_ID@
++	-static -nodefaultlibs -nostartfiles -u _start
+ 
+ TOOL_LDFLAGS_COMMON_DARWIN = \
+ 	-nodefaultlibs -nostartfiles -Wl,-u,__start -Wl,-e,__start
+diff -ur valgrind-3.8.1.orig/exp-sgcheck/tests/Makefile.in valgrind-3.8.1/exp-sgcheck/tests/Makefile.in
+--- valgrind-3.8.1.orig/exp-sgcheck/tests/Makefile.in	2013-03-20 17:11:49.726124626 +0100
++++ valgrind-3.8.1/exp-sgcheck/tests/Makefile.in	2013-03-20 17:12:43.689338145 +0100
+@@ -145,7 +145,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/gdbserver_tests/Makefile.in valgrind-3.8.1/gdbserver_tests/Makefile.in
+--- valgrind-3.8.1.orig/gdbserver_tests/Makefile.in	2013-03-20 17:11:49.720124602 +0100
++++ valgrind-3.8.1/gdbserver_tests/Makefile.in	2013-03-20 17:12:43.743338357 +0100
+@@ -152,7 +152,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/helgrind/Makefile.in valgrind-3.8.1/helgrind/Makefile.in
+--- valgrind-3.8.1.orig/helgrind/Makefile.in	2013-03-20 17:11:49.738124674 +0100
++++ valgrind-3.8.1/helgrind/Makefile.in	2013-03-20 17:12:43.832338709 +0100
+@@ -234,7 +234,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+@@ -479,13 +479,8 @@
+ @VGCONF_HAVE_PLATFORM_SEC_TRUE@TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@ = \
+ @VGCONF_HAVE_PLATFORM_SEC_TRUE@	$(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@) $(TOOL_LDADD_COMMON)
+ 
+-
+-# -Wl,--build-id=none is needed when linking tools on Linux. Without this
+-# flag newer ld versions (2.20 and later) create a .note.gnu.build-id at the
+-# default text segment address, which of course means the resulting executable
+-# is unusable. So we have to tell ld not to generate that, with --build-id=none.
+ TOOL_LDFLAGS_COMMON_LINUX = \
+-	-static -nodefaultlibs -nostartfiles -u _start @FLAG_NO_BUILD_ID@
++	-static -nodefaultlibs -nostartfiles -u _start
+ 
+ TOOL_LDFLAGS_COMMON_DARWIN = \
+ 	-nodefaultlibs -nostartfiles -Wl,-u,__start -Wl,-e,__start
+diff -ur valgrind-3.8.1.orig/helgrind/tests/Makefile.in valgrind-3.8.1/helgrind/tests/Makefile.in
+--- valgrind-3.8.1.orig/helgrind/tests/Makefile.in	2013-03-20 17:11:49.734124659 +0100
++++ valgrind-3.8.1/helgrind/tests/Makefile.in	2013-03-20 17:12:43.919339053 +0100
+@@ -358,7 +358,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/include/Makefile.in valgrind-3.8.1/include/Makefile.in
+--- valgrind-3.8.1.orig/include/Makefile.in	2013-03-20 17:11:49.742124690 +0100
++++ valgrind-3.8.1/include/Makefile.in	2013-03-20 17:12:43.952339185 +0100
+@@ -109,7 +109,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/lackey/Makefile.in valgrind-3.8.1/lackey/Makefile.in
+--- valgrind-3.8.1.orig/lackey/Makefile.in	2013-03-20 17:11:49.537123879 +0100
++++ valgrind-3.8.1/lackey/Makefile.in	2013-03-20 17:12:44.008339405 +0100
+@@ -167,7 +167,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+@@ -412,13 +412,8 @@
+ @VGCONF_HAVE_PLATFORM_SEC_TRUE@TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@ = \
+ @VGCONF_HAVE_PLATFORM_SEC_TRUE@	$(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@) $(TOOL_LDADD_COMMON)
+ 
+-
+-# -Wl,--build-id=none is needed when linking tools on Linux. Without this
+-# flag newer ld versions (2.20 and later) create a .note.gnu.build-id at the
+-# default text segment address, which of course means the resulting executable
+-# is unusable. So we have to tell ld not to generate that, with --build-id=none.
+ TOOL_LDFLAGS_COMMON_LINUX = \
+-	-static -nodefaultlibs -nostartfiles -u _start @FLAG_NO_BUILD_ID@
++	-static -nodefaultlibs -nostartfiles -u _start
+ 
+ TOOL_LDFLAGS_COMMON_DARWIN = \
+ 	-nodefaultlibs -nostartfiles -Wl,-u,__start -Wl,-e,__start
+diff -ur valgrind-3.8.1.orig/lackey/tests/Makefile.in valgrind-3.8.1/lackey/tests/Makefile.in
+--- valgrind-3.8.1.orig/lackey/tests/Makefile.in	2013-03-20 17:11:49.537123879 +0100
++++ valgrind-3.8.1/lackey/tests/Makefile.in	2013-03-20 17:12:44.038339525 +0100
+@@ -85,7 +85,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/Makefile.in valgrind-3.8.1/Makefile.in
+--- valgrind-3.8.1.orig/Makefile.in	2013-03-20 17:11:49.744124698 +0100
++++ valgrind-3.8.1/Makefile.in	2013-03-20 17:12:45.965347143 +0100
+@@ -183,7 +183,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+@@ -870,7 +870,7 @@
+ 	*.zip*) \
+ 	  unzip $(distdir).zip ;;\
+ 	esac
+-	chmod -R a-w $(distdir); chmod a+w $(distdir)
++	chmod -R a-w $(distdir); chmod u+w $(distdir)
+ 	mkdir $(distdir)/_build
+ 	mkdir $(distdir)/_inst
+ 	chmod a-w $(distdir)
+diff -ur valgrind-3.8.1.orig/Makefile.vex.in valgrind-3.8.1/Makefile.vex.in
+--- valgrind-3.8.1.orig/Makefile.vex.in	2013-03-20 17:11:49.727124630 +0100
++++ valgrind-3.8.1/Makefile.vex.in	2013-03-20 17:12:41.762330525 +0100
+@@ -249,7 +249,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/massif/Makefile.in valgrind-3.8.1/massif/Makefile.in
+--- valgrind-3.8.1.orig/massif/Makefile.in	2013-03-20 17:11:49.547123919 +0100
++++ valgrind-3.8.1/massif/Makefile.in	2013-03-20 17:12:44.099339765 +0100
+@@ -216,7 +216,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+@@ -461,13 +461,8 @@
+ @VGCONF_HAVE_PLATFORM_SEC_TRUE@TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@ = \
+ @VGCONF_HAVE_PLATFORM_SEC_TRUE@	$(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@) $(TOOL_LDADD_COMMON)
+ 
+-
+-# -Wl,--build-id=none is needed when linking tools on Linux. Without this
+-# flag newer ld versions (2.20 and later) create a .note.gnu.build-id at the
+-# default text segment address, which of course means the resulting executable
+-# is unusable. So we have to tell ld not to generate that, with --build-id=none.
+ TOOL_LDFLAGS_COMMON_LINUX = \
+-	-static -nodefaultlibs -nostartfiles -u _start @FLAG_NO_BUILD_ID@
++	-static -nodefaultlibs -nostartfiles -u _start
+ 
+ TOOL_LDFLAGS_COMMON_DARWIN = \
+ 	-nodefaultlibs -nostartfiles -Wl,-u,__start -Wl,-e,__start
+diff -ur valgrind-3.8.1.orig/massif/tests/Makefile.in valgrind-3.8.1/massif/tests/Makefile.in
+--- valgrind-3.8.1.orig/massif/tests/Makefile.in	2013-03-20 17:11:49.545123911 +0100
++++ valgrind-3.8.1/massif/tests/Makefile.in	2013-03-20 17:12:44.159340003 +0100
+@@ -200,7 +200,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/memcheck/Makefile.in valgrind-3.8.1/memcheck/Makefile.in
+--- valgrind-3.8.1.orig/memcheck/Makefile.in	2013-03-20 17:11:49.696124509 +0100
++++ valgrind-3.8.1/memcheck/Makefile.in	2013-03-20 17:12:44.249340359 +0100
+@@ -234,7 +234,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+@@ -479,13 +479,8 @@
+ @VGCONF_HAVE_PLATFORM_SEC_TRUE@TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@ = \
+ @VGCONF_HAVE_PLATFORM_SEC_TRUE@	$(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@) $(TOOL_LDADD_COMMON)
+ 
+-
+-# -Wl,--build-id=none is needed when linking tools on Linux. Without this
+-# flag newer ld versions (2.20 and later) create a .note.gnu.build-id at the
+-# default text segment address, which of course means the resulting executable
+-# is unusable. So we have to tell ld not to generate that, with --build-id=none.
+ TOOL_LDFLAGS_COMMON_LINUX = \
+-	-static -nodefaultlibs -nostartfiles -u _start @FLAG_NO_BUILD_ID@
++	-static -nodefaultlibs -nostartfiles -u _start
+ 
+ TOOL_LDFLAGS_COMMON_DARWIN = \
+ 	-nodefaultlibs -nostartfiles -Wl,-u,__start -Wl,-e,__start
+diff -ur valgrind-3.8.1.orig/memcheck/tests/amd64/Makefile.in valgrind-3.8.1/memcheck/tests/amd64/Makefile.in
+--- valgrind-3.8.1.orig/memcheck/tests/amd64/Makefile.in	2013-03-20 17:11:49.695124505 +0100
++++ valgrind-3.8.1/memcheck/tests/amd64/Makefile.in	2013-03-20 17:12:44.541341513 +0100
+@@ -141,7 +141,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/memcheck/tests/amd64-linux/Makefile.in valgrind-3.8.1/memcheck/tests/amd64-linux/Makefile.in
+--- valgrind-3.8.1.orig/memcheck/tests/amd64-linux/Makefile.in	2013-03-20 17:11:49.679124441 +0100
++++ valgrind-3.8.1/memcheck/tests/amd64-linux/Makefile.in	2013-03-20 17:12:44.491341315 +0100
+@@ -122,7 +122,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/memcheck/tests/darwin/Makefile.in valgrind-3.8.1/memcheck/tests/darwin/Makefile.in
+--- valgrind-3.8.1.orig/memcheck/tests/darwin/Makefile.in	2013-03-20 17:11:49.683124457 +0100
++++ valgrind-3.8.1/memcheck/tests/darwin/Makefile.in	2013-03-20 17:12:44.590341707 +0100
+@@ -142,7 +142,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/memcheck/tests/linux/Makefile.in valgrind-3.8.1/memcheck/tests/linux/Makefile.in
+--- valgrind-3.8.1.orig/memcheck/tests/linux/Makefile.in	2013-03-20 17:11:49.665124386 +0100
++++ valgrind-3.8.1/memcheck/tests/linux/Makefile.in	2013-03-20 17:12:44.641341909 +0100
+@@ -158,7 +158,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/memcheck/tests/Makefile.in valgrind-3.8.1/memcheck/tests/Makefile.in
+--- valgrind-3.8.1.orig/memcheck/tests/Makefile.in	2013-03-20 17:11:49.681124449 +0100
++++ valgrind-3.8.1/memcheck/tests/Makefile.in	2013-03-20 17:12:44.442341121 +0100
+@@ -731,7 +731,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/memcheck/tests/ppc32/Makefile.in valgrind-3.8.1/memcheck/tests/ppc32/Makefile.in
+--- valgrind-3.8.1.orig/memcheck/tests/ppc32/Makefile.in	2013-03-20 17:11:49.659124362 +0100
++++ valgrind-3.8.1/memcheck/tests/ppc32/Makefile.in	2013-03-20 17:12:44.688342095 +0100
+@@ -119,7 +119,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/memcheck/tests/ppc64/Makefile.in valgrind-3.8.1/memcheck/tests/ppc64/Makefile.in
+--- valgrind-3.8.1.orig/memcheck/tests/ppc64/Makefile.in	2013-03-20 17:11:49.683124458 +0100
++++ valgrind-3.8.1/memcheck/tests/ppc64/Makefile.in	2013-03-20 17:12:44.734342277 +0100
+@@ -119,7 +119,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/memcheck/tests/s390x/Makefile.in valgrind-3.8.1/memcheck/tests/s390x/Makefile.in
+--- valgrind-3.8.1.orig/memcheck/tests/s390x/Makefile.in	2013-03-20 17:11:49.680124445 +0100
++++ valgrind-3.8.1/memcheck/tests/s390x/Makefile.in	2013-03-20 17:12:44.781342463 +0100
+@@ -134,7 +134,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/memcheck/tests/x86/Makefile.in valgrind-3.8.1/memcheck/tests/x86/Makefile.in
+--- valgrind-3.8.1.orig/memcheck/tests/x86/Makefile.in	2013-03-20 17:11:49.690124485 +0100
++++ valgrind-3.8.1/memcheck/tests/x86/Makefile.in	2013-03-20 17:12:44.889342889 +0100
+@@ -164,7 +164,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/memcheck/tests/x86-linux/Makefile.in valgrind-3.8.1/memcheck/tests/x86-linux/Makefile.in
+--- valgrind-3.8.1.orig/memcheck/tests/x86-linux/Makefile.in	2013-03-20 17:11:49.669124402 +0100
++++ valgrind-3.8.1/memcheck/tests/x86-linux/Makefile.in	2013-03-20 17:12:44.830342655 +0100
+@@ -142,7 +142,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/mpi/Makefile.in valgrind-3.8.1/mpi/Makefile.in
+--- valgrind-3.8.1.orig/mpi/Makefile.in	2013-03-20 17:11:49.539123887 +0100
++++ valgrind-3.8.1/mpi/Makefile.in	2013-03-20 17:12:44.940343091 +0100
+@@ -140,7 +140,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/none/Makefile.in valgrind-3.8.1/none/Makefile.in
+--- valgrind-3.8.1.orig/none/Makefile.in	2013-03-20 17:11:49.622124215 +0100
++++ valgrind-3.8.1/none/Makefile.in	2013-03-20 17:12:44.996343313 +0100
+@@ -165,7 +165,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+@@ -410,13 +410,8 @@
+ @VGCONF_HAVE_PLATFORM_SEC_TRUE@TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@ = \
+ @VGCONF_HAVE_PLATFORM_SEC_TRUE@	$(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@) $(TOOL_LDADD_COMMON)
+ 
+-
+-# -Wl,--build-id=none is needed when linking tools on Linux. Without this
+-# flag newer ld versions (2.20 and later) create a .note.gnu.build-id at the
+-# default text segment address, which of course means the resulting executable
+-# is unusable. So we have to tell ld not to generate that, with --build-id=none.
+ TOOL_LDFLAGS_COMMON_LINUX = \
+-	-static -nodefaultlibs -nostartfiles -u _start @FLAG_NO_BUILD_ID@
++	-static -nodefaultlibs -nostartfiles -u _start
+ 
+ TOOL_LDFLAGS_COMMON_DARWIN = \
+ 	-nodefaultlibs -nostartfiles -Wl,-u,__start -Wl,-e,__start
+diff -ur valgrind-3.8.1.orig/none/tests/amd64/Makefile.in valgrind-3.8.1/none/tests/amd64/Makefile.in
+--- valgrind-3.8.1.orig/none/tests/amd64/Makefile.in	2013-03-20 17:11:49.617124195 +0100
++++ valgrind-3.8.1/none/tests/amd64/Makefile.in	2013-03-20 17:12:45.206344143 +0100
+@@ -344,7 +344,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/none/tests/arm/Makefile.in valgrind-3.8.1/none/tests/arm/Makefile.in
+--- valgrind-3.8.1.orig/none/tests/arm/Makefile.in	2013-03-20 17:11:49.567123996 +0100
++++ valgrind-3.8.1/none/tests/arm/Makefile.in	2013-03-20 17:12:45.270344395 +0100
+@@ -156,7 +156,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/none/tests/darwin/Makefile.in valgrind-3.8.1/none/tests/darwin/Makefile.in
+--- valgrind-3.8.1.orig/none/tests/darwin/Makefile.in	2013-03-20 17:11:49.592124096 +0100
++++ valgrind-3.8.1/none/tests/darwin/Makefile.in	2013-03-20 17:12:45.316344577 +0100
+@@ -124,7 +124,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/none/tests/linux/Makefile.in valgrind-3.8.1/none/tests/linux/Makefile.in
+--- valgrind-3.8.1.orig/none/tests/linux/Makefile.in	2013-03-20 17:11:49.559123964 +0100
++++ valgrind-3.8.1/none/tests/linux/Makefile.in	2013-03-20 17:12:45.362344759 +0100
+@@ -127,7 +127,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/none/tests/Makefile.in valgrind-3.8.1/none/tests/Makefile.in
+--- valgrind-3.8.1.orig/none/tests/Makefile.in	2013-03-20 17:11:49.591124092 +0100
++++ valgrind-3.8.1/none/tests/Makefile.in	2013-03-20 17:12:45.116343787 +0100
+@@ -503,7 +503,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/none/tests/mips32/Makefile.in valgrind-3.8.1/none/tests/mips32/Makefile.in
+--- valgrind-3.8.1.orig/none/tests/mips32/Makefile.in	2013-03-20 17:11:49.571124012 +0100
++++ valgrind-3.8.1/none/tests/mips32/Makefile.in	2013-03-20 17:12:45.414344965 +0100
+@@ -151,7 +151,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/none/tests/ppc32/Makefile.in valgrind-3.8.1/none/tests/ppc32/Makefile.in
+--- valgrind-3.8.1.orig/none/tests/ppc32/Makefile.in	2013-03-20 17:11:49.554123947 +0100
++++ valgrind-3.8.1/none/tests/ppc32/Makefile.in	2013-03-20 17:12:45.498345297 +0100
+@@ -233,7 +233,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/none/tests/ppc64/Makefile.in valgrind-3.8.1/none/tests/ppc64/Makefile.in
+--- valgrind-3.8.1.orig/none/tests/ppc64/Makefile.in	2013-03-20 17:11:49.596124112 +0100
++++ valgrind-3.8.1/none/tests/ppc64/Makefile.in	2013-03-20 17:12:45.576345605 +0100
+@@ -200,7 +200,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/none/tests/s390x/Makefile.in valgrind-3.8.1/none/tests/s390x/Makefile.in
+--- valgrind-3.8.1.orig/none/tests/s390x/Makefile.in	2013-03-20 17:11:49.586124072 +0100
++++ valgrind-3.8.1/none/tests/s390x/Makefile.in	2013-03-20 17:12:45.674345993 +0100
+@@ -381,7 +381,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/none/tests/x86/Makefile.in valgrind-3.8.1/none/tests/x86/Makefile.in
+--- valgrind-3.8.1.orig/none/tests/x86/Makefile.in	2013-03-20 17:11:49.607124156 +0100
++++ valgrind-3.8.1/none/tests/x86/Makefile.in	2013-03-20 17:12:45.808346523 +0100
+@@ -306,7 +306,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/none/tests/x86-linux/Makefile.in valgrind-3.8.1/none/tests/x86-linux/Makefile.in
+--- valgrind-3.8.1.orig/none/tests/x86-linux/Makefile.in	2013-03-20 17:11:49.562123976 +0100
++++ valgrind-3.8.1/none/tests/x86-linux/Makefile.in	2013-03-20 17:12:45.719346171 +0100
+@@ -120,7 +120,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/perf/Makefile.in valgrind-3.8.1/perf/Makefile.in
+--- valgrind-3.8.1.orig/perf/Makefile.in	2013-03-20 17:11:49.724124618 +0100
++++ valgrind-3.8.1/perf/Makefile.in	2013-03-20 17:12:45.864346745 +0100
+@@ -152,7 +152,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
+diff -ur valgrind-3.8.1.orig/tests/Makefile.in valgrind-3.8.1/tests/Makefile.in
+--- valgrind-3.8.1.orig/tests/Makefile.in	2013-03-20 17:11:49.743124694 +0100
++++ valgrind-3.8.1/tests/Makefile.in	2013-03-20 17:12:45.915346945 +0100
+@@ -138,7 +138,7 @@
+ FLAG_M64 = @FLAG_M64@
+ FLAG_MMMX = @FLAG_MMMX@
+ FLAG_MSSE = @FLAG_MSSE@
+-FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
++FLAG_T_TEXT = @FLAG_T_TEXT@
+ FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+ FLAG_W_EXTRA = @FLAG_W_EXTRA@
+ FLAG_W_NO_EMPTY_BODY = @FLAG_W_NO_EMPTY_BODY@
diff --git a/valgrind.spec b/valgrind.spec
index 4fd5965..e4ba3d4 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -3,7 +3,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: %{?scl_prefix}valgrind
 Version: 3.8.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 Epoch: 1
 License: GPLv2
 URL: http://www.valgrind.org/
@@ -150,6 +150,9 @@ Patch36: valgrind-3.8.1-static-variables.patch
 # KDE#316144, KDE#315959, KDE#316145 - various manpage fixes
 Patch37: valgrind-3.8.1-manpages.patch
 
+# KDE#317091 Use -Wl,-Ttext-segment when static linking to keep build-ids
+Patch38: valgrind-3.8.1-text-segment.patch
+
 %ifarch x86_64 ppc64
 # Ensure glibc{,-devel} is installed for both multilib arches
 BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
@@ -204,11 +207,6 @@ ExclusiveArch: %{ix86} x86_64 ppc ppc64 s390x %{arm}
 %define valsecarch %{nil}
 %endif
 
-# Don't barf on mising build-ids when creating the -debuginfo package.
-# See coregrind/link_tool_exe_linux.in, which links the tool executables
-# statically and at an alternative load address.
-%undefine _missing_build_ids_terminate_build
-
 %description
 Valgrind is a tool to help you find memory-management problems in your
 programs. When a program is run under Valgrind's supervision, all
@@ -287,6 +285,7 @@ touch ./none/tests/amd64/bmi.stderr.exp
 touch ./memcheck/tests/linux/getregset.stderr.exp
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 
 # To suppress eventual automake warnings/errors
 rm -f gdbserver_tests/filter_gdb.orig
@@ -436,6 +435,10 @@ echo ===============END TESTING===============
 %endif
 
 %changelog
+* Wed Mar 20 2013 Mark Wielaard <mjw@redhat.com> 3.8.1-12
+- Add valgrind-3.8.1-text-segment.patch
+- Don't undefine _missing_build_ids_terminate_build.
+
 * Tue Mar 12 2013 Mark Wielaard <mjw@redhat.com> 3.8.1-11
 - Add valgrind-3.8.1-manpages.patch