From 2571983af5243641357182c488eafa2289cd1dae Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@redhat.com>
Date: Apr 02 2013 16:38:36 +0000
Subject: Replace valgrind-3.8.1-text-segment.patch with upstream variant.


---

diff --git a/valgrind-3.8.1-text-segment.patch b/valgrind-3.8.1-text-segment.patch
index 0273459..8d33d47 100644
--- a/valgrind-3.8.1-text-segment.patch
+++ b/valgrind-3.8.1-text-segment.patch
@@ -1,21 +1,3 @@
-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
@@ -61,6 +43,57 @@ index 391b763..9aadfa2 100644
    AC_MSG_RESULT([no])
  ])
  CFLAGS=$safe_CFLAGS
+diff --git a/configure.in b/configure.in
+index 6e2a675..424f8e6 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1723,14 +1723,46 @@ CFLAGS="-Wl,-Ttext-segment=$valt_load_address_pri_norml"
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([ ], [return 0;])],
+ [
++  linker_using_t_text="no"
+   AC_SUBST([FLAG_T_TEXT], ["-Ttext-segment"])
+   AC_MSG_RESULT([yes])
+ ], [
++  linker_using_t_text="yes"
+   AC_SUBST([FLAG_T_TEXT], ["-Ttext"])
+   AC_MSG_RESULT([no])
+ ])
+ CFLAGS=$safe_CFLAGS
+ 
++# If the linker only supports -Ttext (not -Ttext-segment) then we will
++# have to strip any build-id ELF NOTEs from the staticly linked tools.
++# Otherwise the build-id NOTE might end up at the default load address.
++# (Pedantically if the linker is gold then -Ttext is fine, but newer
++# gold versions also support -Ttext-segment. So just assume that unless
++# we can use -Ttext-segment we need to strip the build-id NOTEs.
++if test "x${linker_using_t_text}" == "xyes"; then
++AC_MSG_NOTICE([ld -Ttext used, need to strip build-id NOTEs.])
++# 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.
++AC_MSG_CHECKING([if the linker accepts -Wl,--build-id=none])
++safe_CFLAGS=$CFLAGS
++CFLAGS="-Wl,--build-id=none"
++
++AC_LINK_IFELSE(
++[AC_LANG_PROGRAM([ ], [return 0;])],
++[
++  AC_SUBST([FLAG_NO_BUILD_ID], ["-Wl,--build-id=none"])
++  AC_MSG_RESULT([yes])
++], [
++  AC_SUBST([FLAG_NO_BUILD_ID], [""])
++  AC_MSG_RESULT([no])
++])
++else
++AC_MSG_NOTICE([ld -Ttext-segment used, no need to strip build-id NOTEs.])
++AC_SUBST([FLAG_NO_BUILD_ID], [""])
++fi
++CFLAGS=$safe_CFLAGS
+ 
+ # does the ppc assembler support "mtocrf" et al?
+ AC_MSG_CHECKING([if ppc32/64 as supports mtocrf/mfocrf])
 --- 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 @@
@@ -115,127 +148,86 @@ index 391b763..9aadfa2 100644
  # 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@
+--- valgrind-3.8.1.orig/auxprogs/Makefile.in	2013-04-02 17:57:17.050898570 +0200
++++ valgrind-3.8.1/auxprogs/Makefile.in	2013-04-02 17:57:28.199938856 +0200
+@@ -120,6 +120,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/cachegrind/Makefile.in	2013-04-02 17:57:17.030898498 +0200
++++ valgrind-3.8.1/cachegrind/Makefile.in	2013-04-02 17:57:28.301939225 +0200
+@@ -222,6 +222,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/cachegrind/tests/Makefile.in	2013-04-02 17:57:17.030898498 +0200
++++ valgrind-3.8.1/cachegrind/tests/Makefile.in	2013-04-02 17:57:28.356939423 +0200
+@@ -168,6 +168,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/cachegrind/tests/x86/Makefile.in	2013-04-02 17:57:17.030898498 +0200
++++ valgrind-3.8.1/cachegrind/tests/x86/Makefile.in	2013-04-02 17:57:28.402939589 +0200
+@@ -120,6 +120,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/callgrind/Makefile.in	2013-04-02 17:57:17.146898918 +0200
++++ valgrind-3.8.1/callgrind/Makefile.in	2013-04-02 17:57:28.556940145 +0200
+@@ -239,6 +239,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/callgrind/tests/Makefile.in	2013-04-02 17:57:17.146898918 +0200
++++ valgrind-3.8.1/callgrind/tests/Makefile.in	2013-04-02 17:57:28.608940333 +0200
+@@ -161,6 +161,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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
+--- valgrind-3.8.1.orig/configure	2013-04-02 17:57:17.158898961 +0200
++++ valgrind-3.8.1/configure	2013-04-02 17:57:32.984956139 +0200
+@@ -657,6 +657,7 @@
  BUILD_SSE3_TESTS_FALSE
  BUILD_SSE3_TESTS_TRUE
