From: Ian Lance Taylor <ian@airs.com>
Date: Mon, 15 Jan 1996 22:38:22 +0000 (+0000)
Subject: 	* emultempl/sunos.em (gld${EMULATION_NAME}_before_allocation):
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0bc9a7d2fb1ea14761ecb80dd284ed4c5331743d;p=binutils-gdb.git

	* emultempl/sunos.em (gld${EMULATION_NAME}_before_allocation):
	Don't make a shared library because of an undefined reference to
	__GLOBAL_OFFSET_TABLE_.
---

diff --git a/ld/ChangeLog b/ld/ChangeLog
index ee31948ce34..0e6dfa751f6 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,9 @@
 Mon Jan 15 15:07:19 1996  Ian Lance Taylor  <ian@cygnus.com>
 
+	* emultempl/sunos.em (gld${EMULATION_NAME}_before_allocation):
+	Don't make a shared library because of an undefined reference to
+	__GLOBAL_OFFSET_TABLE_.
+
 	Add some Irix 5 support, mostly from Kazumoto Kojima
         <kkojima@info.kanagawa-u.ac.jp>:
 	* emulparams/elf32bmip.sh (SCRIPT_NAME): Change to elfmips.
diff --git a/ld/emultempl/sunos.em b/ld/emultempl/sunos.em
index a2eebc74f55..e1c698398d0 100644
--- a/ld/emultempl/sunos.em
+++ b/ld/emultempl/sunos.em
@@ -617,7 +617,8 @@ gld${EMULATION_NAME}_before_allocation ()
 	  if (h->type == bfd_link_hash_undefined
 	      && h->u.undef.abfd != NULL
 	      && (h->u.undef.abfd->flags & DYNAMIC) == 0
-	      && strcmp (h->root.string, "__DYNAMIC") != 0)
+	      && strcmp (h->root.string, "__DYNAMIC") != 0
+	      && strcmp (h->root.string, "__GLOBAL_OFFSET_TABLE_") != 0)
 	    {
 	      find_assign = h->root.string;
 	      found_assign = false;
@@ -800,7 +801,7 @@ gld${EMULATION_NAME}_find_exp_assignment (exp)
       break;
 
     case etree_trinary:
-      gld${EMULATION_NAME}_find_exp_assignment (exp->trinary.lhs);
+      gld${EMULATION_NAME}_find_exp_assignment (exp->trinary.cond);
       gld${EMULATION_NAME}_find_exp_assignment (exp->trinary.lhs);
       gld${EMULATION_NAME}_find_exp_assignment (exp->trinary.rhs);
       break;