From b1d1244d3c3aac9df8de11120c6a8b6d56d5278a646a0b7e93a30ac211116bcf Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Tue, 8 Jul 2008 16:23:20 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/gdb?expand=0&rev=37

---
 expand-line-sal-maybe.diff      | 26 ++++++++++++++++++++++++++
 gdb-6.8.50.20080618-cvs.tar.bz2 |  3 ---
 gdb-6.8.50.20080708-cvs.tar.bz2 |  3 +++
 gdb.changes                     |  5 +++++
 gdb.spec                        | 14 +++++++++-----
 5 files changed, 43 insertions(+), 8 deletions(-)
 create mode 100644 expand-line-sal-maybe.diff
 delete mode 100644 gdb-6.8.50.20080618-cvs.tar.bz2
 create mode 100644 gdb-6.8.50.20080708-cvs.tar.bz2

diff --git a/expand-line-sal-maybe.diff b/expand-line-sal-maybe.diff
new file mode 100644
index 0000000..194608f
--- /dev/null
+++ b/expand-line-sal-maybe.diff
@@ -0,0 +1,26 @@
+Index: gdb/breakpoint.c
+===================================================================
+RCS file: /cvs/src/src/gdb/breakpoint.c,v
+retrieving revision 1.325
+diff -u -a -p -u -p -a -r1.325 gdb/breakpoint.c
+--- gdb/breakpoint.c	10 Jun 2008 09:29:15 -0000	1.325
++++ gdb/breakpoint.c	22 Jun 2008 23:51:37 -0000
+@@ -5211,18 +5211,6 @@ expand_line_sal_maybe (struct symtab_and
+       return expanded;      
+     }
+ 
+-  if (original_pc)
+-    {
+-      found = 0;
+-      for (i = 0; i < expanded.nelts; ++i)
+-	if (expanded.sals[i].pc == original_pc)
+-	  {
+-	    found = 1;
+-	    break;
+-	  }
+-      gdb_assert (found);
+-    }
+-
+   return expanded;
+ }
+ 
diff --git a/gdb-6.8.50.20080618-cvs.tar.bz2 b/gdb-6.8.50.20080618-cvs.tar.bz2
deleted file mode 100644
index efe926a..0000000
--- a/gdb-6.8.50.20080618-cvs.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:842b1776aaa3d28c1fde81ca032bb4fc24327415b3043ecb8588c44e5c03d330
-size 15390228
diff --git a/gdb-6.8.50.20080708-cvs.tar.bz2 b/gdb-6.8.50.20080708-cvs.tar.bz2
new file mode 100644
index 0000000..683e511
--- /dev/null
+++ b/gdb-6.8.50.20080708-cvs.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:628687f41bef0db66322e4415c17b42a909a57d806f79b4d4ac04dbe5677b125
+size 15391120
diff --git a/gdb.changes b/gdb.changes
index 13419de..2d8ca03 100644
--- a/gdb.changes
+++ b/gdb.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul  7 13:42:05 CEST 2008 - schwab@suse.de
+
+- Update to head of trunk.
+
 -------------------------------------------------------------------
 Wed Jun 18 16:47:02 CEST 2008 - schwab@suse.de
 
diff --git a/gdb.spec b/gdb.spec
index cb4931a..a706af4 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gdb (Version 6.8.50.20080618)
+# spec file for package gdb (Version 6.8.50.20080708)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -29,7 +29,7 @@ Group:          Development/Tools/Debuggers
 AutoReqProv:    on
 PreReq:         %{install_info_prereq}
 Summary:        The GNU Debugger
-Version:        6.8.50.20080618
+Version:        6.8.50.20080708
 Release:        1
 %define sss -cvs
 Source:         gdb-%{version}%{sss}.tar.bz2
@@ -42,6 +42,7 @@ Patch6:         sect-index-text.diff
 Patch7:         pie-relocate.diff
 Patch8:         find-separate-debug-file.diff
 Patch9:         fix-gdb-backtrace.diff
+Patch10:        expand-line-sal-maybe.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -110,9 +111,9 @@ Authors:
 %patch7
 %patch8
 %patch9
+%patch10
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" \
 ./configure --prefix=%{_prefix} --libdir=%{_libdir} --infodir=%{_infodir} \
 	    --mandir=%{_mandir} --with-system-readline \
 %ifarch ia64
@@ -122,12 +123,13 @@ CFLAGS="$RPM_OPT_FLAGS" \
 %endif
 	    --with-separate-debug-dir=%{_prefix}/lib/debug \
 	    --enable-64-bit-bfd --disable-werror \
-	    --build=%{_target_cpu}-suse-linux
+	    --build=%{_target_cpu}-suse-linux \
+	    CFLAGS="$RPM_OPT_FLAGS"
 make %{?jobs:-j%jobs}
 make info
 
 %check
-ulimit -c unlimited
+ulimit -c $(ulimit -Hc)
 TERM=dumb \
 make -k check || :
 
@@ -171,6 +173,8 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Jul 07 2008 schwab@suse.de
+- Update to head of trunk.
 * Wed Jun 18 2008 schwab@suse.de
 - Update to head of trunk.
 * Fri May 23 2008 matz@suse.de