summaryrefslogtreecommitdiff
path: root/gold
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2021-05-20 08:19:00 +0930
committerAlan Modra <amodra@gmail.com>2021-05-22 17:23:06 +0930
commit1f1fb219fdc4f96fd967e6173e9090c4c4917e96 (patch)
tree609630b8c3e12699e6b08e449cd5e32794226933 /gold
parent168671c14cc88e0c47a2b7d56fdede7d6604f14d (diff)
[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.
Diffstat (limited to 'gold')
-rw-r--r--gold/ChangeLog5
-rw-r--r--gold/gc.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 5897b10aee..37fe2012a2 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2021-05-22 Alan Modra <amodra@gmail.com>
+
+ PR gold/27815
+ * gc.h (gc_process_relocs): Use nullptr in Section_id constructor.
+
2021-05-15 Alan Modra <amodra@gmail.com>
PR 27834
diff --git a/gold/gc.h b/gold/gc.h
index 2c20b44b6e..dc5c100295 100644
--- a/gold/gc.h
+++ b/gold/gc.h
@@ -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(nullptr, 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(nullptr, 0));
(*symvec).push_back(gsym);
(*addendvec).push_back(std::make_pair(
static_cast<long long>(symvalue),