From 2902c34e51bbb82181104caf213cdf99af1cd8de Mon Sep 17 00:00:00 2001
From: David Daney <ddaney@avtrex.com>
Date: Mon, 18 Jun 2007 19:35:05 +0000
Subject: [PATCH] revert: re PR target/32313 (Bootstrap failure running
 gengtype in stage 2.)

	Revert:

	2007-06-18  David Daney  <ddaney@avtrex.com

	PR target/32313
	* config/mips/mips.c (mips_expand_call): Mark $gp as used by
	local function call.

From-SVN: r125824
---
 gcc/ChangeLog          | 10 ++++++++++
 gcc/config/mips/mips.c |  9 ++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 915643a11ac..191d3474eb2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2007-06-18  David Daney  <ddaney@avtrex.com
+
+	Revert:
+
+	2007-06-18  David Daney  <ddaney@avtrex.com
+
+	PR target/32313
+	* config/mips/mips.c (mips_expand_call): Mark $gp as used by
+	local function call.
+
 2007-06-18  David Daney  <ddaney@avtrex.com
 
 	PR target/32313
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index 287c5313cf2..a132f0ff4c9 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -3562,13 +3562,8 @@ mips_expand_call (rtx result, rtx addr, rtx args_size, rtx aux, int sibcall_p)
 
   insn = emit_call_insn (pattern);
 
-  /* Lazy-binding stubs require $gp to be valid on entry.  So does the
-     case of calling a local function with TARGET_ABICALLS and
-     -mno-shared (a.k.a. TARGET_ABSOLUTE_ABICALLS). */
-  if (mips_ok_for_lazy_binding_p (orig_addr)
-      || (TARGET_ABSOLUTE_ABICALLS
-          && (GET_CODE (orig_addr) == SYMBOL_REF)
-          && targetm.binds_local_p (SYMBOL_REF_DECL (orig_addr))))
+  /* Lazy-binding stubs require $gp to be valid on entry.  */
+  if (mips_ok_for_lazy_binding_p (orig_addr))
     use_reg (&CALL_INSN_FUNCTION_USAGE (insn), pic_offset_table_rtx);
 }
 
-- 
2.30.2