libctf: get rid of a disruptive public include of <sys/param.h>

[deliverable/binutils-gdb.git] / gold / object.cc

diff --git a/gold/object.cc b/gold/object.cc
index 86c519acf72db919ff1f6f2f5540f1514dbf3e10..2fca7eb22788257b19de00ddfa5f357957475cfb 100644 (file)
--- a/gold/object.cc
+++ b/gold/object.cc
@@ -1884,11 +1884,15 @@ Sized_relobj_file<size, big_endian>::do_layout(Symbol_table* symtab,
       if (strncmp (name, lto_section_name, strlen (lto_section_name)) == 0)
        {
          section_size_type contents_len;
-         const unsigned char* pcontents = this->section_contents(i, &contents_len, false);
-         struct lto_section lsection = *(const lto_section*)pcontents;
-         if (lsection.slim_object)
-           gold_info(_("%s: plugin needed to handle lto object"),
-                     this->name().c_str());
+         const unsigned char* pcontents
+           = this->section_contents(i, &contents_len, false);
+         if (contents_len >= sizeof(lto_section))
+           {
+             const lto_section* lsection
+               = reinterpret_cast<const lto_section*>(pcontents);
+             if (lsection->slim_object)
+               layout->set_lto_slim_object();
+           }
        }
     }
 
@@ -2127,7 +2131,8 @@ Sized_relobj_file<size, big_endian>::do_add_symbols(Symbol_table* symtab,
 
   this->symbols_.resize(symcount);
 
-  if (layout->is_lto_slim_object ())
+  if (!parameters->options().relocatable()
+      && layout->is_lto_slim_object ())
     gold_info(_("%s: plugin needed to handle lto object"),
              this->name().c_str());