m68hc11/12 readelf support

[deliverable/binutils-gdb.git] / gold / resolve.cc

diff --git a/gold/resolve.cc b/gold/resolve.cc
index dd5b6b6afa619600bbbd1bb694671613f5bcfc9b..11f322961ab2479209ec041d54e2a848836e6d3d 100644 (file)
--- a/gold/resolve.cc
+++ b/gold/resolve.cc
@@ -1,6 +1,6 @@
 // resolve.cc -- symbol resolution for gold
 
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
+// Copyright (C) 2006-2016 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -98,13 +98,7 @@ Symbol::override_base(const elfcpp::Sym<size, big_endian>& sym,
   this->is_ordinary_shndx_ = is_ordinary;
   // Don't override st_type from plugin placeholder symbols.
   if (object->pluginobj() == NULL)
-    {
-      // Turn IFUNC symbols from shared libraries into normal FUNC symbols.
-      elfcpp::STT type = sym.get_st_type();
-      if (object->is_dynamic() && type == elfcpp::STT_GNU_IFUNC)
-       type = elfcpp::STT_FUNC;
-      this->type_ = type;
-    }
+    this->type_ = sym.get_st_type();
   this->binding_ = sym.get_st_bind();
   this->override_visibility(sym.get_st_visibility());
   this->nonvis_ = sym.get_st_nonvis();