gdb: add target_ops::supports_displaced_step

[deliverable/binutils-gdb.git] / gold / copy-relocs.cc

diff --git a/gold/copy-relocs.cc b/gold/copy-relocs.cc
index 2d03b1a01b6eb644238105ee08d4a43b6a45d4c5..bb824b6a9fac312bf4688da02e4fca38c616cf30 100644 (file)
--- a/gold/copy-relocs.cc
+++ b/gold/copy-relocs.cc
@@ -1,6 +1,6 @@
 // copy-relocs.cc -- handle COPY relocations for gold.
 
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
+// Copyright (C) 2006-2020 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -48,7 +48,7 @@ Copy_relocs<sh_type, size, big_endian>::copy_reloc(
     Output_data_reloc<sh_type, true, size, big_endian>* reloc_section)
 {
   if (this->need_copy_reloc(sym, object, shndx))
-    this->make_copy_reloc(symtab, layout, sym, reloc_section);
+    this->make_copy_reloc(symtab, layout, sym, object, reloc_section);
   else
     {
       // We may not need a COPY relocation.  Save this relocation to
@@ -111,11 +111,24 @@ Copy_relocs<sh_type, size, big_endian>::make_copy_reloc(
     Symbol_table* symtab,
     Layout* layout,
     Sized_symbol<size>* sym,
+    Sized_relobj_file<size, big_endian>* object,
     Output_data_reloc<sh_type, true, size, big_endian>* reloc_section)
 {
   // We should not be here if -z nocopyreloc is given.
   gold_assert(parameters->options().copyreloc());
 
+  gold_assert(sym->is_from_dynobj());
+
+  // The symbol must not have protected visibility.
+  if (sym->is_protected())
+    {
+      gold_error(_("%s: cannot make copy relocation for "
+                  "protected symbol '%s', defined in %s"),
+                object->name().c_str(),
+                sym->name(),
+                sym->object()->name().c_str());
+    }
+
   typename elfcpp::Elf_types<size>::Elf_WXword symsize = sym->symsize();
 
   // There is no defined way to determine the required alignment of
@@ -124,11 +137,11 @@ Copy_relocs<sh_type, size, big_endian>::make_copy_reloc(
   // is defined; presumably we do not require an alignment larger than
   // that.  Then we reduce that alignment if the symbol is not aligned
   // within the section.
-  gold_assert(sym->is_from_dynobj());
   bool is_ordinary;
   unsigned int shndx = sym->shndx(&is_ordinary);
   gold_assert(is_ordinary);
   typename elfcpp::Elf_types<size>::Elf_WXword addralign;
+  bool is_readonly = false;
 
   {
     // Lock the object so we can read from it.  This is only called
@@ -138,6 +151,17 @@ Copy_relocs<sh_type, size, big_endian>::make_copy_reloc(
     Object* obj = sym->object();
     Task_lock_obj<Object> tl(dummy_task, obj);
     addralign = obj->section_addralign(shndx);
+    if (parameters->options().relro())
+      {
+       if ((obj->section_flags(shndx) & elfcpp::SHF_WRITE) == 0)
+         is_readonly = true;
+       else
+         {
+           // Symbols in .data.rel.ro should also be treated as read-only.
+           if (obj->section_name(shndx) == ".data.rel.ro")
+             is_readonly = true;
+         }
+      }
   }
 
   typename Sized_symbol<size>::Value_type value = sym->value();
@@ -147,16 +171,32 @@ Copy_relocs<sh_type, size, big_endian>::make_copy_reloc(
   // Mark the dynamic object as needed for the --as-needed option.
   sym->object()->set_is_needed();
 
-  if (this->dynbss_ == NULL)
+  Output_data_space* dynbss;
+
+  if (is_readonly)
     {
-      this->dynbss_ = new Output_data_space(addralign, "** dynbss");
-      layout->add_output_section_data(".bss",
-                                     elfcpp::SHT_NOBITS,
-                                     elfcpp::SHF_ALLOC | elfcpp::SHF_WRITE,
-                                     this->dynbss_, ORDER_BSS, false);
+      if (this->dynrelro_ == NULL)
+       {
+         this->dynrelro_ = new Output_data_space(addralign, "** dynrelro");
+         layout->add_output_section_data(".data.rel.ro",
+                                         elfcpp::SHT_PROGBITS,
+                                         elfcpp::SHF_ALLOC | elfcpp::SHF_WRITE,
+                                         this->dynrelro_, ORDER_RELRO, false);
+       }
+      dynbss = this->dynrelro_;
+    }
+  else
+    {
+      if (this->dynbss_ == NULL)
+       {
+         this->dynbss_ = new Output_data_space(addralign, "** dynbss");
+         layout->add_output_section_data(".bss",
+                                         elfcpp::SHT_NOBITS,
+                                         elfcpp::SHF_ALLOC | elfcpp::SHF_WRITE,
+                                         this->dynbss_, ORDER_BSS, false);
+       }
+      dynbss = this->dynbss_;
     }
-
-  Output_data_space* dynbss = this->dynbss_;
 
   if (addralign > dynbss->addralign())
     dynbss->set_space_alignment(addralign);