aboutsummaryrefslogtreecommitdiff
path: root/gold
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2021-05-25 15:06:49 +0930
committerAlan Modra <amodra@gmail.com>2021-05-25 16:47:16 +0930
commit5d7f11f0e76ca290e3745c8836b92a5266cb84e2 (patch)
tree0631d08811a995a8bcc058ff8e88b07afb18b66a /gold
parent4be1e8dbb3f8da8058ed93dfc222ee6dffb02e60 (diff)
downloadgdb-5d7f11f0e76ca290e3745c8836b92a5266cb84e2.zip
gdb-5d7f11f0e76ca290e3745c8836b92a5266cb84e2.tar.gz
gdb-5d7f11f0e76ca290e3745c8836b92a5266cb84e2.tar.bz2
[GOLD] PR27815, gold fails to build with latest GCC
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.
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 37fe201..84df32a 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2021-05-25 Alan Modra <amodra@gmail.com>
+
+ PR gold/27815
+ * gc.h (gc_process_relocs): Use cast in Section_id constructor.
+
2021-05-22 Alan Modra <amodra@gmail.com>
PR gold/27815
diff --git a/gold/gc.h b/gold/gc.h
index dc5c100..6ebd81f 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(nullptr, 0));
+ (*secvec).push_back(Section_id(reinterpret_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(nullptr, 0));
+ (*secvec).push_back(Section_id(reinterpret_cast<Relobj*>(NULL), 0));
(*symvec).push_back(gsym);
(*addendvec).push_back(std::make_pair(
static_cast<long long>(symvalue),