From 54956de3d364911fa394dcdb021c4c9f89ce445b Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Thu, 29 Nov 2012 15:05:08 +0100 Subject: [PATCH] Rebase to FSF GDB 7.5.1 (7.5 stable branch). --- .gitignore | 2 +- gdb-step-symless.patch | 160 ----------------------------------------- gdb.spec | 11 ++- sources | 2 +- 4 files changed, 7 insertions(+), 168 deletions(-) delete mode 100644 gdb-step-symless.patch diff --git a/.gitignore b/.gitignore index beb0963..0e177ad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /gdb-libstdc++-v3-python-r155978.tar.bz2 -/gdb-7.5.0.20120926.tar.bz2 +/gdb-7.5.1.tar.bz2 diff --git a/gdb-step-symless.patch b/gdb-step-symless.patch deleted file mode 100644 index 5bca453..0000000 --- a/gdb-step-symless.patch +++ /dev/null @@ -1,160 +0,0 @@ -http://sourceware.org/ml/gdb-patches/2012-09/msg00598.html -Subject: [patch+7.5] Fix ppc32 7.5 stepping crash regression - -Hello, - -since - [PATCH] PowerPC 32 with Secure PLT - http://sourceware.org/ml/gdb-patches/2012-01/msg00655.html - http://sourceware.org/ml/gdb-patches/2012-01/msg00656.html - commit 4d19ed66762845cdcce95f8b1daaceb97cf90c71 - Author: eager - Date: Mon Jan 30 17:09:37 2012 +0000 - Support stepping through PPC PLT with securePLT. - -(gdb) step -Single stepping until exit from function main, -which has no line number information. - -Program received signal SIGSEGV, Segmentation fault. -0x00000000100898d8 in powerpc_linux_in_dynsym_resolve_code (pc=268436636) at ppc-linux-tdep.c:651 -651 if ((strcmp (SYMBOL_LINKAGE_NAME (sym), "__glink") == 0) -(gdb) p sym -$1 = (struct minimal_symbol *) 0x0 -(gdb) bt -#0 0x00000000100898d8 in powerpc_linux_in_dynsym_resolve_code (pc=268436636) at ppc-linux-tdep.c:651 -#1 0x00000000103fdf44 in in_solib_dynsym_resolve_code (pc=268436636) at solib.c:1185 -#2 0x000000001025d848 in handle_inferior_event (ecs=0xfffffbbdcf0) at infrun.c:4737 -[...] - -I will check it in. - -Not regression tested. - - -Regards, -Jan - - -gdb/ -2012-09-26 Jan Kratochvil - - Fix crash during stepping on ppc32. - * ppc-linux-tdep.c (powerpc_linux_in_dynsym_resolve_code): Test NULL - SYM. - -gdb/testsuite/ -2012-09-26 Jan Kratochvil - - Fix crash during stepping on ppc32. - * gdb.base/step-symless.c: New file. - * gdb.base/step-symless.exp: New file. - -diff --git a/gdb/ppc-linux-tdep.c b/gdb/ppc-linux-tdep.c -index c7b70db..ccded83 100644 ---- a/gdb/ppc-linux-tdep.c -+++ b/gdb/ppc-linux-tdep.c -@@ -648,8 +648,9 @@ powerpc_linux_in_dynsym_resolve_code (CORE_ADDR pc) - - /* Check if we are in the resolver. */ - sym = lookup_minimal_symbol_by_pc (pc); -- if ((strcmp (SYMBOL_LINKAGE_NAME (sym), "__glink") == 0) -- || (strcmp (SYMBOL_LINKAGE_NAME (sym), "__glink_PLTresolve") == 0)) -+ if (sym != NULL -+ && (strcmp (SYMBOL_LINKAGE_NAME (sym), "__glink") == 0 -+ || strcmp (SYMBOL_LINKAGE_NAME (sym), "__glink_PLTresolve") == 0)) - return 1; - - return 0; -diff --git a/gdb/testsuite/gdb.base/step-symless.c b/gdb/testsuite/gdb.base/step-symless.c -new file mode 100644 -index 0000000..97eaf5e ---- /dev/null -+++ b/gdb/testsuite/gdb.base/step-symless.c -@@ -0,0 +1,38 @@ -+/* This testcase is part of GDB, the GNU debugger. -+ -+ Copyright 2012 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 3 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program. If not, see . */ -+ -+static volatile int v; -+ -+static void -+symful (void) -+{ -+ v++; -+} -+ -+static void -+symless (void) -+{ -+ v++; -+} -+ -+int -+main (void) -+{ -+ symless (); -+ symful (); -+ return 0; -+} -diff --git a/gdb/testsuite/gdb.base/step-symless.exp b/gdb/testsuite/gdb.base/step-symless.exp -new file mode 100644 -index 0000000..d79edb2 ---- /dev/null -+++ b/gdb/testsuite/gdb.base/step-symless.exp -@@ -0,0 +1,41 @@ -+# Copyright (C) 2012 Free Software Foundation, Inc. -+ -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 3 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program. If not, see . -+ -+standard_testfile -+if {[build_executable ${testfile}.exp ${testfile} ${srcfile} {nodebug}] == -1} { -+ return -1 -+} -+ -+# We need those symbols global to access them from the .S file. -+set test "strip stub symbols" -+set objcopy_program [transform objcopy] -+set result [catch "exec $objcopy_program -N symless ${binfile}" output] -+verbose "result is $result" -+verbose "output is $output" -+if {$result != 0} { -+ fail $test -+ return -+} -+pass $test -+ -+clean_restart $testfile -+ -+if ![runto_main] { -+ return -1 -+} -+ -+gdb_breakpoint symful -+ -+gdb_test "step" "Single stepping until exit.*no line number information.*\r\nBreakpoint \[^\r\n\]* in \\.?symful \\(\\)" - diff --git a/gdb.spec b/gdb.spec index e320908..3634bb8 100644 --- a/gdb.spec +++ b/gdb.spec @@ -30,11 +30,11 @@ Name: %{?scl_prefix}gdb %global snap 20120817 # See timestamp of source gnulib installed into gdb/gnulib/ . %global snapgnulib 20120623 -Version: 7.5.0.20120926 +Version: 7.5.1 # 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: 26%{?dist} +Release: 27%{?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 @@ -565,9 +565,6 @@ Patch703: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch #=fedora Patch716: gdb-minidebuginfo.patch -# [ppc32] Fix stepping over symbol-less code crash regression (BZ 860696). -Patch725: gdb-step-symless.patch - # Fix crash printing classes (BZ 849357, Tom Tromey). Patch726: gdb-print-class.patch @@ -910,7 +907,6 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc-exp.c gdb/p-exp.c gdb/go-exp.c %patch698 -p1 %patch703 -p1 %patch716 -p1 -%patch725 -p1 %patch726 -p1 %patch728 -p1 %patch729 -p1 @@ -1432,6 +1428,9 @@ fi %endif # 0%{!?el5:1} || "%{_target_cpu}" == "noarch" %changelog +* Thu Nov 29 2012 Jan Kratochvil - 7.5.1-27.fc18 +- Rebase to FSF GDB 7.5.1 (7.5 stable branch). + * Fri Nov 9 2012 Jan Kratochvil - 7.5.0.20120926-26.fc18 - Fix `GDB cannot access struct member whose offset is larger than 256MB' (RH BZ 871066). diff --git a/sources b/sources index f5cf524..6f2429f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 4981307aa9619bbec5b73261e4e41c8d gdb-libstdc++-v3-python-r155978.tar.bz2 -813b1d4f93e0eb56ff81d147de2286fb gdb-7.5.0.20120926.tar.bz2 +3f48f468b24447cf24820054ff6e85b1 gdb-7.5.1.tar.bz2