[arch-commits] Commit in gdb/trunk (PKGBUILD tui-no-gdbarch.patch)

[Allan McRae]

    Date: Sunday, April 11, 2010 @ 07:51:03
  Author: allan
Revision: 77190

upgpkg: gdb 7.1-2
fix FS#19000 (TUI mode failue), FS#19040 (get old patch out of PKGBUILD)

Added:
  gdb/trunk/tui-no-gdbarch.patch
Modified:
  gdb/trunk/PKGBUILD

----------------------+
 PKGBUILD             |    8 +++----
 tui-no-gdbarch.patch |   54 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2010-04-11 11:45:47 UTC (rev 77189)
+++ PKGBUILD    2010-04-11 11:51:03 UTC (rev 77190)
@@ -4,7 +4,7 @@
 
 pkgname=gdb
 pkgver=7.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNU Debugger"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/gdb/";
@@ -15,13 +15,13 @@
 options=('!libtool')
 install=gdb.install
 source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2
-        gdb-readline-6.0.patch)
+        tui-no-gdbarch.patch)
 md5sums=('21dce610476c054687b52770d2ddc657'
-         '82e9eac057954899092405e9ef97d029')
+         'e2f3f6cb11d72e3727ed4f7c49ea395f')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i $srcdir/gdb-readline-6.0.patch
+  patch -Np1 -i $srcdir/tui-no-gdbarch.patch
   
   ./configure --prefix=/usr --disable-nls \
     --with-system-readline \

Added: tui-no-gdbarch.patch
===================================================================
--- tui-no-gdbarch.patch                                (rev 0)
+++ tui-no-gdbarch.patch        2010-04-11 11:51:03 UTC (rev 77190)
@@ -0,0 +1,54 @@
+2010-03-20  Daniel Jacobowitz  <d...@codesourcery.com>
+
+       * tui/tui-disasm.c (tui_get_begin_asm_address): Default to
+       get_current_arch.
+       * tui/tui-layout.c (extract_display_start_addr): Likewise.
+
+Index: src/gdb/tui/tui-disasm.c
+===================================================================
+RCS file: /cvs/src/src/gdb/tui/tui-disasm.c,v
+retrieving revision 1.33
+diff -u -p -r1.33 tui-disasm.c
+--- src/gdb/tui/tui-disasm.c   1 Jan 2010 07:32:07 -0000       1.33
++++ src/gdb/tui/tui-disasm.c   20 Mar 2010 04:17:05 -0000
+@@ -21,6 +21,7 @@
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+ 
+ #include "defs.h"
++#include "arch-utils.h"
+ #include "symtab.h"
+ #include "breakpoint.h"
+ #include "frame.h"
+@@ -330,7 +331,7 @@ tui_get_begin_asm_address (struct gdbarc
+ {
+   struct tui_gen_win_info *locator;
+   struct tui_locator_element *element;
+-  struct gdbarch *gdbarch = NULL;
++  struct gdbarch *gdbarch = get_current_arch ();
+   CORE_ADDR addr;
+ 
+   locator = tui_locator_win_info_ptr ();
+Index: src/gdb/tui/tui-layout.c
+===================================================================
+RCS file: /cvs/src/src/gdb/tui/tui-layout.c,v
+retrieving revision 1.36
+diff -u -p -r1.36 tui-layout.c
+--- src/gdb/tui/tui-layout.c   1 Jan 2010 07:32:07 -0000       1.36
++++ src/gdb/tui/tui-layout.c   20 Mar 2010 04:17:05 -0000
+@@ -21,6 +21,7 @@
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+ 
+ #include "defs.h"
++#include "arch-utils.h"
+ #include "command.h"
+ #include "symtab.h"
+ #include "frame.h"
+@@ -522,7 +523,7 @@ static void
+ extract_display_start_addr (struct gdbarch **gdbarch_p, CORE_ADDR *addr_p)
+ {
+   enum tui_layout_type cur_layout = tui_current_layout ();
+-  struct gdbarch *gdbarch = NULL;
++  struct gdbarch *gdbarch = get_current_arch ();
+   CORE_ADDR addr;
+   CORE_ADDR pc;
+   struct symtab_and_line cursal = get_current_source_symtab_and_line ();