--FLAG_NO_BUILD_ID
+ FLAG_NO_BUILD_ID
 +FLAG_T_TEXT
  DWARF4_FALSE
  DWARF4_TRUE
  FLAG_UNLIMITED_INLINE_UNIT_GROWTH
-@@ -7913,16 +7913,25 @@
+@@ -7913,14 +7914,73 @@
  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
@@ -249,787 +241,637 @@ diff -ur valgrind-3.8.1.orig/configure valgrind-3.8.1/configure
 +# 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"
++
++safe_CFLAGS=$CFLAGS
 +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"
++
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++int
++main ()
++{
++return 0;
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++
++  linker_using_t_text="no"
 +  FLAG_T_TEXT="-Ttext-segment"
- 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 
- else
- 
--  FLAG_NO_BUILD_ID=""
++
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
++else
++
++  linker_using_t_text="yes"
 +  FLAG_T_TEXT="-Ttext"
- 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
++
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++CFLAGS=$safe_CFLAGS
++
++# If the linker only supports -Ttext (not -Ttext-segment) then we will
++# have to strip any build-id ELF NOTEs from the staticly linked tools.
++# Otherwise the build-id NOTE might end up at the default load address.
++# (Pedantically if the linker is gold then -Ttext is fine, but newer
++# gold versions also support -Ttext-segment. So just assume that unless
++# we can use -Ttext-segment we need to strip the build-id NOTEs.
++if test "x${linker_using_t_text}" == "xyes"; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: ld -Ttext used, need to strip build-id NOTEs." >&5
++$as_echo "$as_me: ld -Ttext used, need to strip build-id NOTEs." >&6;}
+ # 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.
+-
+ { $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; }
+-
+ safe_CFLAGS=$CFLAGS
+ CFLAGS="-Wl,--build-id=none"
+ 
+@@ -7952,8 +8012,13 @@
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+-CFLAGS=$safe_CFLAGS
++else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: ld -Ttext-segment used, no need to strip build-id NOTEs." >&5
++$as_echo "$as_me: ld -Ttext-segment used, no need to strip build-id NOTEs." >&6;}
++FLAG_NO_BUILD_ID=""
+ 
++fi
++CFLAGS=$safe_CFLAGS
+ 
+ # does the ppc assembler support "mtocrf" et al?
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ppc32/64 as supports mtocrf/mfocrf" >&5
 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@
