-Index: gdb-7.4.50.20120602/gdb/event-top.c
+Index: gdb-7.6/gdb/event-top.c
===================================================================
---- gdb-7.4.50.20120602.orig/gdb/event-top.c 2012-06-02 21:08:08.651227347 +0200
-+++ gdb-7.4.50.20120602/gdb/event-top.c 2012-06-02 21:08:23.479221885 +0200
+--- gdb-7.6.orig/gdb/event-top.c 2013-01-31 19:37:37.000000000 +0100
++++ gdb-7.6/gdb/event-top.c 2013-07-17 19:51:02.679357656 +0200
@@ -36,6 +36,7 @@
- #include "observer.h"
#include "continuations.h"
#include "gdbcmd.h" /* for dont_repeat() */
+ #include "annotate.h"
+#include "symfile.h"
/* readline include files. */
#include "readline/readline.h"
-@@ -176,6 +177,8 @@ rl_callback_read_char_wrapper (gdb_clien
+@@ -170,6 +171,8 @@ rl_callback_read_char_wrapper (gdb_clien
void
cli_command_loop (void)
{
display_gdb_prompt (0);
/* Now it's time to start the event loop. */
-@@ -241,6 +244,8 @@ display_gdb_prompt (char *new_prompt)
+@@ -237,6 +240,8 @@ display_gdb_prompt (char *new_prompt)
/* Reset the nesting depth used when trace-commands is set. */
reset_command_nest_depth ();
/* Each interpreter has its own rules on displaying the command
prompt. */
if (!current_interp_display_prompt_p ())
-Index: gdb-7.4.50.20120602/gdb/elfread.c
+Index: gdb-7.6/gdb/elfread.c
===================================================================
---- gdb-7.4.50.20120602.orig/gdb/elfread.c 2012-06-02 21:08:08.651227347 +0200
-+++ gdb-7.4.50.20120602/gdb/elfread.c 2012-06-02 21:08:23.482221882 +0200
-@@ -48,6 +48,7 @@
+--- gdb-7.6.orig/gdb/elfread.c 2013-07-17 19:51:02.639357629 +0200
++++ gdb-7.6/gdb/elfread.c 2013-07-17 19:51:50.738390068 +0200
+@@ -49,6 +49,7 @@
#include "gdbcore.h"
#include "gdbcmd.h"
#include "observer.h"
#include <sys/stat.h>
extern void _initialize_elfread (void);
-@@ -1647,8 +1648,361 @@ build_id_to_filename (struct build_id *b
+@@ -1682,8 +1683,360 @@ build_id_to_filename (const struct elf_b
return retval;
}
+
+ /* Base package name for `debuginfo-install'. We do not use the
+ `yum' command directly as the line
-+ yum --disablerepo='*' --enablerepo='*debug*' \
-+ install NAME-debuginfo.ARCH
++ yum --enablerepo='*debug*' install NAME-debuginfo.ARCH
+ would be more complicated than just:
+ debuginfo-install NAME-VERSION-RELEASE.ARCH
+ Do not supply the rpm base name (derived from .src.rpm name) as
+
/* This MISSING_FILEPAIR_HASH tracker is used only for the duplicite messages
- Try to install the hash file ...
-+ yum --disablerepo='*' --enablerepo='*debug*' install ...
++ yum --enablerepo='*debug*' install ...
avoidance. */
struct missing_filepair
-@@ -1702,11 +2056,17 @@ missing_filepair_change (void)
+@@ -1737,11 +2090,17 @@ missing_filepair_change (void)
/* All their memory came just from missing_filepair_OBSTACK. */
missing_filepair_hash = NULL;
}
missing_filepair_change ();
}
-@@ -1773,14 +2133,35 @@ debug_print_missing (const char *binary,
+@@ -1808,14 +2167,34 @@ debug_print_missing (const char *binary,
*slot = missing_filepair;
+ _("Missing separate debuginfo for %s\n"), binary);
+ if (debug != NULL)
+ fprintf_unfiltered (gdb_stdlog, _("Try: %s %s\n"),
-+ "yum --disablerepo='*' --enablerepo='*debug*'"
-+ " install", debug);
++ "yum --enablerepo='*debug*' install", debug);
+ }
}
static char *
-Index: gdb-7.4.50.20120602/gdb/symfile.h
+Index: gdb-7.6/gdb/symfile.h
===================================================================
---- gdb-7.4.50.20120602.orig/gdb/symfile.h 2012-06-02 21:08:08.651227347 +0200
-+++ gdb-7.4.50.20120602/gdb/symfile.h 2012-06-02 21:08:23.499221877 +0200
-@@ -621,6 +621,8 @@ extern struct build_id *build_id_addr_ge
- extern char *build_id_to_filename (struct build_id *build_id,
+--- gdb-7.6.orig/gdb/symfile.h 2013-07-17 19:51:02.639357629 +0200
++++ gdb-7.6/gdb/symfile.h 2013-07-17 19:51:02.687357661 +0200
+@@ -598,6 +598,8 @@ extern struct elf_build_id *build_id_add
+ 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);
+extern void debug_flush_missing (void);
/* From dwarf2read.c */
-Index: gdb-7.4.50.20120602/gdb/testsuite/lib/gdb.exp
+Index: gdb-7.6/gdb/testsuite/lib/gdb.exp
===================================================================
---- gdb-7.4.50.20120602.orig/gdb/testsuite/lib/gdb.exp 2012-06-02 21:08:08.651227347 +0200
-+++ gdb-7.4.50.20120602/gdb/testsuite/lib/gdb.exp 2012-06-02 21:08:23.510221873 +0200
-@@ -1388,7 +1388,7 @@ proc default_gdb_start { } {
+--- gdb-7.6.orig/gdb/testsuite/lib/gdb.exp 2013-07-17 19:51:02.640357629 +0200
++++ gdb-7.6/gdb/testsuite/lib/gdb.exp 2013-07-17 19:51:02.688357662 +0200
+@@ -1482,7 +1482,7 @@ proc default_gdb_start { } {
warning "Couldn't set the width to 0."
}
}
send_gdb "set build-id-verbose 0\n"
gdb_expect 10 {
-re "$gdb_prompt $" {
-Index: gdb-7.4.50.20120602/gdb/testsuite/lib/mi-support.exp
+Index: gdb-7.6/gdb/testsuite/lib/mi-support.exp
===================================================================
---- gdb-7.4.50.20120602.orig/gdb/testsuite/lib/mi-support.exp 2012-06-02 21:08:08.651227347 +0200
-+++ gdb-7.4.50.20120602/gdb/testsuite/lib/mi-support.exp 2012-06-02 21:08:23.523221869 +0200
-@@ -213,7 +213,7 @@ proc default_mi_gdb_start { args } {
+--- gdb-7.6.orig/gdb/testsuite/lib/mi-support.exp 2013-07-17 19:51:02.656357640 +0200
++++ gdb-7.6/gdb/testsuite/lib/mi-support.exp 2013-07-17 19:51:02.689357663 +0200
+@@ -212,7 +212,7 @@ proc default_mi_gdb_start { args } {
warning "Couldn't set the width to 0."
}
}
send_gdb "190-gdb-set build-id-verbose 0\n"
gdb_expect 10 {
-re ".*190-gdb-set build-id-verbose 0\r\n190\\\^done\r\n$mi_gdb_prompt$" {
-Index: gdb-7.4.50.20120602/gdb/tui/tui-interp.c
+Index: gdb-7.6/gdb/tui/tui-interp.c
===================================================================
---- gdb-7.4.50.20120602.orig/gdb/tui/tui-interp.c 2012-06-02 21:08:08.651227347 +0200
-+++ gdb-7.4.50.20120602/gdb/tui/tui-interp.c 2012-06-02 21:08:23.524221869 +0200
+--- gdb-7.6.orig/gdb/tui/tui-interp.c 2013-01-01 07:41:30.000000000 +0100
++++ gdb-7.6/gdb/tui/tui-interp.c 2013-07-17 19:51:02.689357663 +0200
@@ -30,6 +30,7 @@
#include "tui/tui.h"
#include "tui/tui-io.h"
/* Set to 1 when the TUI mode must be activated when we first start
gdb. */
-Index: gdb-7.4.50.20120602/gdb/aclocal.m4
+Index: gdb-7.6/gdb/aclocal.m4
===================================================================
---- gdb-7.4.50.20120602.orig/gdb/aclocal.m4 2012-06-02 21:08:08.651227347 +0200
-+++ gdb-7.4.50.20120602/gdb/aclocal.m4 2012-06-02 21:08:23.545221858 +0200
+--- gdb-7.6.orig/gdb/aclocal.m4 2013-01-17 12:06:26.000000000 +0100
++++ gdb-7.6/gdb/aclocal.m4 2013-07-17 19:51:02.689357663 +0200
@@ -11,6 +11,164 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
# AM_CONDITIONAL -*- Autoconf -*-
# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-Index: gdb-7.4.50.20120602/gdb/config.in
+Index: gdb-7.6/gdb/config.in
===================================================================
---- gdb-7.4.50.20120602.orig/gdb/config.in 2012-06-02 21:08:08.651227347 +0200
-+++ gdb-7.4.50.20120602/gdb/config.in 2012-06-02 21:08:23.546221859 +0200
-@@ -36,6 +36,9 @@
+--- gdb-7.6.orig/gdb/config.in 2012-12-09 19:39:58.000000000 +0100
++++ gdb-7.6/gdb/config.in 2013-07-17 19:51:02.689357663 +0200
+@@ -33,6 +33,9 @@
/* Define to BFD's default target vector. */
#undef DEFAULT_BFD_VEC
/* Define to 1 if translation of program messages to the user's native
language is requested. */
#undef ENABLE_NLS
-@@ -216,6 +219,9 @@
+@@ -210,6 +213,9 @@
/* Define if Python 2.7 is being used. */
#undef HAVE_LIBPYTHON2_7
/* Define to 1 if you have the <libunwind-ia64.h> header file. */
#undef HAVE_LIBUNWIND_IA64_H
-Index: gdb-7.4.50.20120602/gdb/configure
+Index: gdb-7.6/gdb/configure
===================================================================
---- gdb-7.4.50.20120602.orig/gdb/configure 2012-06-02 21:08:08.651227347 +0200
-+++ gdb-7.4.50.20120602/gdb/configure 2012-06-02 21:20:53.245838121 +0200
-@@ -680,6 +680,11 @@ REPORT_BUGS_TO
- PKGVERSION
+--- gdb-7.6.orig/gdb/configure 2013-07-17 19:51:01.665356963 +0200
++++ gdb-7.6/gdb/configure 2013-07-17 19:51:02.691357664 +0200
+@@ -686,6 +686,11 @@ PKGVERSION
+ HAVE_NATIVE_GCORE_TARGET
TARGET_OBS
subdirs
+RPM_LIBS
GDB_DATADIR
DEBUGDIR
MAKEINFO_EXTRA_FLAGS
-@@ -780,6 +785,7 @@ with_gdb_datadir
+@@ -786,6 +791,7 @@ with_gdb_datadir
with_relocated_sources
with_auto_load_dir
with_auto_load_safe_path
enable_targets
enable_64_bit_bfd
enable_gdbcli
-@@ -825,6 +831,11 @@ CPPFLAGS
+@@ -834,6 +840,11 @@ CPPFLAGS
CPP
MAKEINFO
MAKEINFOFLAGS
YACC
YFLAGS
XMKMF'
-@@ -1494,6 +1505,8 @@ Optional Packages:
+@@ -1504,6 +1515,8 @@ Optional Packages:
[--with-auto-load-dir]
--without-auto-load-safe-path
do not restrict auto-loaded files locations
--with-libunwind-ia64 use libunwind frame unwinding for ia64 targets
--with-curses use the curses library instead of the termcap
library
-@@ -1535,6 +1548,13 @@ Some influential environment variables:
+@@ -1548,6 +1561,13 @@ Some influential environment variables:
MAKEINFO Parent configure detects if it is of sufficient version.
MAKEINFOFLAGS
Parameters for MAKEINFO.
YACC The `Yet Another C Compiler' implementation to use. Defaults to
the first program found out of: `bison -y', `byacc', `yacc'.
YFLAGS The list of arguments that will be passed by default to $YACC.
-@@ -5015,6 +5035,491 @@ _ACEOF
+@@ -5033,6 +5053,491 @@ _ACEOF
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_auto_load_safe_path" >&5
$as_echo "$with_auto_load_safe_path" >&6; }
subdirs="$subdirs testsuite"
-Index: gdb-7.4.50.20120602/gdb/configure.ac
+Index: gdb-7.6/gdb/configure.ac
===================================================================
---- gdb-7.4.50.20120602.orig/gdb/configure.ac 2012-06-02 21:08:08.651227347 +0200
-+++ gdb-7.4.50.20120602/gdb/configure.ac 2012-06-02 21:08:23.560221855 +0200
+--- gdb-7.6.orig/gdb/configure.ac 2013-07-17 19:51:01.666356964 +0200
++++ gdb-7.6/gdb/configure.ac 2013-07-17 19:51:02.692357665 +0200
@@ -166,6 +166,199 @@ AC_DEFINE_DIR(AUTO_LOAD_SAFE_PATH, escap
[Directories safe to hold auto-loaded files.])
AC_MSG_RESULT([$with_auto_load_safe_path])
AC_CONFIG_SUBDIRS(testsuite)
# Check whether to support alternative target configurations
-Index: gdb-7.4.50.20120602/gdb/corelow.c
+Index: gdb-7.6/gdb/corelow.c
===================================================================
---- gdb-7.4.50.20120602.orig/gdb/corelow.c 2012-06-02 21:08:08.651227347 +0200
-+++ gdb-7.4.50.20120602/gdb/corelow.c 2012-06-02 21:08:23.561221855 +0200
-@@ -317,7 +317,7 @@ build_id_locate_exec (int from_tty)
+--- gdb-7.6.orig/gdb/corelow.c 2013-07-17 19:51:02.608357607 +0200
++++ gdb-7.6/gdb/corelow.c 2013-07-17 19:51:02.692357665 +0200
+@@ -314,7 +314,7 @@ build_id_locate_exec (int from_tty)
symfile_objfile->flags |= OBJF_BUILD_ID_CORE_LOADED;
}
else
-Index: gdb-7.4.91.20120801/gdb/corelow.c
+Index: gdb-7.6/gdb/corelow.c
===================================================================
---- gdb-7.4.91.20120801.orig/gdb/corelow.c 2012-08-01 18:36:51.000000000 +0200
-+++ gdb-7.4.91.20120801/gdb/corelow.c 2012-08-01 18:37:44.584925750 +0200
-@@ -47,6 +47,9 @@
+--- gdb-7.6.orig/gdb/corelow.c 2013-01-31 19:37:37.000000000 +0100
++++ gdb-7.6/gdb/corelow.c 2013-07-17 05:28:49.277203536 +0200
+@@ -46,6 +46,9 @@
#include "progspace.h"
#include "objfiles.h"
#include "gdb_bfd.h"
#ifndef O_LARGEFILE
#define O_LARGEFILE 0
-@@ -274,6 +277,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. */
}
+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;
+ 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
+ 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)
+ {
/* This routine opens and sets up the core file bfd. */
static void
-@@ -418,6 +467,14 @@ core_open (char *filename, int from_tty)
+@@ -409,6 +459,14 @@ core_open (char *filename, int from_tty)
switch_to_thread (thread->ptid);
}
post_create_inferior (&core_ops, from_tty);
/* Now go through the target stack looking for threads since there
-@@ -939,4 +996,11 @@ _initialize_corelow (void)
+@@ -978,4 +1036,11 @@ _initialize_corelow (void)
init_core_ops ();
add_target (&core_ops);
+ NULL, NULL, NULL,
+ &setlist, &showlist);
}
-Index: gdb-7.4.91.20120801/gdb/doc/gdb.texinfo
+Index: gdb-7.6/gdb/doc/gdb.texinfo
===================================================================
---- gdb-7.4.91.20120801.orig/gdb/doc/gdb.texinfo 2012-08-01 18:36:51.000000000 +0200
-+++ gdb-7.4.91.20120801/gdb/doc/gdb.texinfo 2012-08-01 18:37:44.598925672 +0200
-@@ -16530,6 +16530,27 @@ information files.
+--- gdb-7.6.orig/gdb/doc/gdb.texinfo 2013-07-17 05:28:48.882203384 +0200
++++ gdb-7.6/gdb/doc/gdb.texinfo 2013-07-17 05:28:49.286203539 +0200
+@@ -16831,6 +16831,27 @@ information files.
@end table
@cindex @code{.gnu_debuglink} sections
@cindex debug link sections
A debug link is a special section of the executable file named
-Index: gdb-7.4.91.20120801/gdb/solib-svr4.c
+Index: gdb-7.6/gdb/solib-svr4.c
===================================================================
---- gdb-7.4.91.20120801.orig/gdb/solib-svr4.c 2012-08-01 18:36:51.000000000 +0200
-+++ gdb-7.4.91.20120801/gdb/solib-svr4.c 2012-08-01 18:37:44.599925667 +0200
-@@ -1228,9 +1228,52 @@ svr4_read_so_list (CORE_ADDR lm, struct
+--- gdb-7.6.orig/gdb/solib-svr4.c 2013-01-31 14:52:52.000000000 +0100
++++ gdb-7.6/gdb/solib-svr4.c 2013-07-17 05:28:49.287203539 +0200
+@@ -1224,9 +1224,52 @@ svr4_read_so_list (CORE_ADDR lm, struct
continue;
}
- 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';
xfree (buffer);
/* If this entry has no name, or its name matches the name
-Index: gdb-7.4.91.20120801/gdb/elfread.c
+Index: gdb-7.6/gdb/elfread.c
===================================================================
---- gdb-7.4.91.20120801.orig/gdb/elfread.c 2012-08-01 18:36:51.000000000 +0200
-+++ gdb-7.4.91.20120801/gdb/elfread.c 2012-08-01 18:38:08.956790879 +0200
+--- gdb-7.6.orig/gdb/elfread.c 2013-03-18 10:20:02.000000000 +0100
++++ gdb-7.6/gdb/elfread.c 2013-07-17 05:31:21.242256141 +0200
@@ -45,6 +45,11 @@
#include "regcache.h"
#include "bcache.h"
extern void _initialize_elfread (void);
-@@ -1074,16 +1079,65 @@ elf_gnu_ifunc_resolver_return_stop (stru
+@@ -1068,10 +1073,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
+ 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;
+ {
+ 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;
+
+/* 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
+@@ -1081,6 +1135,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)
+ }
+}
+
-+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;
/* 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
+@@ -1095,7 +1491,7 @@ build_id_verify (const char *filename, c
if (abfd == NULL)
return 0;
if (found == NULL)
warning (_("File \"%s\" has no build-id, file skipped"), filename);
-@@ -1131,17 +1527,18 @@ build_id_verify (const char *filename, s
- return retval;
+@@ -1112,16 +1508,53 @@ build_id_verify (const char *filename, c
}
--static char *
--build_id_to_debug_filename (struct build_id *build_id)
+ static char *
+-build_id_to_debug_filename (const struct elf_build_id *build_id)
++link_resolve (const char *symlink, int level)
++{
++ char buf[PATH_MAX + 1], *target, *retval;
++ ssize_t got;
++
++ if (level > 10)
++ return xstrdup (symlink);
++
++ got = readlink (symlink, buf, sizeof (buf));
++ if (got < 0 || got >= sizeof (buf))
++ return xstrdup (symlink);
++ buf[got] = '\0';
++
++ if (IS_ABSOLUTE_PATH (buf))
++ target = xstrdup (buf);
++ else
++ {
++ char *dir = ldirname (symlink);
++
++ if (dir == NULL)
++ return xstrdup (symlink);
++ target = xstrprintf ("%s"
++#ifndef HAVE_DOS_BASED_FILE_SYSTEM
++ "/"
++#else /* HAVE_DOS_BASED_FILE_SYSTEM */
++ "\\"
++#endif /* HAVE_DOS_BASED_FILE_SYSTEM */
++ "%s", dir, buf);
++ }
++
++ retval = link_resolve (target, level + 1);
++ xfree (target);
++ return retval;
++}
++
+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;
/* 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
+@@ -1134,7 +1567,10 @@ 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;
+- char *s;
+ unsigned seqno;
+ struct stat statbuf_trash;
- char *s;
++ /* Initialize it just to avoid a GCC false warning. */
++ char *s, *link0 = NULL, *link0_resolved;
memcpy (link, debugdir, debugdir_len);
-@@ -1168,37 +1567,240 @@ build_id_to_debug_filename (struct build
+ s = &link[debugdir_len];
+@@ -1148,37 +1584,256 @@ build_id_to_debug_filename (const struct
*s++ = '/';
while (size-- > 0)
s += sprintf (s, "%02x", (unsigned) *data++);
+ strcpy (s2, ".debug");
+ else
+ *s2 = 0;
-
-- if (retval != NULL && !build_id_verify (retval, build_id))
++
++ if (!seqno)
++ {
++ /* If none of the real files is found report as missing file
++ always the non-.%u-suffixed file. */
++ link0 = xstrdup (link);
++ }
++
+ /* `access' automatically dereferences LINK. */
+ if (lstat (link, &statbuf_trash) != 0)
+ {
+ }
+
+ if (retval != NULL)
- {
-- xfree (retval);
-- retval = NULL;
++ {
+ /* LINK_ALL is not used below in this non-NULL RETVAL case. */
++ xfree (link0);
+ break;
- }
++ }
++
++ /* If the symlink has target request to install the target.
++ BASE-debuginfo.rpm contains the symlink but BASE.rpm may be missing.
++ https://bugzilla.redhat.com/show_bug.cgi?id=981154 */
++ link0_resolved = link_resolve (link0, 0);
++ xfree (link0);
-+ if (link_all == NULL)
-+ link_all = xstrdup (link);
-+ else
-+ {
-+ size_t len_orig = strlen (link_all);
+- if (retval != NULL && !build_id_verify (retval, build_id))
++ if (link_all == NULL)
++ link_all = xstrdup (link0_resolved);
++ else
+ {
+- xfree (retval);
+- retval = NULL;
++ size_t len_orig = strlen (link_all);
+
-+ link_all = xrealloc (link_all, len_orig + 1 + strlen (link) + 1);
++ link_all = xrealloc (link_all,
++ len_orig + 1 + strlen (link0_resolved) + 1);
+
-+ /* Use whitespace instead of DIRNAME_SEPARATOR to be compatible with
-+ its possible use as an argument for installation command. */
-+ link_all[len_orig] = ' ';
++ /* Use whitespace instead of DIRNAME_SEPARATOR to be compatible with
++ its possible use as an argument for installation command. */
++ link_all[len_orig] = ' ';
+
-+ strcpy (&link_all[len_orig + 1], link);
-+ }
++ strcpy (&link_all[len_orig + 1], link0_resolved);
+ }
++ xfree (link0_resolved);
+ }
-+
+
+ if (link_return != NULL)
+ {
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);
+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)
- 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)
+@@ -1188,7 +1843,7 @@ find_separate_debug_file_by_buildid (str
xfree (build_id_name);
}
else if (build_id_name != NULL)
}
return NULL;
}
-@@ -1436,9 +2038,10 @@ elf_symfile_read (struct objfile *objfil
- `.note.gnu.build-id'. */
- else if (!objfile_has_partial_symbols (objfile))
+@@ -1426,9 +2081,10 @@ elf_symfile_read (struct objfile *objfil
+ && objfile->separate_debug_objfile == NULL
+ && objfile->separate_debug_objfile_backlink == NULL)
{
- char *debugfile;
+ char *debugfile, *build_id_filename;
if (debugfile == NULL)
debugfile = find_separate_debug_file_by_debuglink (objfile);
-@@ -1452,6 +2055,12 @@ elf_symfile_read (struct objfile *objfil
+@@ -1442,6 +2098,12 @@ elf_symfile_read (struct objfile *objfil
symbol_file_add_separate (abfd, symfile_flags, objfile);
do_cleanups (cleanup);
}
+
+ xfree (build_id_filename);
}
+ }
- if (symtab_create_debug)
-@@ -1784,4 +2393,16 @@ _initialize_elfread (void)
+@@ -1761,4 +2423,16 @@ _initialize_elfread (void)
elf_objfile_gnu_ifunc_cache_data = register_objfile_data ();
gnu_ifunc_fns_p = &elf_gnu_ifunc_fns;
+
+ observer_attach_executable_changed (debug_print_executable_changed);
}
-Index: gdb-7.4.91.20120801/gdb/symfile.h
+Index: gdb-7.6/gdb/symfile.h
===================================================================
---- gdb-7.4.91.20120801.orig/gdb/symfile.h 2012-08-01 18:36:51.000000000 +0200
-+++ gdb-7.4.91.20120801/gdb/symfile.h 2012-08-01 18:37:44.600925662 +0200
-@@ -615,6 +615,13 @@ void free_symfile_segment_data (struct s
+--- gdb-7.6.orig/gdb/symfile.h 2013-02-03 17:20:18.000000000 +0100
++++ gdb-7.6/gdb/symfile.h 2013-07-17 05:28:49.291203541 +0200
+@@ -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.4.91.20120801/gdb/testsuite/lib/gdb.exp
+Index: gdb-7.6/gdb/testsuite/lib/gdb.exp
===================================================================
---- gdb-7.4.91.20120801.orig/gdb/testsuite/lib/gdb.exp 2012-08-01 18:36:51.000000000 +0200
-+++ gdb-7.4.91.20120801/gdb/testsuite/lib/gdb.exp 2012-08-01 18:37:44.601925656 +0200
-@@ -1388,6 +1388,16 @@ proc default_gdb_start { } {
+--- gdb-7.6.orig/gdb/testsuite/lib/gdb.exp 2013-07-17 05:28:48.334203172 +0200
++++ gdb-7.6/gdb/testsuite/lib/gdb.exp 2013-07-17 05:28:49.292203541 +0200
+@@ -1482,6 +1482,16 @@ proc default_gdb_start { } {
warning "Couldn't set the width to 0."
}
}
return 0;
}
-Index: gdb-7.4.91.20120801/gdb/testsuite/lib/mi-support.exp
+Index: gdb-7.6/gdb/testsuite/lib/mi-support.exp
===================================================================
---- gdb-7.4.91.20120801.orig/gdb/testsuite/lib/mi-support.exp 2012-07-25 22:35:30.000000000 +0200
-+++ gdb-7.4.91.20120801/gdb/testsuite/lib/mi-support.exp 2012-08-01 18:37:44.601925656 +0200
-@@ -213,6 +213,16 @@ proc default_mi_gdb_start { args } {
+--- gdb-7.6.orig/gdb/testsuite/lib/mi-support.exp 2013-01-22 00:57:59.000000000 +0100
++++ gdb-7.6/gdb/testsuite/lib/mi-support.exp 2013-07-17 05:28:49.292203541 +0200
+@@ -212,6 +212,16 @@ proc default_mi_gdb_start { args } {
warning "Couldn't set the width to 0."
}
}
# 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.4.91.20120801/gdb/objfiles.h
+Index: gdb-7.6/gdb/objfiles.h
===================================================================
---- gdb-7.4.91.20120801.orig/gdb/objfiles.h 2012-08-01 18:36:51.000000000 +0200
-+++ gdb-7.4.91.20120801/gdb/objfiles.h 2012-08-01 18:37:44.601925656 +0200
+--- gdb-7.6.orig/gdb/objfiles.h 2013-02-28 20:00:31.000000000 +0100
++++ gdb-7.6/gdb/objfiles.h 2013-07-17 05:28:49.293203542 +0200
@@ -432,6 +432,10 @@ struct objfile
#define OBJF_MAINLINE (1 << 5)
/* The object file that contains the runtime common minimal symbols
for SunOS4. Note that this objfile has no associated BFD. */
-Index: gdb-7.4.91.20120801/gdb/testsuite/gdb.base/corefile.exp
+Index: gdb-7.6/gdb/testsuite/gdb.base/corefile.exp
===================================================================
---- gdb-7.4.91.20120801.orig/gdb/testsuite/gdb.base/corefile.exp 2012-06-21 22:46:21.000000000 +0200
-+++ gdb-7.4.91.20120801/gdb/testsuite/gdb.base/corefile.exp 2012-08-01 18:37:44.602925650 +0200
+--- gdb-7.6.orig/gdb/testsuite/gdb.base/corefile.exp 2013-01-01 07:33:25.000000000 +0100
++++ gdb-7.6/gdb/testsuite/gdb.base/corefile.exp 2013-07-17 05:28:49.293203542 +0200
@@ -256,3 +256,33 @@ if ![is_remote target] {
gdb_exit
projects / packages / gdb.git / commitdiff