diff options
| author | Alan Modra <amodra@gmail.com> | 2021-05-20 08:19:00 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2021-08-19 10:52:15 +0930 |
| commit | ee51385839895013660b2fe5a86713e43f1627cf (patch) | |
| tree | 222fa2056a6953f40e21aef6bd6cb9ee614aad0e | |
| parent | 74b1f14926e30528656ca83ded15599239178d9f (diff) | |
| download | gdb-ee51385839895013660b2fe5a86713e43f1627cf.zip gdb-ee51385839895013660b2fe5a86713e43f1627cf.tar.gz gdb-ee51385839895013660b2fe5a86713e43f1627cf.tar.bz2 | |
[GOLD] PR27815, gold fails to build with latest GCC
...gold/gc.h:250:37: error: ISO C++ says that these are ambiguous, even though the worst conversion for the first is better than the worst conversion for the second: [-Werror]
250 | (*secvec).push_back(Section_id(NULL, 0));
| ^~~~~~~~~~~~~~~~~~~
PR gold/27815
* gc.h (gc_process_relocs): Use nullptr in Section_id constructor.
Don't use nullptr, it requires -std=c++11 on versions of gcc prior to
6.1. It would be possible to arrange to pass -std=c++11 automatically
when required (top level configure does that for gcc builds) but that
seems overkill and since we're not up-to-date on the top level config
files would mean someone would need to sync those over.
PR gold/27815
* gc.h (gc_process_relocs): Use cast in Section_id constructor.
https://en.cppreference.com/w/cpp/types/NULL says NULL might be
defined as nullptr.
https://en.cppreference.com/w/cpp/language/reinterpret_cast says
reinterpret_cast can't be used on nullptr.
PR gold/28106
PR gold/27815
* gc.h (gc_process_relocs): Use static_cast in Section_id constructor.
(cherry picked from commit 1f1fb219fdc4f96fd967e6173e9090c4c4917e96)
(cherry picked from commit 5d7f11f0e76ca290e3745c8836b92a5266cb84e2)
(cherry picked from commit b97bd976233ee4d43c2fe18f6356e62779cbe82d)
| -rw-r--r-- | gold/gc.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -247,7 +247,7 @@ gc_process_relocs( if (is_ordinary) (*secvec).push_back(Section_id(src_obj, dst_indx)); else - (*secvec).push_back(Section_id(NULL, 0)); + (*secvec).push_back(Section_id(static_cast<Relobj*>(NULL), 0)); // If the target of the relocation is an STT_SECTION symbol, // make a note of that by storing -1 in the symbol vector. if (lsym.get_st_type() == elfcpp::STT_SECTION) @@ -329,7 +329,7 @@ gc_process_relocs( if (is_ordinary && dst_obj != NULL) (*secvec).push_back(Section_id(dst_obj, dst_indx)); else - (*secvec).push_back(Section_id(NULL, 0)); + (*secvec).push_back(Section_id(static_cast<Relobj*>(NULL), 0)); (*symvec).push_back(gsym); (*addendvec).push_back(std::make_pair( static_cast<long long>(symvalue), |