diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2000-09-12 19:13:03 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2000-09-12 19:13:03 +0000 |
| commit | 1b50fce4c0ed748c156af3ac629e50cb5e4d0ef4 (patch) | |
| tree | edee61faabd18b4a5d84e8cdb679d7a8d1fe171f /gnu/usr.bin/binutils/bfd/nlm32-sparc.c | |
| parent | 9f1193e30b5f04af9ea81c644eec79b7b535b890 (diff) | |
Help stupid cvs fixing basic conflicts.
Diffstat (limited to 'gnu/usr.bin/binutils/bfd/nlm32-sparc.c')
| -rw-r--r-- | gnu/usr.bin/binutils/bfd/nlm32-sparc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gnu/usr.bin/binutils/bfd/nlm32-sparc.c b/gnu/usr.bin/binutils/bfd/nlm32-sparc.c index 5963adbc70b..ab4d80aa878 100644 --- a/gnu/usr.bin/binutils/bfd/nlm32-sparc.c +++ b/gnu/usr.bin/binutils/bfd/nlm32-sparc.c @@ -1,5 +1,5 @@ /* Support for 32-bit SPARC NLM (NetWare Loadable Module) - Copyright (C) 1993 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 1995, 1999 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -118,7 +118,7 @@ struct nlm32_sparc_reloc_ext { static boolean nlm_sparc_read_reloc (abfd, sym, secp, rel) bfd *abfd; - nlmNAME(symbol_type) *sym; + nlmNAME(symbol_type) *sym ATTRIBUTE_UNUSED; asection **secp; arelent *rel; { @@ -232,11 +232,11 @@ nlm_sparc_write_reloc (abfd, sec, rel) static boolean nlm_sparc_mangle_relocs (abfd, sec, data, offset, count) - bfd *abfd; - asection *sec; - PTR data; - bfd_vma offset; - bfd_size_type count; + bfd *abfd ATTRIBUTE_UNUSED; + asection *sec ATTRIBUTE_UNUSED; + PTR data ATTRIBUTE_UNUSED; + bfd_vma offset ATTRIBUTE_UNUSED; + bfd_size_type count ATTRIBUTE_UNUSED; { return true; } |