diff options
| author | Tom Tromey <tromey@redhat.com> | 2013-10-09 14:26:26 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2013-10-09 14:26:26 +0000 |
| commit | 1677499f5afa31d6f07f0caca3eaca3855e70348 (patch) | |
| tree | f618c144b4cd60c9958bbe2f38c324ab99d1eba4 | |
| parent | 29c3eb83b92ecec761add5bd03d59a2c3551b038 (diff) | |
| download | gdb-1677499f5afa31d6f07f0caca3eaca3855e70348.tar.gz | |
bfd
* bfd-in2.h: Rebuild.
* opncls.c (bfd_get_alt_debug_link_info): Change type of
buildid_len to bfd_size_type.
gdb
* dwarf2read.c (dwarf2_get_dwz_file): Update for type change in
bfd_get_alt_debug_link_info.
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/bfd-in2.h | 3 | ||||
| -rw-r--r-- | bfd/opncls.c | 5 | ||||
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/dwarf2read.c | 5 |
5 files changed, 20 insertions, 4 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index a0110199fea..9b7a032d61f 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2013-10-09 Tom Tromey <tromey@redhat.com> + + * bfd-in2.h: Rebuild. + * opncls.c (bfd_get_alt_debug_link_info): Change type of + buildid_len to bfd_size_type. + 2013-10-09 Sergio Durigan Junior <sergiodj@redhat.com> PR binutils/15993 diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 67eb7da2e34..810e1729c06 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -1067,7 +1067,8 @@ unsigned long bfd_calc_gnu_debuglink_crc32 char *bfd_get_debug_link_info (bfd *abfd, unsigned long *crc32_out); -char *bfd_get_alt_debug_link_info (bfd * abfd, size_t *buildid_len, +char *bfd_get_alt_debug_link_info (bfd * abfd, + bfd_size_type *buildid_len, bfd_byte **buildid_out); char *bfd_follow_gnu_debuglink (bfd *abfd, const char *dir); diff --git a/bfd/opncls.c b/bfd/opncls.c index f29b2c8a371..08f6c5b1e04 100644 --- a/bfd/opncls.c +++ b/bfd/opncls.c @@ -1194,7 +1194,8 @@ FUNCTION bfd_get_alt_debug_link_info SYNOPSIS - char *bfd_get_alt_debug_link_info (bfd * abfd, size_t *buildid_len, + char *bfd_get_alt_debug_link_info (bfd * abfd, + bfd_size_type *buildid_len, bfd_byte **buildid_out); DESCRIPTION @@ -1207,7 +1208,7 @@ DESCRIPTION */ char * -bfd_get_alt_debug_link_info (bfd * abfd, size_t *buildid_len, +bfd_get_alt_debug_link_info (bfd * abfd, bfd_size_type *buildid_len, bfd_byte **buildid_out) { asection *sect; diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c2e87d65fd2..51f9b43c8c7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2013-10-09 Tom Tromey <tromey@redhat.com> + + * dwarf2read.c (dwarf2_get_dwz_file): Update for type change in + bfd_get_alt_debug_link_info. + 2013-10-09 Jan Kratochvil <jan.kratochvil@redhat.com> New flag OBJF_NOT_FILENAME. diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 4cb66db85a2..aa109e0080b 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -2365,6 +2365,7 @@ dwarf2_get_dwz_file (void) struct cleanup *cleanup; const char *filename; struct dwz_file *result; + bfd_size_type buildid_len_arg; size_t buildid_len; bfd_byte *buildid; @@ -2373,7 +2374,7 @@ dwarf2_get_dwz_file (void) bfd_set_error (bfd_error_no_error); data = bfd_get_alt_debug_link_info (dwarf2_per_objfile->objfile->obfd, - &buildid_len, &buildid); + &buildid_len_arg, &buildid); if (data == NULL) { if (bfd_get_error () == bfd_error_no_error) @@ -2384,6 +2385,8 @@ dwarf2_get_dwz_file (void) cleanup = make_cleanup (xfree, data); make_cleanup (xfree, buildid); + buildid_len = (size_t) buildid_len_arg; + filename = (const char *) data; if (!IS_ABSOLUTE_PATH (filename)) { |