diff options
| author | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2013-09-23 10:37:37 +0200 |
|---|---|---|
| committer | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2013-11-01 04:11:58 +0100 |
| commit | 540da1c35be501a8d4f69435d45459b393bea20b (patch) | |
| tree | 74601fa1920a6389da0d3c4faf7129fb4d850a8f | |
| parent | 05603024f6a970455ab63a9b7b12dcc1ce5490b7 (diff) | |
| download | elfutils-linaro_android_4.4.4.tar.gz | |
Fix more gcc 4.8 warningslinaro_android_4.4.4linaro_android_4.4.3linaro_android_4.4.2linaro_android_4.4
Change-Id: I81b5ef173b3b78609726d370aed5d2dca2b08db6
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
| -rw-r--r-- | libdw/dwarf_entry_breakpoints.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libdw/dwarf_entry_breakpoints.c b/libdw/dwarf_entry_breakpoints.c index 0d5c9d9f..93ca6e59 100644 --- a/libdw/dwarf_entry_breakpoints.c +++ b/libdw/dwarf_entry_breakpoints.c @@ -81,7 +81,7 @@ /* Search a contiguous PC range for prologue-end markers. If DWARF, look for proper markers. Failing that, if ADHOC, look for the ad hoc convention. */ - inline int search_range (Dwarf_Die *die, Dwarf_Addr **bkpts, int *nbkpts, Dwarf_Lines *lines, size_t nlines, Dwarf_Addr low, Dwarf_Addr high, + inline int search_range (Dwarf_Addr **bkpts, int *nbkpts, Dwarf_Lines *lines, size_t nlines, Dwarf_Addr low, Dwarf_Addr high, bool dwarf, bool adhoc) { size_t l = 0, u = nlines; @@ -151,14 +151,14 @@ dwarf_entry_breakpoints (die, bkpts) /* Most often there is a single contiguous PC range for the DIE. */ if (offset == 1) - return search_range (die, bkpts, &nbkpts, lines, nlines, begin, end, true, true) ?: entrypc_bkpt (die, bkpts, &nbkpts); + return search_range (bkpts, &nbkpts, lines, nlines, begin, end, true, true) ?: entrypc_bkpt (die, bkpts, &nbkpts); Dwarf_Addr lowpc = (Dwarf_Addr) -1l; Dwarf_Addr highpc = (Dwarf_Addr) -1l; while (offset > 0) { /* We have an address range entry. */ - if (search_range (die, bkpts, &nbkpts, lines, nlines, begin, end, true, false) < 0) + if (search_range (bkpts, &nbkpts, lines, nlines, begin, end, true, false) < 0) return -1; if (begin < lowpc) @@ -175,6 +175,6 @@ dwarf_entry_breakpoints (die, bkpts) fall back to just using the entrypc value. */ return (nbkpts ?: (lowpc == (Dwarf_Addr) -1l ? 0 - : search_range (die, bkpts, &nbkpts, lines, nlines, lowpc, highpc, false, true)) + : search_range (bkpts, &nbkpts, lines, nlines, lowpc, highpc, false, true)) ?: entrypc_bkpt (die, bkpts, &nbkpts)); } |