You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
143 lines
5.1 KiB
143 lines
5.1 KiB
Index: gdb-7.5.50.20130118/gdb/dwarf2read.c |
|
=================================================================== |
|
--- gdb-7.5.50.20130118.orig/gdb/dwarf2read.c 2013-01-19 21:16:22.437961789 +0100 |
|
+++ gdb-7.5.50.20130118/gdb/dwarf2read.c 2013-01-19 21:24:22.242969266 +0100 |
|
@@ -15987,6 +15987,25 @@ new_symbol_full (struct die_info *die, s |
|
/* Cache this symbol's name and the name's demangled form (if any). */ |
|
SYMBOL_SET_LANGUAGE (sym, cu->language); |
|
linkagename = dwarf2_physname (name, die, cu); |
|
+ |
|
+ /* Workaround for: |
|
+ * invalid IFUNC DW_AT_linkage_name: memmove strstr time |
|
+ * http://sourceware.org/bugzilla/show_bug.cgi?id=14166 */ |
|
+ if (strcmp (linkagename, "strstr") == 0 |
|
+ && strstr (objfile->name, "/libc") != NULL) |
|
+ { |
|
+ struct objfile *objfile_msym; |
|
+ struct minimal_symbol *msym; |
|
+ |
|
+ if (objfile->separate_debug_objfile_backlink) |
|
+ objfile_msym = objfile->separate_debug_objfile_backlink; |
|
+ else |
|
+ objfile_msym = objfile; |
|
+ msym = lookup_minimal_symbol ("strstr", NULL, objfile_msym); |
|
+ if (msym && MSYMBOL_TYPE (msym) == mst_text_gnu_ifunc) |
|
+ linkagename = "__strstr"; |
|
+ } |
|
+ |
|
SYMBOL_SET_NAMES (sym, linkagename, strlen (linkagename), 0, objfile); |
|
|
|
/* Fortran does not have mangling standard and the mangling does differ |
|
Index: gdb-7.5.50.20130118/gdb/testsuite/gdb.base/gnu-ifunc-strstr-workaround.exp |
|
=================================================================== |
|
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
|
+++ gdb-7.5.50.20130118/gdb/testsuite/gdb.base/gnu-ifunc-strstr-workaround.exp 2013-01-19 21:23:09.119827963 +0100 |
|
@@ -0,0 +1,108 @@ |
|
+# 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/>. |
|
+ |
|
+# Workaround for: |
|
+# invalid IFUNC DW_AT_linkage_name: memmove strstr time |
|
+# http://sourceware.org/bugzilla/show_bug.cgi?id=14166 |
|
+ |
|
+if {[skip_shlib_tests]} { |
|
+ return 0 |
|
+} |
|
+ |
|
+set testfile "gnu-ifunc-strstr-workaround" |
|
+set executable ${testfile} |
|
+set srcfile start.c |
|
+set binfile ${objdir}/${subdir}/${executable} |
|
+ |
|
+if [prepare_for_testing ${testfile}.exp $executable $srcfile] { |
|
+ return -1 |
|
+} |
|
+ |
|
+if ![runto_main] { |
|
+ return 0 |
|
+} |
|
+ |
|
+set test "ptype atoi" |
|
+gdb_test_multiple $test $test { |
|
+ -re "type = int \\(const char \\*\\)\r\n$gdb_prompt $" { |
|
+ pass $test |
|
+ } |
|
+ -re "type = int \\(\\)\r\n$gdb_prompt $" { |
|
+ untested "$test (no DWARF)" |
|
+ return 0 |
|
+ } |
|
+} |
|
+ |
|
+set addr "" |
|
+set test "print strstr" |
|
+gdb_test_multiple $test $test { |
|
+ -re " = {<text gnu-indirect-function variable, no debug info>} (0x\[0-9a-f\]+) <strstr>\r\n$gdb_prompt $" { |
|
+ set addr $expect_out(1,string) |
|
+ pass $test |
|
+ } |
|
+ -re " = {<text gnu-indirect-function variable, no debug info>} (0x\[0-9a-f\]+) <__strstr>\r\n$gdb_prompt $" { |
|
+ set addr $expect_out(1,string) |
|
+ pass "$test (GDB workaround)" |
|
+ } |
|
+ -re " = {<text gnu-indirect-function variable, no debug info>} (0x\[0-9a-f\]+) <__libc_strstr>\r\n$gdb_prompt $" { |
|
+ set addr $expect_out(1,string) |
|
+ pass "$test (fixed glibc)" |
|
+ } |
|
+ -re " = {char \\*\\(const char \\*, const char \\*\\)} 0x\[0-9a-f\]+ <strstr>\r\n$gdb_prompt $" { |
|
+ untested "$test (gnu-ifunc not in use by glibc)" |
|
+ return 0 |
|
+ } |
|
+} |
|
+ |
|
+set test "info sym" |
|
+gdb_test_multiple "info sym $addr" $test { |
|
+ -re "strstr in section \\.text of /lib\[^/\]*/libc.so.6\r\n$gdb_prompt $" { |
|
+ pass $test |
|
+ } |
|
+ -re " = {char \\*\\(const char \\*, const char \\*\\)} 0x\[0-9a-f\]+ <strstr>\r\n$gdb_prompt $" { |
|
+ # unexpected |
|
+ xfail "$test (not in libc.so.6)" |
|
+ return 0 |
|
+ } |
|
+} |
|
+ |
|
+set test "info addr strstr" |
|
+gdb_test_multiple $test $test { |
|
+ -re "Symbol \"strstr\" is a function at address $addr\\.\r\n$gdb_prompt $" { |
|
+ fail "$test (DWARF for strstr)" |
|
+ } |
|
+ -re "Symbol \"strstr\" is at $addr in a file compiled without debugging\\.\r\n$gdb_prompt $" { |
|
+ pass "$test" |
|
+ } |
|
+} |
|
+ |
|
+set test "print strstr second time" |
|
+gdb_test_multiple "print strstr" $test { |
|
+ -re " = {<text gnu-indirect-function variable, no debug info>} $addr <strstr>\r\n$gdb_prompt $" { |
|
+ pass $test |
|
+ } |
|
+ -re " = {<text gnu-indirect-function variable, no debug info>} $addr <__strstr>\r\n$gdb_prompt $" { |
|
+ pass "$test (GDB workaround)" |
|
+ } |
|
+ -re " = {<text gnu-indirect-function variable, no debug info>} $addr <__libc_strstr>\r\n$gdb_prompt $" { |
|
+ pass "$test (fixed glibc)" |
|
+ } |
|
+ -re " = {void \\*\\(void\\)} 0x\[0-9a-f\]+ <strstr>\r\n$gdb_prompt $" { |
|
+ fail $test |
|
+ } |
|
+} |
|
+ |
|
+gdb_test {print strstr("abc","b")} { = 0x[0-9a-f]+ "bc"} |
|
+gdb_test {print strstr("def","e")} { = 0x[0-9a-f]+ "ef"}
|
|
|