Delete NEWHOWTO and tidy some uses of reloc_howto_struct

[deliverable/binutils-gdb.git] / bfd / reloc.c

diff --git a/bfd/reloc.c b/bfd/reloc.c
index aaf3a801fdd88f073d71e531580727fda7d74f30..ec58a7e4af989baf862a1c8323e2ed5a045654c0 100644 (file)
--- a/bfd/reloc.c
+++ b/bfd/reloc.c
@@ -372,20 +372,12 @@ FUNCTION
        The HOWTO Macro
 
 DESCRIPTION
-       The HOWTO define is horrible and will go away.
+       The HOWTO macro fills in a reloc_howto_type (a typedef for
+       const struct reloc_howto_struct).
 
 .#define HOWTO(C, R, S, B, P, BI, O, SF, NAME, INPLACE, MASKSRC, MASKDST, PC) \
 .  { (unsigned) C, R, S, B, P, BI, O, SF, NAME, INPLACE, MASKSRC, MASKDST, PC }
 
-DESCRIPTION
-       And will be replaced with the totally magic way. But for the
-       moment, we are compatible, so do it this way.
-
-.#define NEWHOWTO(FUNCTION, NAME, SIZE, REL, IN) \
-.  HOWTO (0, 0, SIZE, 0, REL, 0, complain_overflow_dont, FUNCTION, \
-.        NAME, FALSE, 0, 0, IN)
-.
-
 DESCRIPTION
        This is used to fill in an empty howto entry in an array.
 
@@ -393,25 +385,6 @@ DESCRIPTION
 .  HOWTO ((C), 0, 0, 0, FALSE, 0, complain_overflow_dont, NULL, \
 .        NULL, FALSE, 0, 0, FALSE)
 .
-
-DESCRIPTION
-       Helper routine to turn a symbol into a relocation value.
-
-.#define HOWTO_PREPARE(relocation, symbol)             \
-.  {                                                   \
-.    if (symbol != NULL)                               \
-.      {                                               \
-.       if (bfd_is_com_section (symbol->section))      \
-.         {                                            \
-.           relocation = 0;                            \
-.         }                                            \
-.       else                                           \
-.         {                                            \
-.           relocation = symbol->value;                \
-.         }                                            \
-.      }                                               \
-.  }
-.
 */
 
 /*