From 8ba8a4628fe907f4f8a622b24917b351fb737f5a Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 2 Mar 2000 01:38:33 +0000 Subject: [PATCH] 2000-03-01 Hans-Peter Nilsson * aout-target.h (MY(write_object_contents)): Remove unused and unusable "#if CHOOSE_RELOC_SIZE". * pc532-mach.c (MY(write_object_contents)): Ditto. * netbsd.h (MY(write_object_contents)): Ditto. * hp300hpux.c (MY(write_object_contents)): Ditto. * freebsd.h (MY(write_object_contents)): Ditto. * aout-tic30.c (tic30_aout_write_object_contents): Ditto. --- bfd/ChangeLog | 10 ++++++++++ bfd/aout-target.h | 6 +----- bfd/aout-tic30.c | 7 ++----- bfd/freebsd.h | 6 +----- bfd/hp300hpux.c | 7 ++----- bfd/netbsd.h | 6 +----- bfd/pc532-mach.c | 6 +----- 7 files changed, 18 insertions(+), 30 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 640362fd56..9bdb4c3506 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,13 @@ +2000-03-01 Hans-Peter Nilsson + + * aout-target.h (MY(write_object_contents)): Remove unused + and unusable "#if CHOOSE_RELOC_SIZE". + * pc532-mach.c (MY(write_object_contents)): Ditto. + * netbsd.h (MY(write_object_contents)): Ditto. + * hp300hpux.c (MY(write_object_contents)): Ditto. + * freebsd.h (MY(write_object_contents)): Ditto. + * aout-tic30.c (tic30_aout_write_object_contents): Ditto. + 2000-02-29 H.J. Lu * peicode.h (jtab): Make it static. diff --git a/bfd/aout-target.h b/bfd/aout-target.h index 5ca50ac568..046417bb95 100644 --- a/bfd/aout-target.h +++ b/bfd/aout-target.h @@ -1,5 +1,5 @@ /* Define a target vector and some small routines for a variant of a.out. - Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97, 98, 1999 + Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -258,11 +258,7 @@ MY(write_object_contents) (abfd) struct external_exec exec_bytes; struct internal_exec *execp = exec_hdr (abfd); -#if CHOOSE_RELOC_SIZE - CHOOSE_RELOC_SIZE(abfd); -#else obj_reloc_entry_size (abfd) = RELOC_STD_SIZE; -#endif WRITE_HEADERS(abfd, execp); diff --git a/bfd/aout-tic30.c b/bfd/aout-tic30.c index 0dcae0c25b..686c15942f 100644 --- a/bfd/aout-tic30.c +++ b/bfd/aout-tic30.c @@ -1,5 +1,5 @@ /* BFD back-end for TMS320C30 a.out binaries. - Copyright (C) 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. Contributed by Steven Haworth (steve@pm.cse.rmit.edu.au) This file is part of BFD, the Binary File Descriptor library. @@ -610,11 +610,8 @@ tic30_aout_write_object_contents (abfd) struct external_exec exec_bytes; struct internal_exec *execp = exec_hdr (abfd); -#if CHOOSE_RELOC_SIZE - CHOOSE_RELOC_SIZE (abfd); -#else obj_reloc_entry_size (abfd) = RELOC_STD_SIZE; -#endif + { bfd_size_type text_size; /* dummy vars */ file_ptr text_end; diff --git a/bfd/freebsd.h b/bfd/freebsd.h index 8bb19acd7d..e80c213b28 100644 --- a/bfd/freebsd.h +++ b/bfd/freebsd.h @@ -1,5 +1,5 @@ /* BFD back-end definitions used by all FreeBSD targets. - Copyright (C) 1990, 1991, 1992, 1996 Free Software Foundation, Inc. + Copyright (C) 1990, 1991, 1992, 1996, 2000 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -76,11 +76,7 @@ MY(write_object_contents) (abfd) struct external_exec exec_bytes; struct internal_exec *execp = exec_hdr (abfd); -#if CHOOSE_RELOC_SIZE - CHOOSE_RELOC_SIZE(abfd); -#else obj_reloc_entry_size (abfd) = RELOC_STD_SIZE; -#endif /* Magic number, maestro, please! */ switch (bfd_get_arch(abfd)) { diff --git a/bfd/hp300hpux.c b/bfd/hp300hpux.c index 0772d4f01c..46bfea054c 100644 --- a/bfd/hp300hpux.c +++ b/bfd/hp300hpux.c @@ -1,5 +1,5 @@ /* BFD backend for hp-ux 9000/300 - Copyright (C) 1990, 91, 94, 95, 97, 1999 Free Software Foundation, Inc. + Copyright (C) 1990, 91, 94, 95, 97, 99, 2000 Free Software Foundation, Inc. Written by Glenn Engel. This file is part of BFD, the Binary File Descriptor library. @@ -270,11 +270,8 @@ MY (write_object_contents) (abfd) file_ptr text_end; memset (&exec_bytes, 0, sizeof (exec_bytes)); -#if CHOOSE_RELOC_SIZE - CHOOSE_RELOC_SIZE (abfd); -#else + obj_reloc_entry_size (abfd) = RELOC_STD_SIZE; -#endif if (adata (abfd).magic == undecided_magic) NAME (aout,adjust_sizes_and_vmas) (abfd, &text_size, &text_end); diff --git a/bfd/netbsd.h b/bfd/netbsd.h index a5482f0431..760ed9508e 100644 --- a/bfd/netbsd.h +++ b/bfd/netbsd.h @@ -1,5 +1,5 @@ /* BFD back-end definitions used by all NetBSD targets. - Copyright (C) 1990, 91, 92, 94, 95, 96, 97, 1998 + Copyright (C) 1990, 91, 92, 94, 95, 96, 97, 98, 2000 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -91,11 +91,7 @@ MY(write_object_contents) (abfd) NAME(aout,adjust_sizes_and_vmas) (abfd, &text_size, &text_end); } -#if CHOOSE_RELOC_SIZE - CHOOSE_RELOC_SIZE(abfd); -#else obj_reloc_entry_size (abfd) = RELOC_STD_SIZE; -#endif /* Magic number, maestro, please! */ switch (bfd_get_arch(abfd)) { diff --git a/bfd/pc532-mach.c b/bfd/pc532-mach.c index 73f4ac49e8..3b77d5dab1 100644 --- a/bfd/pc532-mach.c +++ b/bfd/pc532-mach.c @@ -1,5 +1,5 @@ /* BFD back-end for Mach3/532 a.out-ish binaries. - Copyright (C) 1990, 1991, 1992, 1994 Free Software Foundation, Inc. + Copyright (C) 1990, 1991, 1992, 1994, 2000 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -92,11 +92,7 @@ bfd *abfd; struct external_exec exec_bytes; struct internal_exec *execp = exec_hdr (abfd); -#if CHOOSE_RELOC_SIZE - CHOOSE_RELOC_SIZE(abfd); -#else obj_reloc_entry_size (abfd) = RELOC_STD_SIZE; -#endif BFD_ASSERT (bfd_get_arch (abfd) == bfd_arch_ns32k); switch (bfd_get_mach (abfd))