X-Git-Url: http://drtracing.org/?a=blobdiff_plain;ds=sidebyside;f=gold%2Fcommon.h;h=abf8242da16758767db5ae5eec0c6c386ed4f607;hb=de54374205650be71237ce51ef7981d30ddd78dc;hp=b85192e5128f87e276a6f2444482fdd4a1ebb22f;hpb=17a1d0a9b26ce8f4f71073c41483baa0c10ed83b;p=deliverable%2Fbinutils-gdb.git

diff --git a/gold/common.h b/gold/common.h
index b85192e512..abf8242da1 100644
--- a/gold/common.h
+++ b/gold/common.h
@@ -1,6 +1,6 @@
 // common.h -- handle common symbols for gold   -*- C++ -*-
 
-// Copyright 2006, 2007 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.
@@ -28,7 +28,6 @@
 namespace gold
 {
 
-class General_options;
 class Symbol_table;
 
 // This task is used to allocate the common symbols.
@@ -36,11 +35,9 @@ 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.
@@ -59,10 +56,9 @@ class Allocate_commons_task : public Task
   { return "Allocate_commons_task"; }
 
  private:
-  const General_options& options_;
   Symbol_table* symtab_;
   Layout* layout_;
-  Task_token* symtab_lock_;
+  Mapfile* mapfile_;
   Task_token* blocker_;
 };