merge from gcc

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

diff --git a/gold/common.cc b/gold/common.cc
index 28ca2f6dab85e73862068e214dc3551a69c249ab..e83219c901f0d8624d3ab219fc12837f0f59a227 100644 (file)
--- a/gold/common.cc
+++ b/gold/common.cc
@@ -7,6 +7,7 @@
 #include "workqueue.h"
 #include "layout.h"
 #include "output.h"
+#include "symtab.h"
 #include "common.h"
 
 namespace gold
@@ -119,7 +120,7 @@ Symbol_table::allocate_commons(const General_options& options, Layout* layout)
   else if (this->get_size() == 64)
     this->do_allocate_commons<64>(options, layout);
   else
-    abort();
+    gold_unreachable();
 }
 
 // Allocated the common symbols, sized version.
@@ -170,7 +171,7 @@ Symbol_table::do_allocate_commons(const General_options&,
 
   // Place them in a newly allocated .bss section.
 
-  Output_section_common *poc = new Output_section_common(addralign);
+  Output_data_space *poc = new Output_data_space(addralign);
 
   layout->add_output_section_data(".bss", elfcpp::SHT_NOBITS,
                                  elfcpp::SHF_WRITE | elfcpp::SHF_ALLOC,
@@ -201,7 +202,7 @@ Symbol_table::do_allocate_commons(const General_options&,
       off += symsize;
     }
 
-  poc->set_common_size(off);
+  poc->set_space_size(off);
 
   this->commons_.clear();
 }