RPMs/gdb
Watch
1
0
Fork
You've already forked gdb
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rebase to FSF GDB 7.5.50.20130310 (pre-7.6 snapshot).

Browse source 
- Fix various entry-values sub-optimal results.
This commit is contained in:
Jan Kratochvil 2013-03-10 17:12:43 +01:00
commit 1054fa6d0b
10 changed files with 2049 additions and 306 deletions
Download patch file Download diff file Expand all files Collapse all files

164
gdb-6.6-buildid-locate.patch
View file

@ -1,7 +1,7 @@
Index: gdb-7.5.50.20130215/gdb/corelow.c
Index: gdb-7.5.50.20130310/gdb/corelow.c
===================================================================
--- gdb-7.5.50.20130215.orig/gdb/corelow.c 2013-01-31 19:37:37.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/corelow.c 2013-02-15 22:35:03.278219844 +0100
--- gdb-7.5.50.20130310.orig/gdb/corelow.c 2013-01-31 19:37:37.000000000 +0100
+++ gdb-7.5.50.20130310/gdb/corelow.c 2013-03-10 16:36:37.019937408 +0100
@@ -46,6 +46,9 @@
#include "progspace.h"
#include "objfiles.h"
@ -12,7 +12,7 @@ Index: gdb-7.5.50.20130215/gdb/corelow.c
#ifndef O_LARGEFILE
#define O_LARGEFILE 0
@@ -271,6 +274,52 @@ add_to_thread_list (bfd *abfd, asection
@@ -271,6 +274,53 @@ add_to_thread_list (bfd *abfd, asection
inferior_ptid = ptid; /* Yes, make it current. */
}
@ -22,7 +22,7 @@ Index: gdb-7.5.50.20130215/gdb/corelow.c
+build_id_locate_exec (int from_tty)
+{
+ CORE_ADDR at_entry;
+ struct build_id *build_id;
+ struct elf_build_id *build_id;
+ char *exec_filename, *debug_filename;
+ char *build_id_filename;
+ struct cleanup *back_to;
@ -36,6 +36,7 @@ Index: gdb-7.5.50.20130215/gdb/corelow.c
+ build_id = build_id_addr_get (at_entry);
+ if (build_id == NULL)
+ return;
+ back_to = make_cleanup (xfree, build_id);
+
+ /* SYMFILE_OBJFILE should refer to the main executable (not only to its
+ separate debug info file). gcc44+ keeps .eh_frame only in the main
@ -44,7 +45,7 @@ Index: gdb-7.5.50.20130215/gdb/corelow.c
+ directly to the separate debug info file. */
+
+ exec_filename = build_id_to_filename (build_id, &build_id_filename, 0);
+ back_to = make_cleanup (xfree, build_id_filename);
+ make_cleanup (xfree, build_id_filename);
+
+ if (exec_filename != NULL)
+ {
@ -65,7 +66,7 @@ Index: gdb-7.5.50.20130215/gdb/corelow.c
/* This routine opens and sets up the core file bfd. */
static void
@@ -409,6 +458,14 @@ core_open (char *filename, int from_tty)
@@ -409,6 +459,14 @@ core_open (char *filename, int from_tty)
switch_to_thread (thread->ptid);
}
@ -80,7 +81,7 @@ Index: gdb-7.5.50.20130215/gdb/corelow.c
post_create_inferior (&core_ops, from_tty);
/* Now go through the target stack looking for threads since there
@@ -978,4 +1035,11 @@ _initialize_corelow (void)
@@ -978,4 +1036,11 @@ _initialize_corelow (void)
init_core_ops ();
add_target (&core_ops);
@ -92,11 +93,11 @@ Index: gdb-7.5.50.20130215/gdb/corelow.c
+ NULL, NULL, NULL,
+ &setlist, &showlist);
}
Index: gdb-7.5.50.20130215/gdb/doc/gdb.texinfo
Index: gdb-7.5.50.20130310/gdb/doc/gdb.texinfo
===================================================================
--- gdb-7.5.50.20130215.orig/gdb/doc/gdb.texinfo 2013-02-15 22:34:22.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/doc/gdb.texinfo 2013-02-15 22:35:03.287219863 +0100
@@ -16662,6 +16662,27 @@ information files.
--- gdb-7.5.50.20130310.orig/gdb/doc/gdb.texinfo 2013-03-10 16:16:23.000000000 +0100
+++ gdb-7.5.50.20130310/gdb/doc/gdb.texinfo 2013-03-10 16:17:15.216114613 +0100
@@ -16680,6 +16680,27 @@ information files.
@end table
@ -124,10 +125,10 @@ Index: gdb-7.5.50.20130215/gdb/doc/gdb.texinfo
@cindex @code{.gnu_debuglink} sections
@cindex debug link sections
A debug link is a special section of the executable file named
Index: gdb-7.5.50.20130215/gdb/solib-svr4.c
Index: gdb-7.5.50.20130310/gdb/solib-svr4.c
===================================================================
--- gdb-7.5.50.20130215.orig/gdb/solib-svr4.c 2013-01-31 14:52:52.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/solib-svr4.c 2013-02-15 22:35:03.287219863 +0100
--- gdb-7.5.50.20130310.orig/gdb/solib-svr4.c 2013-01-31 14:52:52.000000000 +0100
+++ gdb-7.5.50.20130310/gdb/solib-svr4.c 2013-03-10 16:37:49.842963280 +0100
@@ -1224,9 +1224,52 @@ svr4_read_so_list (CORE_ADDR lm, struct
continue;
}
@ -136,7 +137,7 @@ Index: gdb-7.5.50.20130215/gdb/solib-svr4.c
- new->so_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0';
- strcpy (new->so_original_name, new->so_name);
+ {
+ struct build_id *build_id;
+ struct elf_build_id *build_id;
+
+ strncpy (new->so_original_name, buffer, SO_NAME_MAX_PATH_SIZE - 1);
+ new->so_original_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0';
@ -184,10 +185,10 @@ Index: gdb-7.5.50.20130215/gdb/solib-svr4.c
xfree (buffer);
/* If this entry has no name, or its name matches the name
Index: gdb-7.5.50.20130215/gdb/elfread.c
Index: gdb-7.5.50.20130310/gdb/elfread.c
===================================================================
--- gdb-7.5.50.20130215.orig/gdb/elfread.c 2013-02-01 20:39:03.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/elfread.c 2013-02-15 22:35:36.826263354 +0100
--- gdb-7.5.50.20130310.orig/gdb/elfread.c 2013-03-06 22:20:02.000000000 +0100
+++ gdb-7.5.50.20130310/gdb/elfread.c 2013-03-10 16:38:01.506968687 +0100
@@ -45,6 +45,11 @@
#include "regcache.h"
#include "bcache.h"
@ -200,10 +201,11 @@ Index: gdb-7.5.50.20130215/gdb/elfread.c
extern void _initialize_elfread (void);
@@ -1074,16 +1079,65 @@ elf_gnu_ifunc_resolver_return_stop (stru
@@ -1067,10 +1072,59 @@ elf_gnu_ifunc_resolver_return_stop (stru
update_breakpoint_locations (b, sals, sals_end);
}
-/* Locate NT_GNU_BUILD_ID from ABFD and return its content. */
+#define BUILD_ID_VERBOSE_NONE 0
+#define BUILD_ID_VERBOSE_FILENAMES 1
+#define BUILD_ID_VERBOSE_BINARY_PARSE 2
@ -216,18 +218,10 @@ Index: gdb-7.5.50.20130215/gdb/elfread.c
+ value);
+}
+
struct build_id
{
size_t size;
gdb_byte data[1];
};
-/* Locate NT_GNU_BUILD_ID from ABFD and return its content. */
+/* Locate NT_GNU_BUILD_ID and return its matching debug filename.
+ FIXME: NOTE decoding should be unified with the BFD core notes decoding. */
static struct build_id *
-build_id_bfd_get (bfd *abfd)
+
+static struct elf_build_id *
+build_id_buf_get (bfd *templ, gdb_byte *buf, bfd_size_type size)
+{
+ bfd_byte *p;
@ -247,7 +241,7 @@ Index: gdb-7.5.50.20130215/gdb/elfread.c
+ {
+ size_t size = descsz;
+ gdb_byte *data = (void *) descdata;
+ struct build_id *retval;
+ struct elf_build_id *retval;
+
+ retval = xmalloc (sizeof *retval - 1 + size);
+ retval->size = size;
@ -262,26 +256,27 @@ Index: gdb-7.5.50.20130215/gdb/elfread.c
+
+/* Separate debuginfo files have corrupted PHDR but SHDR is correct there.
+ Locate NT_GNU_BUILD_ID from ABFD and return its content. */
+
+static struct build_id *
static const struct elf_build_id *
-build_id_bfd_get (bfd *abfd)
+build_id_bfd_shdr_get (bfd *abfd)
{
struct build_id *retval;
@@ -1099,6 +1153,348 @@ build_id_bfd_get (bfd *abfd)
return retval;
if (!bfd_check_format (abfd, bfd_object)
|| bfd_get_flavour (abfd) != bfd_target_elf_flavour
@@ -1080,6 +1134,348 @@ build_id_bfd_get (bfd *abfd)
return elf_tdata (abfd)->build_id;
}
+/* Core files may have missing (corrupt) SHDR but PDHR is correct there.
+ bfd_elf_bfd_from_remote_memory () has too much overhead by
+ allocating/reading all the available ELF PT_LOADs. */
+
+static struct build_id *
+static struct elf_build_id *
+build_id_phdr_get (bfd *templ, bfd_vma loadbase, unsigned e_phnum,
+ Elf_Internal_Phdr *i_phdr)
+{
+ int i;
+ struct build_id *retval = NULL;
+ struct elf_build_id *retval = NULL;
+
+ for (i = 0; i < e_phnum; i++)
+ if (i_phdr[i].p_type == PT_NOTE && i_phdr[i].p_filesz > 0)
@ -568,11 +563,11 @@ Index: gdb-7.5.50.20130215/gdb/elfread.c
+ }
+}
+
+struct build_id *
+struct elf_build_id *
+build_id_addr_get (CORE_ADDR addr)
+{
+ struct build_id_addr_sect *candidate;
+ struct build_id *retval = NULL;
+ struct elf_build_id *retval = NULL;
+ Elf_Internal_Phdr *i_phdr = NULL;
+ bfd_vma loadbase = 0;
+ unsigned e_phnum = 0;
@ -617,7 +612,7 @@ Index: gdb-7.5.50.20130215/gdb/elfread.c
/* Return if FILENAME has NT_GNU_BUILD_ID matching the CHECK value. */
static int
@@ -1113,7 +1509,7 @@ build_id_verify (const char *filename, s
@@ -1094,7 +1490,7 @@ build_id_verify (const char *filename, c
if (abfd == NULL)
return 0;
@ -626,14 +621,14 @@ Index: gdb-7.5.50.20130215/gdb/elfread.c
if (found == NULL)
warning (_("File \"%s\" has no build-id, file skipped"), filename);
@@ -1131,17 +1527,18 @@ build_id_verify (const char *filename, s
@@ -1110,17 +1506,18 @@ build_id_verify (const char *filename, c
return retval;
}
-static char *
-build_id_to_debug_filename (struct build_id *build_id)
-build_id_to_debug_filename (const struct elf_build_id *build_id)
+char *
+build_id_to_filename (struct build_id *build_id, char **link_return,
+build_id_to_filename (const struct elf_build_id *build_id, char **link_return,
+ int add_debug_suffix)
{
char *link, *debugdir, *retval = NULL;
@ -649,16 +644,16 @@ Index: gdb-7.5.50.20130215/gdb/elfread.c
/* Keep backward compatibility so that DEBUG_FILE_DIRECTORY being "" will
cause "/.build-id/..." lookups. */
@@ -1154,6 +1551,8 @@ build_id_to_debug_filename (struct build
@@ -1133,6 +1530,8 @@ build_id_to_debug_filename (const struct
size_t debugdir_len = strlen (debugdir);
gdb_byte *data = build_id->data;
const gdb_byte *data = build_id->data;
size_t size = build_id->size;
+ unsigned seqno;
+ struct stat statbuf_trash;
char *s;
memcpy (link, debugdir, debugdir_len);
@@ -1168,37 +1567,240 @@ build_id_to_debug_filename (struct build
@@ -1147,37 +1546,240 @@ build_id_to_debug_filename (const struct
*s++ = '/';
while (size-- > 0)
s += sprintf (s, "%02x", (unsigned) *data++);
@ -686,15 +681,15 @@ Index: gdb-7.5.50.20130215/gdb/elfread.c
+ strcpy (s2, ".debug");
+ else
+ *s2 = 0;
- if (retval != NULL && !build_id_verify (retval, build_id))
+
+ /* `access' automatically dereferences LINK. */
+ if (lstat (link, &statbuf_trash) != 0)
+ {
+ /* Stop increasing SEQNO. */
+ break;
+ }
+
- if (retval != NULL && !build_id_verify (retval, build_id))
+ retval = lrealpath (link);
+
+ if (retval != NULL && !build_id_verify (retval, build_id))
@ -735,15 +730,15 @@ Index: gdb-7.5.50.20130215/gdb/elfread.c
+ {
if (retval != NULL)
- break;
+ {
+ *link_return = link;
+ link = NULL;
+ }
+ {
+ *link_return = link;
+ link = NULL;
+ }
+ else
+ {
+ *link_return = link_all;
+ link_all = NULL;
+ }
+ {
+ *link_return = link_all;
+ link_all = NULL;
+ }
}
+ xfree (link);
+ xfree (link_all);
@ -893,7 +888,7 @@ Index: gdb-7.5.50.20130215/gdb/elfread.c
+find_separate_debug_file_by_buildid (struct objfile *objfile,
+ char **build_id_filename_return)
{
struct build_id *build_id;
const struct elf_build_id *build_id;
- build_id = build_id_bfd_get (objfile->obfd);
+ if (build_id_filename_return)
@ -907,10 +902,10 @@ Index: gdb-7.5.50.20130215/gdb/elfread.c
- build_id_name = build_id_to_debug_filename (build_id);
+ build_id_name = build_id_to_filename (build_id, build_id_filename_return,
+ 1);
xfree (build_id);
/* Prevent looping on a stripped .debug file. */
if (build_id_name != NULL
@@ -1209,7 +1811,7 @@ find_separate_debug_file_by_buildid (str
&& filename_cmp (build_id_name, objfile->name) == 0)
@@ -1187,7 +1789,7 @@ find_separate_debug_file_by_buildid (str
xfree (build_id_name);
}
else if (build_id_name != NULL)
@ -919,7 +914,7 @@ Index: gdb-7.5.50.20130215/gdb/elfread.c
}
return NULL;
}
@@ -1444,9 +2046,10 @@ elf_symfile_read (struct objfile *objfil
@@ -1425,9 +2027,10 @@ elf_symfile_read (struct objfile *objfil
&& objfile->separate_debug_objfile == NULL
&& objfile->separate_debug_objfile_backlink == NULL)
{
@ -932,7 +927,7 @@ Index: gdb-7.5.50.20130215/gdb/elfread.c
if (debugfile == NULL)
debugfile = find_separate_debug_file_by_debuglink (objfile);
@@ -1460,6 +2063,12 @@ elf_symfile_read (struct objfile *objfil
@@ -1441,6 +2044,12 @@ elf_symfile_read (struct objfile *objfil
symbol_file_add_separate (abfd, symfile_flags, objfile);
do_cleanups (cleanup);
}
@ -943,9 +938,9 @@ Index: gdb-7.5.50.20130215/gdb/elfread.c
+
+ xfree (build_id_filename);
}
}
if (symtab_create_debug)
@@ -1782,4 +2391,16 @@ _initialize_elfread (void)
@@ -1760,4 +2369,16 @@ _initialize_elfread (void)
elf_objfile_gnu_ifunc_cache_data = register_objfile_data ();
gnu_ifunc_fns_p = &elf_gnu_ifunc_fns;
@ -962,28 +957,27 @@ Index: gdb-7.5.50.20130215/gdb/elfread.c
+
+ observer_attach_executable_changed (debug_print_executable_changed);
}
Index: gdb-7.5.50.20130215/gdb/symfile.h
Index: gdb-7.5.50.20130310/gdb/symfile.h
===================================================================
--- gdb-7.5.50.20130215.orig/gdb/symfile.h 2013-02-03 17:20:18.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/symfile.h 2013-02-15 22:35:03.288219867 +0100
@@ -593,6 +593,13 @@ void free_symfile_segment_data (struct s
--- gdb-7.5.50.20130310.orig/gdb/symfile.h 2013-02-03 17:20:18.000000000 +0100
+++ gdb-7.5.50.20130310/gdb/symfile.h 2013-03-10 16:37:41.203959517 +0100
@@ -593,6 +593,12 @@ void free_symfile_segment_data (struct s
extern struct cleanup *increment_reading_symtab (void);
+/* build-id support. */
+struct build_id;
+extern struct build_id *build_id_addr_get (CORE_ADDR addr);
+extern char *build_id_to_filename (struct build_id *build_id,
+extern struct elf_build_id *build_id_addr_get (CORE_ADDR addr);
+extern char *build_id_to_filename (const struct elf_build_id *build_id,
+ char **link_return, int add_debug_suffix);
+extern void debug_print_missing (const char *binary, const char *debug);
+
/* From dwarf2read.c */
/* Names for a dwarf2 debugging section. The field NORMAL is the normal
Index: gdb-7.5.50.20130215/gdb/testsuite/lib/gdb.exp
Index: gdb-7.5.50.20130310/gdb/testsuite/lib/gdb.exp
===================================================================
--- gdb-7.5.50.20130215.orig/gdb/testsuite/lib/gdb.exp 2013-02-15 22:31:37.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/testsuite/lib/gdb.exp 2013-02-15 22:35:03.289219870 +0100
--- gdb-7.5.50.20130310.orig/gdb/testsuite/lib/gdb.exp 2013-03-10 16:16:22.000000000 +0100
+++ gdb-7.5.50.20130310/gdb/testsuite/lib/gdb.exp 2013-03-10 16:17:15.219114612 +0100
@@ -1482,6 +1482,16 @@ proc default_gdb_start { } {
warning "Couldn't set the width to 0."
}
@ -1001,10 +995,10 @@ Index: gdb-7.5.50.20130215/gdb/testsuite/lib/gdb.exp
return 0;
}
Index: gdb-7.5.50.20130215/gdb/testsuite/lib/mi-support.exp
Index: gdb-7.5.50.20130310/gdb/testsuite/lib/mi-support.exp
===================================================================
--- gdb-7.5.50.20130215.orig/gdb/testsuite/lib/mi-support.exp 2013-01-22 00:57:59.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/testsuite/lib/mi-support.exp 2013-02-15 22:35:03.289219870 +0100
--- gdb-7.5.50.20130310.orig/gdb/testsuite/lib/mi-support.exp 2013-01-22 00:57:59.000000000 +0100
+++ gdb-7.5.50.20130310/gdb/testsuite/lib/mi-support.exp 2013-03-10 16:17:15.220114612 +0100
@@ -212,6 +212,16 @@ proc default_mi_gdb_start { args } {
warning "Couldn't set the width to 0."
}
@ -1022,10 +1016,10 @@ Index: gdb-7.5.50.20130215/gdb/testsuite/lib/mi-support.exp
# If allowing the inferior to have its own PTY then assign the inferior
# its own terminal device here.
if { $separate_inferior_pty } {
Index: gdb-7.5.50.20130215/gdb/objfiles.h
Index: gdb-7.5.50.20130310/gdb/objfiles.h
===================================================================
--- gdb-7.5.50.20130215.orig/gdb/objfiles.h 2013-01-01 07:32:47.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/objfiles.h 2013-02-15 22:35:03.290219872 +0100
--- gdb-7.5.50.20130310.orig/gdb/objfiles.h 2013-02-28 20:00:31.000000000 +0100
+++ gdb-7.5.50.20130310/gdb/objfiles.h 2013-03-10 16:17:15.220114612 +0100
@@ -432,6 +432,10 @@ struct objfile
#define OBJF_MAINLINE (1 << 5)
@ -1037,10 +1031,10 @@ Index: gdb-7.5.50.20130215/gdb/objfiles.h
/* The object file that contains the runtime common minimal symbols
for SunOS4. Note that this objfile has no associated BFD. */
Index: gdb-7.5.50.20130215/gdb/testsuite/gdb.base/corefile.exp
Index: gdb-7.5.50.20130310/gdb/testsuite/gdb.base/corefile.exp
===================================================================
--- gdb-7.5.50.20130215.orig/gdb/testsuite/gdb.base/corefile.exp 2013-01-01 07:33:25.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/testsuite/gdb.base/corefile.exp 2013-02-15 22:35:03.290219872 +0100
--- gdb-7.5.50.20130310.orig/gdb/testsuite/gdb.base/corefile.exp 2013-01-01 07:33:25.000000000 +0100
+++ gdb-7.5.50.20130310/gdb/testsuite/gdb.base/corefile.exp 2013-03-10 16:17:15.220114612 +0100
@@ -256,3 +256,33 @@ if ![is_remote target] {
gdb_exit