From 5d42dfb5b9bcd69c495591430e21834c277826b4 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 4 Feb 2013 05:25:41 +0000 Subject: [PATCH] include/coff/ * ti.h (SWAP_OUT_RELOC_EXTRA): Define. bfd/ * coff-tic54x.c (SWAP_OUT_RELOC_EXTRA): Delete. * coff-tic80.c (SWAP_OUT_RELOC_EXTRA): Delete. --- bfd/ChangeLog | 5 +++++ bfd/coff-tic54x.c | 9 --------- bfd/coff-tic80.c | 9 --------- include/coff/ChangeLog | 4 ++++ include/coff/ti.h | 3 +++ 5 files changed, 12 insertions(+), 18 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 7614ca0b192..97ee2439f5f 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2013-02-04 Alan Modra + + * coff-tic54x.c (SWAP_OUT_RELOC_EXTRA): Delete. + * coff-tic80.c (SWAP_OUT_RELOC_EXTRA): Delete. + 2013-02-01 Alan Modra * elf64-ppc.c (dec_dynrel_count): Don't error when elf_gc_sweep_symbol diff --git a/bfd/coff-tic54x.c b/bfd/coff-tic54x.c index 9afba422703..8efdc20402c 100644 --- a/bfd/coff-tic54x.c +++ b/bfd/coff-tic54x.c @@ -323,15 +323,6 @@ ticoff_bfd_is_local_label_name (bfd *abfd ATTRIBUTE_UNUSED, #define coff_bfd_is_local_label_name ticoff_bfd_is_local_label_name -/* Clear the r_reserved field in relocs. */ -#define SWAP_OUT_RELOC_EXTRA(abfd,src,dst) \ - do \ - { \ - dst->r_reserved[0] = 0; \ - dst->r_reserved[1] = 0; \ - } \ - while (0) - /* Customize coffcode.h; the default coff_ functions are set up to use COFF2; coff_bad_format_hook uses BADMAG, so set that for COFF2. The COFF1 and COFF0 vectors use custom _bad_format_hook procs instead of setting diff --git a/bfd/coff-tic80.c b/bfd/coff-tic80.c index 22d4e947b10..c8fa5c06748 100644 --- a/bfd/coff-tic80.c +++ b/bfd/coff-tic80.c @@ -700,15 +700,6 @@ coff_tic80_relocate_section (bfd *output_bfd, return TRUE; } -/* Clear the r_reserved field in relocs. */ -#define SWAP_OUT_RELOC_EXTRA(abfd,src,dst) \ - do \ - { \ - dst->r_reserved[0] = 0; \ - dst->r_reserved[1] = 0; \ - } \ - while (0) - #define TIC80COFF 1 /* Customize coffcode.h */ #undef C_AUTOARG /* Clashes with TIc80's C_UEXT */ #undef C_LASTENT /* Clashes with TIc80's C_STATLAB */ diff --git a/include/coff/ChangeLog b/include/coff/ChangeLog index 11437dd8118..3311d4eadfb 100644 --- a/include/coff/ChangeLog +++ b/include/coff/ChangeLog @@ -1,3 +1,7 @@ +2013-02-04 Alan Modra + + * ti.h (SWAP_OUT_RELOC_EXTRA): Define. + 2013-01-02 Martin Storsjo * arm.h (ARMV7PEMAGIC): Define. diff --git a/include/coff/ti.h b/include/coff/ti.h index 61010a21086..d54b2ed1918 100644 --- a/include/coff/ti.h +++ b/include/coff/ti.h @@ -546,6 +546,9 @@ struct external_reloc #define RELSZ_V0 10 /* FIXME -- coffcode.h needs fixing */ #define RELSZ 12 /* for COFF1/2 */ +#define SWAP_OUT_RELOC_EXTRA(abfd, src, dst) \ + do memset (dst->r_reserved, 0, sizeof (dst->r_reserved)); while (0) + /* various relocation types. */ #define R_ABS 0x0000 /* no relocation */ #define R_REL13 0x002A /* 13-bit direct reference (???) */ -- 2.30.2