[GOLD] PR27815, gold fails to build with latest GCC
authorAlan Modra <amodra@gmail.com>
Tue, 25 May 2021 05:36:49 +0000 (15:06 +0930)
committerAlan Modra <amodra@gmail.com>
Tue, 25 May 2021 07:17:16 +0000 (16:47 +0930)
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.

gold/ChangeLog
gold/gc.h

index 37fe2012a29c270d2d84fded9d55edffc54a503b..84df32ac3a038dc96bf7cd1b76ba253c1222a9c9 100644 (file)
@@ -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
index dc5c100295e2f701cd891369b9d30b5c93515a9d..6ebd81f3fd0eebfd3459c96fa5c0dbd0451c2e46 100644 (file)
--- 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),