aboutsummaryrefslogtreecommitdiff
path: root/gold
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2021-10-20 10:09:57 +1030
committerAlan Modra <amodra@gmail.com>2021-10-21 07:54:27 +1030
commit068a039b8bd7c7386bb0d88f0ae245b0fe4132e9 (patch)
tree8e486ad496107538d58b7dfc2fb0e0a3c7173ae6 /gold
parentc7fdac09d919aaf86d302e6c622de6ee000c1b7c (diff)
downloadgdb-068a039b8bd7c7386bb0d88f0ae245b0fe4132e9.zip
gdb-068a039b8bd7c7386bb0d88f0ae245b0fe4132e9.tar.gz
gdb-068a039b8bd7c7386bb0d88f0ae245b0fe4132e9.tar.bz2
PR28417, std::string no longer allows accepting nullptr_t
PR 28417 * incremental.cc (Sized_relobj_incr::do_section_name): Avoid std:string undefined behaviour. * options.h (Search_directory::Search_directory): Likewise.
Diffstat (limited to 'gold')
-rw-r--r--gold/incremental.cc2
-rw-r--r--gold/options.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/gold/incremental.cc b/gold/incremental.cc
index 5294198..327a152 100644
--- a/gold/incremental.cc
+++ b/gold/incremental.cc
@@ -2286,7 +2286,7 @@ Sized_relobj_incr<size, big_endian>::do_section_name(unsigned int shndx) const
const Output_sections& out_sections(this->output_sections());
const Output_section* os = out_sections[shndx];
if (os == NULL)
- return NULL;
+ return std::string();
return os->name();
}
diff --git a/gold/options.h b/gold/options.h
index 757ebf1..47299a3 100644
--- a/gold/options.h
+++ b/gold/options.h
@@ -611,7 +611,7 @@ class Search_directory
// We need a default constructor because we put this in a
// std::vector.
Search_directory()
- : name_(NULL), put_in_sysroot_(false), is_in_sysroot_(false)
+ : name_(), put_in_sysroot_(false), is_in_sysroot_(false)
{ }
// This is the usual constructor.