X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gold%2Fcommon.h;h=abf8242da16758767db5ae5eec0c6c386ed4f607;hb=9a49ad8c522a1ce83645d477bf6ced574c3bf651;hp=75237a6a5c526dc00d57e8d383c6c96626ebb963;hpb=ead1e4244a55707685d105c662a9a1faf5d122fe;p=deliverable%2Fbinutils-gdb.git

diff --git a/gold/common.h b/gold/common.h
index 75237a6a5c..abf8242da1 100644
--- a/gold/common.h
+++ b/gold/common.h
@@ -1,5 +1,25 @@
 // common.h -- handle common symbols for gold   -*- C++ -*-
 
+// Copyright (C) 2006-2020 Free Software Foundation, Inc.
+// Written by Ian Lance Taylor <iant@google.com>.
+
+// This file is part of gold.
+
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+// MA 02110-1301, USA.
+
 #ifndef GOLD_COMMON_H
 #define GOLD_COMMON_H
 
@@ -8,7 +28,6 @@
 namespace gold
 {
 
-class General_options;
 class Symbol_table;
 
 // This task is used to allocate the common symbols.
@@ -16,31 +35,30 @@ class Symbol_table;
 class Allocate_commons_task : public Task
 {
  public:
-  Allocate_commons_task(const General_options& options, Symbol_table* symtab,
-			Layout* layout, Task_token* symtab_lock,
+  Allocate_commons_task(Symbol_table* symtab, Layout* layout, Mapfile* mapfile,
 			Task_token* blocker)
-    : options_(options), symtab_(symtab), layout_(layout),
-      symtab_lock_(symtab_lock), blocker_(blocker)
+    : symtab_(symtab), layout_(layout), mapfile_(mapfile), blocker_(blocker)
   { }
 
   // The standard Task methods.
 
-  Is_runnable_type
-  is_runnable(Workqueue*);
+  Task_token*
+  is_runnable();
 
-  Task_locker*
-  locks(Workqueue*);
+  void
+  locks(Task_locker*);
 
   void
   run(Workqueue*);
 
- private:
-  class Allocate_commons_locker;
+  std::string
+  get_name() const
+  { return "Allocate_commons_task"; }
 
-  const General_options& options_;
+ private:
   Symbol_table* symtab_;
   Layout* layout_;
-  Task_token* symtab_lock_;
+  Mapfile* mapfile_;
   Task_token* blocker_;
 };