diff options
| author | Pedro Alves <palves@redhat.com> | 2016-09-18 23:56:01 +0100 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2016-09-18 23:56:01 +0100 |
| commit | 768adc05c44c7e8b5c0f9ca5ad3ca96657715293 (patch) | |
| tree | 47c7bd49aa65a757a3b223767d86a3102fc8ca85 /gdb/remote.c | |
| parent | 498f644143437511c10b0cb30479e528d32ea02b (diff) | |
| download | gdb-768adc05c44c7e8b5c0f9ca5ad3ca96657715293.zip gdb-768adc05c44c7e8b5c0f9ca5ad3ca96657715293.tar.gz gdb-768adc05c44c7e8b5c0f9ca5ad3ca96657715293.tar.bz2 | |
gdb: Fix std::{min, max}-related build breakage on 32-bit hosts
Building on a 32-bit host fails currently with errors like:
.../src/gdb/exec.c: In function ‘target_xfer_status section_table_read_available_memory(gdb_byte*, ULONGEST, ULONGEST, ULONGEST*)’:
.../src/gdb/exec.c:801:54: error: no matching function for call to ‘min(ULONGEST, long unsigned int)’
end = std::min (offset + len, r->start + r->length);
^
In file included from /usr/include/c++/5.3.1/algorithm:61:0,
from .../src/gdb/exec.c:46:
/usr/include/c++/5.3.1/bits/stl_algobase.h:195:5: note: candidate: template<class _Tp> const _Tp& std::min(const _Tp&, const _Tp&)
min(const _Tp& __a, const _Tp& __b)
^
/usr/include/c++/5.3.1/bits/stl_algobase.h:195:5: note: template argument deduction/substitution failed:
.../src/gdb/exec.c:801:54: note: deduced conflicting types for parameter ‘const _Tp’ (‘long long unsigned int’ and ‘long unsigned int’)
end = std::min (offset + len, r->start + r->length);
^
In file included from /usr/include/c++/5.3.1/algorithm:61:0,
from .../src/gdb/exec.c:46:
/usr/include/c++/5.3.1/bits/stl_algobase.h:243:5: note: candidate: template<class _Tp, class _Compare> const _Tp& std::min(const _Tp&, const _Tp&, _Compare)
min(const _Tp& __a, const _Tp& __b, _Compare __comp)
^
The problem is that the std::min/std::max function templates use the
same type for both parameters. When the argument types are different,
the compiler can't automatically deduce which template specialization
to pick from the arguments' types.
Fix that by specifying the specialization we want explicitly.
gdb/ChangeLog:
2016-09-18 Pedro Alves <palves@redhat.com>
* breakpoint.c (hardware_watchpoint_inserted_in_range): Explicitly
specify the std:min/std::max specialization.
* exec.c (section_table_read_available_memory): Likewise.
* remote.c (remote_read_qxfer): Likewise.
* target.c (simple_verify_memory): Likewise.
Diffstat (limited to 'gdb/remote.c')
| -rw-r--r-- | gdb/remote.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gdb/remote.c b/gdb/remote.c index 2309205..e80db79 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -9907,7 +9907,7 @@ remote_read_qxfer (struct target_ops *ops, const char *object_name, may not, since we don't know how much of it will need to be escaped; the target is free to respond with slightly less data. We subtract five to account for the response type and the protocol frame. */ - n = std::min (get_remote_packet_size () - 5, len); + n = std::min<LONGEST> (get_remote_packet_size () - 5, len); snprintf (rs->buf, get_remote_packet_size () - 4, "qXfer:%s:read:%s:%s,%s", object_name, annex ? annex : "", phex_nz (offset, sizeof offset), |