* i386.cc (class Target_i386): Add got_tlsdesc_ field.

[binutils-gdb.git] / gold / icf.h

diff --git a/gold/icf.h b/gold/icf.h
index c1db8e586f512dbf420efe5ad8534336d17d4ce8..1a4d1be96203b43bd7770b76f41de08b4dd7502d 100644 (file)
--- a/gold/icf.h
+++ b/gold/icf.h
@@ -43,6 +43,7 @@ class Icf
   typedef std::vector<Symbol*> Symbol_info;
   typedef std::vector<std::pair<long long, long long> > Addend_info;
   typedef std::vector<uint64_t> Offset_info;
+  typedef std::vector<unsigned int> Reloc_addend_size_info;
   typedef Unordered_map<Section_id,
                         unsigned int,
                         Section_id_hash> Uniq_secn_id_map;
@@ -57,6 +58,7 @@ class Icf
     // This stores the symbol value and the addend for a reloc.
     Addend_info addend_info;
     Offset_info offset_info;
+    Reloc_addend_size_info reloc_addend_size_info;
   } Reloc_info;
 
   typedef Unordered_map<Section_id, Reloc_info,
@@ -121,13 +123,13 @@ class Icf
   // corresponding to taken function pointers.  Ignores eh_frame
   // and vtable sections.
   inline bool
-  check_section_for_function_pointers(std::string section_name,
+  check_section_for_function_pointers(const std::string& section_name,
                                       Target* target)
   {
     return (parameters->options().icf_safe_folding()
            && target->can_check_for_function_pointers()
-            && !is_prefix_of(".rodata._ZTV", section_name.c_str())
-            && !is_prefix_of(".eh_frame", section_name.c_str()));
+           && target->section_may_have_icf_unsafe_pointers(
+               section_name.c_str()));
   }
 
   // Returns a map of a section to info (Reloc_info) about its relocations.