From: H.J. Lu <hjl@lucon.org>
Date: Sun, 8 Dec 2002 21:25:38 +0000 (+0000)
Subject: 2002-12-08  H.J. Lu <hjl@gnu.org>
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7b295edc4626b81ecc96759c335f84c46740509f;p=pf3gnuchains%2Fpf3gnuchains3x.git

2002-12-08  H.J. Lu <hjl@gnu.org>

	* config/tc-ia64.c (md_apply_fix3): Remove the PCREL hack
	copied from tc-i386.c.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index da08b6f526..0d33206f6c 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-08  H.J. Lu <hjl@gnu.org>
+
+	* config/tc-ia64.c (md_apply_fix3): Remove the PCREL hack
+	copied from tc-i386.c.
+
 2002-12-08  Stephane Carrez  <stcarrez@nerim.fr>
 
 	Fix Bug savannah/1825:
diff --git a/gas/config/tc-ia64.c b/gas/config/tc-ia64.c
index 1feedf5637..40f6f695ab 100644
--- a/gas/config/tc-ia64.c
+++ b/gas/config/tc-ia64.c
@@ -10414,7 +10414,6 @@ md_apply_fix3 (fix, valP, seg)
 {
   char *fixpos;
   valueT value = *valP;
-  int adjust = 0;
 
   fixpos = fix->fx_frag->fr_literal + fix->fx_where;
 
@@ -10424,22 +10423,18 @@ md_apply_fix3 (fix, valP, seg)
 	{
 	case BFD_RELOC_IA64_DIR32MSB:
 	  fix->fx_r_type = BFD_RELOC_IA64_PCREL32MSB;
-	  adjust = 1;
 	  break;
 
 	case BFD_RELOC_IA64_DIR32LSB:
 	  fix->fx_r_type = BFD_RELOC_IA64_PCREL32LSB;
-	  adjust = 1;
 	  break;
 
 	case BFD_RELOC_IA64_DIR64MSB:
 	  fix->fx_r_type = BFD_RELOC_IA64_PCREL64MSB;
-	  adjust = 1;
 	  break;
 
 	case BFD_RELOC_IA64_DIR64LSB:
 	  fix->fx_r_type = BFD_RELOC_IA64_PCREL64LSB;
-	  adjust = 1;
 	  break;
 
 	default:
@@ -10474,11 +10469,6 @@ md_apply_fix3 (fix, valP, seg)
 	default:
 	  break;
 	}
-
-      /* ??? This is a hack copied from tc-i386.c to make PCREL relocs
-	 work.  There should be a better way to handle this.  */
-      if (adjust)
-	fix->fx_offset += fix->fx_where + fix->fx_frag->fr_address;
     }
   else if (fix->tc_fix_data.opnd == IA64_OPND_NIL)
     {