fix mistakes in last change

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 70254668564b67c132aac9cc55899a5762d108d3..a8c6ba6626ef99b805b528932aaf8d1b8467dd61 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -5,8 +5,6 @@ Fri Nov  5 10:41:07 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
        section.c, syms.c, targets.c:
        Doc cleanup (spelling, punctuation, grammar, formatting).
        * bfd-in2.h, libbfd.h: Rebuild.
-       * reloc.c (bfd_get_reloc_upper_bound, bfd_canonicalize_reloc,
-       bfd_set_reloc): Moved from bfd.c.
 
 Thu Nov  4 14:46:14 1993  John Gilmore  (gnu@rtl.cygnus.com)
 

diff --git a/bfd/bfd.c b/bfd/bfd.c
index c28b1409e7253f2f856892a1a1ccdc353333b3c0..21588408cf6033b9b44f40b2972934ed71bcf48d 100644 (file)
--- a/bfd/bfd.c
+++ b/bfd/bfd.c
@@ -317,6 +317,102 @@ DEFUN(bfd_perror,(message),
   }
 }
 
+ \f
+/** Symbols */
+
+
+/*
+FUNCTION
+       bfd_get_reloc_upper_bound
+
+SYNOPSIS
+       unsigned int bfd_get_reloc_upper_bound(bfd *abfd, asection *sect);
+
+DESCRIPTION
+       Return the number of bytes required to store the
+       relocation information associated with section @var{sect}
+       attached to bfd @var{abfd}.
+
+*/
+
+
+unsigned int
+DEFUN(bfd_get_reloc_upper_bound,(abfd, asect),
+     bfd *abfd AND
+     sec_ptr asect)
+{
+  if (abfd->format != bfd_object) {
+    bfd_error = invalid_operation;
+    return 0;
+  }
+
+  return BFD_SEND (abfd, _get_reloc_upper_bound, (abfd, asect));
+}
+
+/*
+FUNCTION
+       bfd_canonicalize_reloc
+
+SYNOPSIS
+       unsigned int bfd_canonicalize_reloc
+               (bfd *abfd,
+               asection *sec,
+               arelent **loc,
+               asymbol **syms);
+
+DESCRIPTION
+       Call the back end associated with the open BFD
+       @var{abfd} and translate the external form of the relocation
+       information attached to @var{sec} into the internal canonical
+       form.  Place the table into memory at @var{loc}, which has
+       been preallocated, usually by a call to
+       <<bfd_get_reloc_upper_bound>>.
+
+       The @var{syms} table is also needed for horrible internal magic
+       reasons.
+
+
+*/
+unsigned int
+DEFUN(bfd_canonicalize_reloc,(abfd, asect, location, symbols),
+     bfd *abfd AND
+     sec_ptr asect AND
+     arelent **location AND
+     asymbol **symbols)
+{
+  if (abfd->format != bfd_object) {
+    bfd_error = invalid_operation;
+    return 0;
+  }
+  return BFD_SEND (abfd, _bfd_canonicalize_reloc,
+                  (abfd, asect, location, symbols));
+}
+
+/*
+FUNCTION
+       bfd_set_reloc
+
+SYNOPSIS
+       void bfd_set_reloc
+         (bfd *abfd, asection *sec, arelent **rel, unsigned int count)
+
+DESCRIPTION
+       Set the relocation pointer and count within
+       section @var{sec} to the values @var{rel} and @var{count}.
+       The argument @var{abfd} is ignored.
+
+*/
+/*ARGSUSED*/
+void
+bfd_set_reloc (ignore_abfd, asect, location, count)
+     bfd *ignore_abfd;
+     sec_ptr asect;
+     arelent **location;
+     unsigned int count;
+{
+  asect->orelocation  = location;
+  asect->reloc_count = count;
+}
 
 /*
 FUNCTION

diff --git a/bfd/reloc.c b/bfd/reloc.c
index 9105bebe72e3ae7c61be9562ea6467c979150955..0f05cbe14841e52ea97a369f902966619ec08cf6 100644 (file)
--- a/bfd/reloc.c
+++ b/bfd/reloc.c
@@ -1341,101 +1341,4 @@ DEFUN(bfd_generic_get_relocated_section_contents,(abfd,
   return data;
 
   
-}
-
- \f
-/** Symbols */
-
-
-/*
-FUNCTION
-       bfd_get_reloc_upper_bound
-
-SYNOPSIS
-       unsigned int bfd_get_reloc_upper_bound(bfd *abfd, asection *sect);
-
-DESCRIPTION
-       Return the number of bytes required to store the
-       relocation information associated with section @var{sect}
-       attached to bfd @var{abfd}.
-
-*/
-
-
-unsigned int
-DEFUN(bfd_get_reloc_upper_bound,(abfd, asect),
-     bfd *abfd AND
-     sec_ptr asect)
-{
-  if (abfd->format != bfd_object) {
-    bfd_error = invalid_operation;
-    return 0;
-  }
-
-  return BFD_SEND (abfd, _get_reloc_upper_bound, (abfd, asect));
-}
-
-/*
-FUNCTION
-       bfd_canonicalize_reloc
-
-SYNOPSIS
-       unsigned int bfd_canonicalize_reloc
-               (bfd *abfd,
-               asection *sec,
-               arelent **loc,
-               asymbol **syms);
-
-DESCRIPTION
-       Call the back end associated with the open BFD
-       @var{abfd} and translate the external form of the relocation
-       information attached to @var{sec} into the internal canonical
-       form.  Place the table into memory at @var{loc}, which has
-       been preallocated, usually by a call to
-       <<bfd_get_reloc_upper_bound>>.
-
-       The @var{syms} table is also needed for horrible internal magic
-       reasons.
-
-
-*/
-unsigned int
-DEFUN(bfd_canonicalize_reloc,(abfd, asect, location, symbols),
-     bfd *abfd AND
-     sec_ptr asect AND
-     arelent **location AND
-     asymbol **symbols)
-{
-  if (abfd->format != bfd_object) {
-    bfd_error = invalid_operation;
-    return 0;
-  }
-  return BFD_SEND (abfd, _bfd_canonicalize_reloc,
-                  (abfd, asect, location, symbols));
-}
-
-/*
-FUNCTION
-       bfd_set_reloc
-
-SYNOPSIS
-       void bfd_set_reloc
-         (bfd *abfd, sec_ptr *sec, arelent **rel, unsigned int count)
-
-DESCRIPTION
-       Set the relocation pointer and count within
-       section @var{sec} to the values @var{rel} and @var{count}.
-       The argument @var{abfd} is ignored.
-
-*/
-/*ARGSUSED*/
-void
-bfd_set_reloc (ignore_abfd, asect, location, count)
-     bfd *ignore_abfd;
-     sec_ptr asect;
-     arelent **location;
-     unsigned int count;
-{
-  asect->orelocation  = location;
-  asect->reloc_count = count;
 }