aboutsummaryrefslogtreecommitdiff
path: root/gold
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2021-07-20 18:46:57 +0930
committerAlan Modra <amodra@gmail.com>2021-07-20 20:15:48 +0930
commitb97bd976233ee4d43c2fe18f6356e62779cbe82d (patch)
treedd0c04bae30dbf5f72920631361520224b4f5a90 /gold
parent05558223b5b52bf41036eb80335d2e541187e78f (diff)
downloadgdb-b97bd976233ee4d43c2fe18f6356e62779cbe82d.zip
gdb-b97bd976233ee4d43c2fe18f6356e62779cbe82d.tar.gz
gdb-b97bd976233ee4d43c2fe18f6356e62779cbe82d.tar.bz2
PR28106, build of 2.37 fails on FreeBSD and Clang
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.
Diffstat (limited to 'gold')
-rw-r--r--gold/ChangeLog6
-rw-r--r--gold/gc.h4
2 files changed, 8 insertions, 2 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 6aba1e0..df92052 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,9 @@
+2021-07-20 Alan Modra <amodra@gmail.com>
+
+ PR gold/28106
+ PR gold/27815
+ * gc.h (gc_process_relocs): Use static_cast in Section_id constructor.
+
2021-07-17 Michael Krasnyk <michael.krasnyk@gmail.com>
PR gold/28098
diff --git a/gold/gc.h b/gold/gc.h
index 6ebd81f..4a1368f 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(reinterpret_cast<Relobj*>(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(reinterpret_cast<Relobj*>(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),