From 78a785d4c57a08a8f5452518fb824a78d43f2ab0 Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Wed, 4 Apr 2012 17:21:33 +0200
Subject: [PATCH] testsuite: Fix break-interp.exp expections for updated glibc
 (BZ 752834).

---
 gdb-dlopen-stap-probe-test.patch | 7 ++++---
 gdb.spec                         | 5 ++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/gdb-dlopen-stap-probe-test.patch b/gdb-dlopen-stap-probe-test.patch
index 55a6a92..99cb62f 100644
--- a/gdb-dlopen-stap-probe-test.patch
+++ b/gdb-dlopen-stap-probe-test.patch
@@ -310,14 +310,15 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.base/break-interp.exp
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/testsuite/gdb.base/break-interp.exp	2011-07-01 21:12:12.000000000 +0200
 +++ gdb-7.3.50.20110722/gdb/testsuite/gdb.base/break-interp.exp	2011-08-10 18:32:21.000000000 +0200
-@@ -108,14 +108,20 @@ proc strip_debug {dest} {
+@@ -108,14 +108,21 @@ proc strip_debug {dest} {
      }
  }
  
 +# Former symbol for solib changes notifications was _dl_debug_state, newer one
-+# is _dl_debug_notify, the right one one traps by `set stop-on-solib-events 1'.
++# is dl_main (in fact _dl_debug_notify but it is inlined without any extra
++# debug info), the right one one traps by `set stop-on-solib-events 1'.
 +
-+set solib_bp {(_dl_debug_state|_dl_debug_notify)}
++set solib_bp {(_dl_debug_state|dl_main)}
 +
  # Implementation of reach.
  
diff --git a/gdb.spec b/gdb.spec
index ac356f4..bc470aa 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -33,7 +33,7 @@ Version: 7.4.50.%{snap}
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 36%{?dist}
+Release: 37%{?dist}
 
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and BSD and Public Domain
 Group: Development/Debuggers
@@ -1348,6 +1348,9 @@ fi
 %endif # 0%{!?el5:1} || "%{_target_cpu}" == "noarch"
 
 %changelog
+* Wed Apr  4 2012 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.4.50.20120120-37.fc17
+- testsuite: Fix break-interp.exp expections for updated glibc (BZ 752834).
+
 * Wed Apr  4 2012 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.4.50.20120120-36.fc17
 - [RHEL5,RHEL6] Reintroduce fix attaching to stopped processes.