From: Pedro Alves <palves@redhat.com>
To: Alan Modra <amodra@gmail.com>
Cc: binutils@sourceware.org
Subject: Re: [PATCH 0/5] Rename a few internal symbols to avoid collisions
Date: Fri, 17 Feb 2017 02:30:00 -0000 [thread overview]
Message-ID: <973ef361-275d-8c40-e82b-b561e2c4e180@redhat.com> (raw)
In-Reply-To: <937774fe-93a6-0aea-c931-be1d980bf2ea@redhat.com>
On 02/17/2017 02:16 AM, Pedro Alves wrote:
> On 02/17/2017 01:06 AM, Alan Modra wrote:
>> On Fri, Feb 17, 2017 at 12:17:55AM +0000, Pedro Alves wrote:
>>> bfd: Rename read_{signed,unsigned}_leb128, safe_read_leb128
>>> bfd: Rename real_{ftell, fseek, fopen}
>>> bfd: Rename warn_deprecated
>>> bfd: Rename bsd_write_armap and coff_write_armap
>>> bfd: Rename Chunk and S3Forced
>>
>> OK, thanks.
>>
>
> Thanks, I pushed it, and the buildbot complained that I broke
> the build... There are a few instances of safe_read_leb128
> in bfd/dwarf2.c that I didn't adjust. I was puzzled,
> since my tree builds cleanly. But removing the .o files and
> rebuilding the file triggers it. Looks like I hit some
> stale dependency. :-/ Fixing...
Ah, no, false alarm, actually. master is fine. It's simply that
there's one hunk that was accidentally left in patch #2 that should
have been in patch #1:
--- a/bfd/dwarf2.c
+++ b/bfd/dwarf2.c
@@ -906,7 +906,8 @@ read_abbrevs (bfd *abfd, bfd_uint64_t offset, struct dwarf2_debug *stash)
abbrev_ptr = stash->dwarf_abbrev_buffer + offset;
abbrev_end = stash->dwarf_abbrev_buffer + stash->dwarf_abbrev_size;
- abbrev_number = safe_read_leb128 (abfd, abbrev_ptr, &bytes_read, FALSE, abbrev_end);
+ abbrev_number = _bfd_safe_read_leb128 (abfd, abbrev_ptr, &bytes_read,
+ FALSE, abbrev_end);
abbrev_ptr += bytes_read;
So all the built slaves will fail to build patch #1. They should go back
to normal automatically once they move past that commit.
Thanks,
Pedro Alves
next prev parent reply other threads:[~2017-02-17 2:30 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-17 0:18 Pedro Alves
2017-02-17 0:18 ` [PATCH 1/5] bfd: Rename read_{signed,unsigned}_leb128, safe_read_leb128 Pedro Alves
2017-02-17 0:18 ` [PATCH 2/5] bfd: Rename real_{ftell, fseek, fopen} Pedro Alves
2017-02-17 0:18 ` [PATCH 3/5] bfd: Rename warn_deprecated Pedro Alves
2017-02-17 0:24 ` [PATCH 4/5] bfd: Rename bsd_write_armap and coff_write_armap Pedro Alves
2017-02-17 0:24 ` [PATCH 5/5] bfd: Rename Chunk and S3Forced Pedro Alves
2017-02-17 1:06 ` [PATCH 0/5] Rename a few internal symbols to avoid collisions Alan Modra
2017-02-17 2:16 ` Pedro Alves
2017-02-17 2:30 ` Pedro Alves [this message]
2017-02-17 2:53 ` Alan Modra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=973ef361-275d-8c40-e82b-b561e2c4e180@redhat.com \
--to=palves@redhat.com \
--cc=amodra@gmail.com \
--cc=binutils@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).