From 1f1fb219fdc4f96fd967e6173e9090c4c4917e96 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 20 May 2021 08:19:00 +0930 Subject: [PATCH] [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. --- gold/ChangeLog | 5 +++++ gold/gc.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index 5897b10aeef..37fe2012a29 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,8 @@ +2021-05-22 Alan Modra + + PR gold/27815 + * gc.h (gc_process_relocs): Use nullptr in Section_id constructor. + 2021-05-15 Alan Modra PR 27834 diff --git a/gold/gc.h b/gold/gc.h index 2c20b44b6ed..dc5c100295e 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(symvalue), -- 2.30.2