* ecoff.h (AUX_GET_ANY, AUX_PUT_ANY): Changed to reflect further

[deliverable/binutils-gdb.git] / include / coff / ecoff.h

diff --git a/include/coff/ecoff.h b/include/coff/ecoff.h
index 362c577b34dc42802b48b5591b21e92e02343806..81bb81895f9cbfc197234b2a9a3da00fa3edaf09 100644 (file)
--- a/include/coff/ecoff.h
+++ b/include/coff/ecoff.h
@@ -181,18 +181,8 @@ union aux_ext {
        unsigned char   a_count[4];
 };
 
-/* FIXME!  These are copied from ../bfd/libbfd.h.  They are used by
-   GDB (mipsread.c).  */
-extern bfd_vma _bfd__do_getb32 PARAMS ((unsigned char *addr));
-extern bfd_vma _bfd__do_getl32 PARAMS ((unsigned char *addr));
-#if 0
-/* These don't seem to be used.  */
-extern void _do_putb32 PARAMS ((bfd_vma data, unsigned char *addr));
-extern void _do_putl32 PARAMS ((bfd_vma data, unsigned char *addr));
-#endif
-
 #define AUX_GET_ANY(bigend, ax, field) \
-  ((bigend) ? _bfd__do_getb32 ((ax)->field) : _bfd__do_getl32 ((ax)->field))
+  ((bigend) ? bfd_getb32 ((ax)->field) : bfd_getl32 ((ax)->field))
 
 #define        AUX_GET_DNLOW(bigend, ax)       AUX_GET_ANY ((bigend), (ax), a_dnLow)
 #define        AUX_GET_DNHIGH(bigend, ax)      AUX_GET_ANY ((bigend), (ax), a_dnHigh)
@@ -201,12 +191,10 @@ extern void _do_putl32 PARAMS ((bfd_vma data, unsigned char *addr));
 #define AUX_GET_WIDTH(bigend, ax)      AUX_GET_ANY ((bigend), (ax), a_width)
 #define AUX_GET_COUNT(bigend, ax)      AUX_GET_ANY ((bigend), (ax), a_count)
 
-#if 0
-/* These don't seem to be used.  */
 #define AUX_PUT_ANY(bigend, val, ax, field) \
   ((bigend) \
-   ? (_do_putb32 ((val), (ax)->field), 0) \
-   : (_do_putl32 ((val), (ax)->field), 0))
+   ? (bfd_putb32 ((val), (ax)->field), 0) \
+   : (bfd_putl32 ((val), (ax)->field), 0))
 
 #define AUX_PUT_DNLOW(bigend, val, ax) \
   AUX_PUT_ANY ((bigend), (val), (ax), a_dnLow)
@@ -220,7 +208,6 @@ extern void _do_putl32 PARAMS ((bfd_vma data, unsigned char *addr));
   AUX_PUT_ANY ((bigend), (val), (ax), a_width)
 #define AUX_PUT_COUNT(bigend, val, ax) \
   AUX_PUT_ANY ((bigend), (val), (ax), a_count)
-#endif
 
 /* Prototypes for the swapping functions.  These require that sym.h be
    included before this file.  */