* elf32-ppc.c (ppc_elf_create_dynamic_sections): Correct

[deliverable/binutils-gdb.git] / bfd / nlm32-sparc.c

diff --git a/bfd/nlm32-sparc.c b/bfd/nlm32-sparc.c
index 5094ed0db1d0d30cb407f1c52b52db4df6088067..847220e6b4fb1bdbc6861ed4b3b58cb01afb6250 100644 (file)
--- a/bfd/nlm32-sparc.c
+++ b/bfd/nlm32-sparc.c
@@ -1,5 +1,6 @@
 /* Support for 32-bit SPARC NLM (NetWare Loadable Module)
-   Copyright 1993, 1994, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright 1993, 1994, 2000, 2001, 2002, 2003, 2004
+   Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -33,7 +34,7 @@ static bfd_boolean nlm_sparc_read_reloc
 static bfd_boolean nlm_sparc_write_reloc
   PARAMS ((bfd *, asection *, arelent *));
 static bfd_boolean nlm_sparc_mangle_relocs
-  PARAMS ((bfd *, asection *, PTR, bfd_vma, bfd_size_type));
+  PARAMS ((bfd *, asection *, const PTR, bfd_vma, bfd_size_type));
 static bfd_boolean nlm_sparc_read_import
   PARAMS ((bfd *, nlmNAME(symbol_type) *));
 static bfd_boolean nlm_sparc_write_import
@@ -237,7 +238,7 @@ static bfd_boolean
 nlm_sparc_mangle_relocs (abfd, sec, data, offset, count)
      bfd *abfd ATTRIBUTE_UNUSED;
      asection *sec ATTRIBUTE_UNUSED;
-     PTR data ATTRIBUTE_UNUSED;
+     const PTR data ATTRIBUTE_UNUSED;
      bfd_vma offset ATTRIBUTE_UNUSED;
      bfd_size_type count ATTRIBUTE_UNUSED;
 {
@@ -324,9 +325,9 @@ nlm_sparc_write_import (abfd, sec, rel)
   if (symsec == code)
     base = 0;
   else if (symsec == data)
-    base = bfd_section_size (abfd, code);
+    base = code->size;
   else if (symsec == bss)
-    base = bfd_section_size (abfd, code) + bfd_section_size (abfd, data);
+    base = code->size + data->size;
   else
     base = 0;