summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kratochvil <jan.kratochvil@redhat.com>2012-10-06 21:10:29 +0000
committerJan Kratochvil <jan.kratochvil@redhat.com>2012-10-06 21:10:29 +0000
commit9b5928cc4cc6fc4a8b776fb35219961d21e70987 (patch)
tree562ef4b5284173a23b8308b0dc15ccb0a9ca4cd4
parentfdcddf9adc35bbaac17cc05ec902b882510c6cc5 (diff)
downloadgdb-9b5928cc4cc6fc4a8b776fb35219961d21e70987.tar.gz
gdb/
Fix crash during stepping on ppc32. * ppc-linux-tdep.c (powerpc_linux_in_dynsym_resolve_code): Test NULL SYM. gdb/testsuite/ Fix crash during stepping on ppc32. * gdb.base/step-symless.c: New file. * gdb.base/step-symless.exp: New file.
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/ppc-linux-tdep.c5
-rw-r--r--gdb/testsuite/ChangeLog6
-rw-r--r--gdb/testsuite/gdb.base/step-symless.c38
-rw-r--r--gdb/testsuite/gdb.base/step-symless.exp41
5 files changed, 94 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 53f20782201..8fe5e271577 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-06 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ Fix crash during stepping on ppc32.
+ * ppc-linux-tdep.c (powerpc_linux_in_dynsym_resolve_code): Test NULL
+ SYM.
+
2012-10-03 Doug Evans <dje@google.com>
PR symtab/14601
diff --git a/gdb/ppc-linux-tdep.c b/gdb/ppc-linux-tdep.c
index c7b70dbe38c..ccded83f11a 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/ChangeLog b/gdb/testsuite/ChangeLog
index f0f82036250..4eb19bdf62d 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-06 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ Fix crash during stepping on ppc32.
+ * gdb.base/step-symless.c: New file.
+ * gdb.base/step-symless.exp: New file.
+
2012-10-03 Doug Evans <dje@google.com>
PR symtab/14601
diff --git a/gdb/testsuite/gdb.base/step-symless.c b/gdb/testsuite/gdb.base/step-symless.c
new file mode 100644
index 00000000000..97eaf5edc11
--- /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 <http://www.gnu.org/licenses/>. */
+
+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 00000000000..47d36abd7c4
--- /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 <http://www.gnu.org/licenses/>.
+
+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 \\(\\)"