From 4c5193b7db75e1576d1da1ea8b5dfff29054e75e Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@airs.com>
Date: Thu, 11 Mar 2010 01:18:26 +0000
Subject: [PATCH] Adjust last patch--same ChangeLog entry, same e-mail.

---
 gold/i386.cc   | 1 -
 gold/target.cc | 7 +++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/gold/i386.cc b/gold/i386.cc
index 822cc7c3412..1776383249f 100644
--- a/gold/i386.cc
+++ b/gold/i386.cc
@@ -2788,7 +2788,6 @@ bool
 Target_i386::do_is_call_to_non_split(const Symbol* sym, unsigned int) const
 {
   return (sym->type() == elfcpp::STT_FUNC
-	  && !this->is_defined_by_abi(sym)
 	  && !is_prefix_of("__i686.get_pc_thunk.", sym->name()));
 }
 
diff --git a/gold/target.cc b/gold/target.cc
index e774f63cea3..776c50afbc2 100644
--- a/gold/target.cc
+++ b/gold/target.cc
@@ -145,14 +145,13 @@ Target::do_make_output_section(const char* name, elfcpp::Elf_Word type,
   return new Output_section(name, type, flags);
 }
 
-// Default for whether a reloc is a call to a non-split function is if
-// the symbol is a function not defined by the ABI.
+// Default for whether a reloc is a call to a non-split function is
+// whether the symbol is a function.
 
 bool
 Target::do_is_call_to_non_split(const Symbol* sym, unsigned int) const
 {
-  return (sym->type() == elfcpp::STT_FUNC
-	  && !this->is_defined_by_abi(sym));
+  return sym->type() == elfcpp::STT_FUNC;
 }
 
 // Default conversion for -fsplit-stack is to give an error.
-- 
2.30.2