From f43ba157ad5d77640afeaf56e13762917b919c98 Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Tue, 4 Dec 2012 03:13:31 +0000
Subject: [PATCH] 	* powerpc.cc (Powerpc_relobj::do_scan_relocs): Delete.
 	(Target_powerpc::do_define_standard_symbols): New function.

---
 gold/ChangeLog  |  5 +++++
 gold/powerpc.cc | 18 +++++++-----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 879eb3e1fb6..abe79aa9567 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-04  Alan Modra  <amodra@gmail.com>
+
+	* powerpc.cc (Powerpc_relobj::do_scan_relocs): Delete.
+	(Target_powerpc::do_define_standard_symbols): New function.
+
 2012-12-03  Alan Modra  <amodra@gmail.com>
 
 	* output.h: Formatting, whitespace.
diff --git a/gold/powerpc.cc b/gold/powerpc.cc
index 3f3041f9cec..9c42c3ca6de 100644
--- a/gold/powerpc.cc
+++ b/gold/powerpc.cc
@@ -201,12 +201,6 @@ public:
   void
   do_read_relocs(Read_relocs_data*);
 
-  // Set up some symbols, then perform Sized_relobj_file method.
-  // Occurs after garbage collection, which is why opd info can't be
-  // set up here.
-  void
-  do_scan_relocs(Symbol_table*, Layout*, Read_relocs_data*);
-
   bool
   do_find_special_sections(Read_symbols_data* sd);
 
@@ -403,6 +397,9 @@ class Target_powerpc : public Sized_target<size, big_endian>
   Stub_table<size, big_endian>*
   new_stub_table();
 
+  void
+  do_define_standard_symbols(Symbol_table*, Layout*);
+
   // Finalize the sections.
   void
   do_finalize_sections(Layout*, const Input_objects*, Symbol_table*);
@@ -1540,13 +1537,13 @@ Powerpc_relobj<size, big_endian>::do_read_relocs(Read_relocs_data* rd)
     }
 }
 
-// Set up some symbols, then perform Sized_relobj_file method.
+// Set up some symbols.
 
 template<int size, bool big_endian>
 void
-Powerpc_relobj<size, big_endian>::do_scan_relocs(Symbol_table* symtab,
-						 Layout* layout,
-						 Read_relocs_data* rd)
+Target_powerpc<size, big_endian>::do_define_standard_symbols(
+    Symbol_table* symtab,
+    Layout* layout)
 {
   if (size == 32)
     {
@@ -1588,7 +1585,6 @@ Powerpc_relobj<size, big_endian>::do_scan_relocs(Symbol_table* symtab,
 					0, false, false);
 	}
     }
-  Sized_relobj_file<size, big_endian>::do_scan_relocs(symtab, layout, rd);
 }
 
 // Set up PowerPC target specific relobj.
-- 
2.30.2