gdb: add target_ops::supports_displaced_step

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

diff --git a/gold/common.h b/gold/common.h
index bd24985c9bea51fe17afa131e20f5b16f15dcf4f..abf8242da16758767db5ae5eec0c6c386ed4f607 100644 (file)
--- 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,20 +35,18 @@ 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*);
@@ -59,12 +56,9 @@ class Allocate_commons_task : public Task
   { return "Allocate_commons_task"; }
 
  private:
-  class Allocate_commons_locker;
-
-  const General_options& options_;
   Symbol_table* symtab_;
   Layout* layout_;
-  Task_token* symtab_lock_;
+  Mapfile* mapfile_;
   Task_token* blocker_;
 };