From: Jeff Law <law@redhat.com>
Date: Mon, 9 Sep 2002 21:31:40 +0000 (+0000)
Subject:         * config/tc-hppa.c (md_apply_fix3): Don't set fx_done for
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=502b19cb2a782d3d866874f4861a635d0706e938;p=binutils-gdb.git

    * config/tc-hppa.c (md_apply_fix3): Don't set fx_done for
        marker relocations such as ENTRY/EXIT.
        * config/tc-hppa.h (MD_APPLY_SYM_VALUE): Definition applies
        to both OBJ_ELF and OBJ_SOM.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 4512f809d08..f8b9d769260 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2002-09-05  Jeff Law  <law@redhat.com>
+
+        * config/tc-hppa.c (md_apply_fix3): Don't set fx_done for
+        marker relocations such as ENTRY/EXIT.
+        * config/tc-hppa.h (MD_APPLY_SYM_VALUE): Definition applies
+        to both OBJ_ELF and OBJ_SOM.
+
 2002-09-05  Alan Modra  <amodra@bigpond.net.au>
 
 	* doc/internals.texi (md_apply_fix3): Expand.
diff --git a/gas/config/tc-hppa.c b/gas/config/tc-hppa.c
index 166b50c0ce9..4f617318b86 100644
--- a/gas/config/tc-hppa.c
+++ b/gas/config/tc-hppa.c
@@ -4419,9 +4419,6 @@ md_apply_fix3 (fixP, valP, seg)
   offsetT new_val;
   int insn, val, fmt;
 
-  if (fixP->fx_addsy == NULL && fixP->fx_pcrel == 0)
-    fixP->fx_done = 1;
-
   /* SOM uses R_HPPA_ENTRY and R_HPPA_EXIT relocations which can
      never be "applied" (they are just markers).  Likewise for
      R_HPPA_BEGIN_BRTAB and R_HPPA_END_BRTAB.  */
@@ -4448,6 +4445,9 @@ md_apply_fix3 (fixP, valP, seg)
     return;
 #endif
 
+  if (fixP->fx_addsy == NULL && fixP->fx_pcrel == 0)
+    fixP->fx_done = 1;
+
   /* There should have been an HPPA specific fixup associated
      with the GAS fixup.  */
   hppa_fixP = (struct hppa_fix_struct *) fixP->tc_fix_data;
diff --git a/gas/config/tc-hppa.h b/gas/config/tc-hppa.h
index aa023465512..ea1ce9cc930 100644
--- a/gas/config/tc-hppa.h
+++ b/gas/config/tc-hppa.h
@@ -161,10 +161,10 @@ int hppa_fix_adjustable PARAMS((struct fix *));
 #define UNDEFINED_DIFFERENCE_OK
 #endif
 
-#ifdef OBJ_ELF
 /* Values passed to md_apply_fix3 don't include the symbol value.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 
+#ifdef OBJ_ELF
 /* Handle .type psuedo.  Given a type string of `millicode', set the
    internal elf symbol type to STT_PARISC_MILLI, and return
    BSF_FUNCTION for the BFD symbol type.  */