+--- valgrind-3.8.1.orig/coregrind/Makefile.in	2013-04-02 17:57:17.116898809 +0200
++++ valgrind-3.8.1/coregrind/Makefile.in	2013-04-02 17:57:29.304942848 +0200
+@@ -703,6 +703,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/docs/Makefile.in	2013-04-02 17:57:17.157898957 +0200
++++ valgrind-3.8.1/docs/Makefile.in	2013-04-02 17:57:29.344942992 +0200
+@@ -83,6 +83,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/drd/Makefile.in	2013-04-02 17:57:17.049898567 +0200
++++ valgrind-3.8.1/drd/Makefile.in	2013-04-02 17:57:29.491943523 +0200
+@@ -268,6 +268,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/drd/tests/Makefile.in	2013-04-02 17:57:17.043898545 +0200
++++ valgrind-3.8.1/drd/tests/Makefile.in	2013-04-02 17:57:29.625944007 +0200
+@@ -477,6 +477,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/exp-bbv/Makefile.in	2013-04-02 17:57:17.162898976 +0200
++++ valgrind-3.8.1/exp-bbv/Makefile.in	2013-04-02 17:57:29.688944235 +0200
+@@ -168,6 +168,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/exp-bbv/tests/amd64-linux/Makefile.in	2013-04-02 17:57:17.161898973 +0200
++++ valgrind-3.8.1/exp-bbv/tests/amd64-linux/Makefile.in	2013-04-02 17:57:29.788944595 +0200
+@@ -140,6 +140,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/exp-bbv/tests/arm-linux/Makefile.in	2013-04-02 17:57:17.160898969 +0200
++++ valgrind-3.8.1/exp-bbv/tests/arm-linux/Makefile.in	2013-04-02 17:57:29.836944769 +0200
+@@ -123,6 +123,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/exp-bbv/tests/Makefile.in	2013-04-02 17:57:17.162898976 +0200
++++ valgrind-3.8.1/exp-bbv/tests/Makefile.in	2013-04-02 17:57:29.735944405 +0200
+@@ -151,6 +151,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/exp-bbv/tests/ppc32-linux/Makefile.in	2013-04-02 17:57:17.159898965 +0200
++++ valgrind-3.8.1/exp-bbv/tests/ppc32-linux/Makefile.in	2013-04-02 17:57:29.885944945 +0200
+@@ -123,6 +123,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/exp-bbv/tests/x86/Makefile.in	2013-04-02 17:57:17.162898976 +0200
++++ valgrind-3.8.1/exp-bbv/tests/x86/Makefile.in	2013-04-02 17:57:29.987945315 +0200
+@@ -132,6 +132,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/exp-bbv/tests/x86-linux/Makefile.in	2013-04-02 17:57:17.160898969 +0200
++++ valgrind-3.8.1/exp-bbv/tests/x86-linux/Makefile.in	2013-04-02 17:57:29.935945126 +0200
+@@ -123,6 +123,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/exp-dhat/Makefile.in	2013-04-02 17:57:17.143898906 +0200
++++ valgrind-3.8.1/exp-dhat/Makefile.in	2013-04-02 17:57:30.052945550 +0200
+@@ -192,6 +192,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/exp-dhat/tests/Makefile.in	2013-04-02 17:57:17.143898906 +0200
++++ valgrind-3.8.1/exp-dhat/tests/Makefile.in	2013-04-02 17:57:30.083945661 +0200
+@@ -83,6 +83,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/exp-sgcheck/Makefile.in	2013-04-02 17:57:17.127898849 +0200
++++ valgrind-3.8.1/exp-sgcheck/Makefile.in	2013-04-02 17:57:30.168945969 +0200
+@@ -211,6 +211,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/exp-sgcheck/tests/Makefile.in	2013-04-02 17:57:17.126898845 +0200
++++ valgrind-3.8.1/exp-sgcheck/tests/Makefile.in	2013-04-02 17:57:30.227946183 +0200
+@@ -146,6 +146,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/gdbserver_tests/Makefile.in	2013-04-02 17:57:17.121898828 +0200
++++ valgrind-3.8.1/gdbserver_tests/Makefile.in	2013-04-02 17:57:30.284946388 +0200
+@@ -153,6 +153,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/helgrind/Makefile.in	2013-04-02 17:57:17.138898889 +0200
++++ valgrind-3.8.1/helgrind/Makefile.in	2013-04-02 17:57:30.380946734 +0200
+@@ -235,6 +235,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/helgrind/tests/Makefile.in	2013-04-02 17:57:17.134898874 +0200
++++ valgrind-3.8.1/helgrind/tests/Makefile.in	2013-04-02 17:57:30.473947070 +0200
+@@ -359,6 +359,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/include/Makefile.in	2013-04-02 17:57:17.141898898 +0200
++++ valgrind-3.8.1/include/Makefile.in	2013-04-02 17:57:30.509947200 +0200
+@@ -110,6 +110,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/lackey/Makefile.in	2013-04-02 17:57:16.946898195 +0200
++++ valgrind-3.8.1/lackey/Makefile.in	2013-04-02 17:57:30.569947417 +0200
+@@ -168,6 +168,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/lackey/tests/Makefile.in	2013-04-02 17:57:16.945898192 +0200
++++ valgrind-3.8.1/lackey/tests/Makefile.in	2013-04-02 17:57:30.601947533 +0200
+@@ -86,6 +86,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/Makefile.in	2013-04-02 17:57:17.144898910 +0200
++++ valgrind-3.8.1/Makefile.in	2013-04-02 17:57:32.681955045 +0200
+@@ -184,6 +184,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/Makefile.vex.in	2013-04-02 17:57:17.127898849 +0200
++++ valgrind-3.8.1/Makefile.vex.in	2013-04-02 17:57:28.148938672 +0200
+@@ -250,6 +250,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/massif/Makefile.in	2013-04-02 17:57:16.956898231 +0200
++++ valgrind-3.8.1/massif/Makefile.in	2013-04-02 17:57:30.667947771 +0200
+@@ -217,6 +217,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/massif/tests/Makefile.in	2013-04-02 17:57:16.954898223 +0200
++++ valgrind-3.8.1/massif/tests/Makefile.in	2013-04-02 17:57:30.731948003 +0200
+@@ -201,6 +201,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/memcheck/Makefile.in	2013-04-02 17:57:17.098898743 +0200
++++ valgrind-3.8.1/memcheck/Makefile.in	2013-04-02 17:57:30.827948350 +0200
+@@ -235,6 +235,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/memcheck/tests/amd64/Makefile.in	2013-04-02 17:57:17.097898740 +0200
++++ valgrind-3.8.1/memcheck/tests/amd64/Makefile.in	2013-04-02 17:57:31.141949484 +0200
+@@ -142,6 +142,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/memcheck/tests/amd64-linux/Makefile.in	2013-04-02 17:57:17.082898686 +0200
++++ valgrind-3.8.1/memcheck/tests/amd64-linux/Makefile.in	2013-04-02 17:57:31.087949289 +0200
+@@ -123,6 +123,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/memcheck/tests/darwin/Makefile.in	2013-04-02 17:57:17.086898701 +0200
++++ valgrind-3.8.1/memcheck/tests/darwin/Makefile.in	2013-04-02 17:57:31.194949675 +0200
+@@ -143,6 +143,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/memcheck/tests/linux/Makefile.in	2013-04-02 17:57:17.069898639 +0200
++++ valgrind-3.8.1/memcheck/tests/linux/Makefile.in	2013-04-02 17:57:31.249949874 +0200
+@@ -159,6 +159,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/memcheck/tests/Makefile.in	2013-04-02 17:57:17.084898693 +0200
++++ valgrind-3.8.1/memcheck/tests/Makefile.in	2013-04-02 17:57:31.033949093 +0200
+@@ -732,6 +732,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/memcheck/tests/ppc32/Makefile.in	2013-04-02 17:57:17.064898621 +0200
++++ valgrind-3.8.1/memcheck/tests/ppc32/Makefile.in	2013-04-02 17:57:31.299950054 +0200
+@@ -120,6 +120,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/memcheck/tests/ppc64/Makefile.in	2013-04-02 17:57:17.087898705 +0200
++++ valgrind-3.8.1/memcheck/tests/ppc64/Makefile.in	2013-04-02 17:57:31.349950235 +0200
+@@ -120,6 +120,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/memcheck/tests/s390x/Makefile.in	2013-04-02 17:57:17.083898689 +0200
++++ valgrind-3.8.1/memcheck/tests/s390x/Makefile.in	2013-04-02 17:57:31.400950418 +0200
+@@ -135,6 +135,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/memcheck/tests/x86/Makefile.in	2013-04-02 17:57:17.093898726 +0200
++++ valgrind-3.8.1/memcheck/tests/x86/Makefile.in	2013-04-02 17:57:31.517950841 +0200
+@@ -165,6 +165,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/memcheck/tests/x86-linux/Makefile.in	2013-04-02 17:57:17.073898654 +0200
++++ valgrind-3.8.1/memcheck/tests/x86-linux/Makefile.in	2013-04-02 17:57:31.453950611 +0200
+@@ -143,6 +143,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/mpi/Makefile.in	2013-04-02 17:57:16.948898201 +0200
++++ valgrind-3.8.1/mpi/Makefile.in	2013-04-02 17:57:31.572951039 +0200
+@@ -141,6 +141,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/none/Makefile.in	2013-04-02 17:57:17.028898490 +0200
++++ valgrind-3.8.1/none/Makefile.in	2013-04-02 17:57:31.632951257 +0200
+@@ -166,6 +166,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/none/tests/amd64/Makefile.in	2013-04-02 17:57:17.023898473 +0200
++++ valgrind-3.8.1/none/tests/amd64/Makefile.in	2013-04-02 17:57:31.863952092 +0200
+@@ -345,6 +345,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/none/tests/arm/Makefile.in	2013-04-02 17:57:16.976898304 +0200
++++ valgrind-3.8.1/none/tests/arm/Makefile.in	2013-04-02 17:57:31.933952345 +0200
+@@ -157,6 +157,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/none/tests/darwin/Makefile.in	2013-04-02 17:57:16.998898383 +0200
++++ valgrind-3.8.1/none/tests/darwin/Makefile.in	2013-04-02 17:57:31.982952522 +0200
+@@ -125,6 +125,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/none/tests/linux/Makefile.in	2013-04-02 17:57:16.967898270 +0200
++++ valgrind-3.8.1/none/tests/linux/Makefile.in	2013-04-02 17:57:32.032952702 +0200
+@@ -128,6 +128,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/none/tests/Makefile.in	2013-04-02 17:57:16.998898383 +0200
++++ valgrind-3.8.1/none/tests/Makefile.in	2013-04-02 17:57:31.762951727 +0200
+@@ -504,6 +504,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/none/tests/mips32/Makefile.in	2013-04-02 17:57:16.979898314 +0200
++++ valgrind-3.8.1/none/tests/mips32/Makefile.in	2013-04-02 17:57:32.088952903 +0200
+@@ -152,6 +152,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/none/tests/ppc32/Makefile.in	2013-04-02 17:57:16.962898252 +0200
++++ valgrind-3.8.1/none/tests/ppc32/Makefile.in	2013-04-02 17:57:32.178953228 +0200
+@@ -234,6 +234,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/none/tests/ppc64/Makefile.in	2013-04-02 17:57:17.003898401 +0200
++++ valgrind-3.8.1/none/tests/ppc64/Makefile.in	2013-04-02 17:57:32.260953525 +0200
+@@ -201,6 +201,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/none/tests/s390x/Makefile.in	2013-04-02 17:57:16.993898365 +0200
++++ valgrind-3.8.1/none/tests/s390x/Makefile.in	2013-04-02 17:57:32.366953907 +0200
+@@ -382,6 +382,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/none/tests/x86/Makefile.in	2013-04-02 17:57:17.013898436 +0200
++++ valgrind-3.8.1/none/tests/x86/Makefile.in	2013-04-02 17:57:32.511954432 +0200
+@@ -307,6 +307,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/none/tests/x86-linux/Makefile.in	2013-04-02 17:57:16.969898276 +0200
++++ valgrind-3.8.1/none/tests/x86-linux/Makefile.in	2013-04-02 17:57:32.415954086 +0200
+@@ -121,6 +121,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/perf/Makefile.in	2013-04-02 17:57:17.124898837 +0200
++++ valgrind-3.8.1/perf/Makefile.in	2013-04-02 17:57:32.572954652 +0200
+@@ -153,6 +153,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
+--- valgrind-3.8.1.orig/tests/Makefile.in	2013-04-02 17:57:17.143898906 +0200
++++ valgrind-3.8.1/tests/Makefile.in	2013-04-02 17:57:32.627954850 +0200
+@@ -139,6 +139,7 @@
  FLAG_MMMX = @FLAG_MMMX@
  FLAG_MSSE = @FLAG_MSSE@
--FLAG_NO_BUILD_ID = @FLAG_NO_BUILD_ID@
+ 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@
diff --git a/valgrind.spec b/valgrind.spec
index a4a99ee..6f20a18 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -438,6 +438,7 @@ echo ===============END TESTING===============
 * Tue Apr 02 2013 Mark Wielaard <mjw@redhat.com> 3.8.1-13
 - Fix quoting in valgrind valgrind-3.8.1-enable-armv5.patch and
   remove arm configure hunk from valgrind-3.8.1-text-segment.patch #947440
+- Replace valgrind-3.8.1-text-segment.patch with upstream variant.
 
 * Wed Mar 20 2013 Mark Wielaard <mjw@redhat.com> 3.8.1-12
 - Add valgrind-3.8.1-text-segment.patch