This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[GOLD] powerpc target select


The powerpc do_recognize does nothing but match EM_PPC/EM_PPC64,
which can be done in target-select.cc:select_target().

	* powerpc.cc (Target_selector_powerpc::Target_selector_powerpc):
	Set EM_PPC64 or EM_PPC here.
	(Target_selector_powerpc::do_recognize): Delete.

Index: gold/powerpc.cc
===================================================================
RCS file: /cvs/src/src/gold/powerpc.cc,v
retrieving revision 1.77
diff -u -p -r1.77 powerpc.cc
--- gold/powerpc.cc	10 Dec 2012 11:30:57 -0000	1.77
+++ gold/powerpc.cc	10 Dec 2012 11:32:06 -0000
@@ -6942,7 +6942,8 @@ class Target_selector_powerpc : public T
 {
 public:
   Target_selector_powerpc()
-    : Target_selector(elfcpp::EM_NONE, size, big_endian,
+    : Target_selector(size == 64 ? elfcpp::EM_PPC64 : elfcpp::EM_PPC,
+		      size, big_endian,
 		      (size == 64
 		       ? (big_endian ? "elf64-powerpc" : "elf64-powerpcle")
 		       : (big_endian ? "elf32-powerpc" : "elf32-powerpcle")),
@@ -6952,28 +6953,6 @@ public:
   { }
 
   virtual Target*
-  do_recognize(Input_file*, off_t, int machine, int, int)
-  {
-    switch (size)
-      {
-      case 64:
-	if (machine != elfcpp::EM_PPC64)
-	  return NULL;
-	break;
-
-      case 32:
-	if (machine != elfcpp::EM_PPC)
-	  return NULL;
-	break;
-
-      default:
-	return NULL;
-      }
-
-    return this->instantiate_target();
-  }
-
-  virtual Target*
   do_instantiate_target()
   { return new Target_powerpc<size, big_endian>(); }
 };

-- 
Alan Modra
Australia Development Lab, IBM


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]