Subversion Repositories or1k

/* BFD support for handling relocation entries.

/* BFD support for handling relocation entries.

   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,

   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,

   2000, 2001, 2002

   2000, 2001, 2002

   Free Software Foundation, Inc.

   Free Software Foundation, Inc.

   Written by Cygnus Support.

   Written by Cygnus Support.

This file is part of BFD, the Binary File Descriptor library.

This file is part of BFD, the Binary File Descriptor library.

This program is free software; you can redistribute it and/or modify

This program is free software; you can redistribute it and/or modify

it under the terms of the GNU General Public License as published by

it under the terms of the GNU General Public License as published by

the Free Software Foundation; either version 2 of the License, or

the Free Software Foundation; either version 2 of the License, or

(at your option) any later version.

(at your option) any later version.

This program is distributed in the hope that it will be useful,

This program is distributed in the hope that it will be useful,

but WITHOUT ANY WARRANTY; without even the implied warranty of

but WITHOUT ANY WARRANTY; without even the implied warranty of

MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

GNU General Public License for more details.

GNU General Public License for more details.

You should have received a copy of the GNU General Public License

You should have received a copy of the GNU General Public License

along with this program; if not, write to the Free Software

along with this program; if not, write to the Free Software

Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

/*

/*

SECTION

SECTION

        Relocations

        Relocations

        BFD maintains relocations in much the same way it maintains

        BFD maintains relocations in much the same way it maintains

        symbols: they are left alone until required, then read in

        symbols: they are left alone until required, then read in

        en-masse and translated into an internal form.  A common

        en-masse and translated into an internal form.  A common

        routine <<bfd_perform_relocation>> acts upon the

        routine <<bfd_perform_relocation>> acts upon the

        canonical form to do the fixup.

        canonical form to do the fixup.

        Relocations are maintained on a per section basis,

        Relocations are maintained on a per section basis,

        while symbols are maintained on a per BFD basis.

        while symbols are maintained on a per BFD basis.

        All that a back end has to do to fit the BFD interface is to create

        All that a back end has to do to fit the BFD interface is to create

        a <<struct reloc_cache_entry>> for each relocation

        a <<struct reloc_cache_entry>> for each relocation

        in a particular section, and fill in the right bits of the structures.

        in a particular section, and fill in the right bits of the structures.

@menu

@menu

@* typedef arelent::

@* typedef arelent::

@* howto manager::

@* howto manager::

@end menu

@end menu

*/

*/

/* DO compile in the reloc_code name table from libbfd.h.  */

/* DO compile in the reloc_code name table from libbfd.h.  */

#define _BFD_MAKE_TABLE_bfd_reloc_code_real

#define _BFD_MAKE_TABLE_bfd_reloc_code_real

#include "bfd.h"

#include "bfd.h"

#include "sysdep.h"

#include "sysdep.h"

#include "bfdlink.h"

#include "bfdlink.h"

#include "libbfd.h"

#include "libbfd.h"

/*

/*

DOCDD

DOCDD

INODE

INODE

        typedef arelent, howto manager, Relocations, Relocations

        typedef arelent, howto manager, Relocations, Relocations

SUBSECTION

SUBSECTION

        typedef arelent

        typedef arelent

        This is the structure of a relocation entry:

        This is the structure of a relocation entry:

CODE_FRAGMENT

CODE_FRAGMENT

.

.

.typedef enum bfd_reloc_status

.typedef enum bfd_reloc_status

.{

.{

.  {* No errors detected.  *}

.  {* No errors detected.  *}

.  bfd_reloc_ok,

.  bfd_reloc_ok,

.

.

.  {* The relocation was performed, but there was an overflow.  *}

.  {* The relocation was performed, but there was an overflow.  *}

.  bfd_reloc_overflow,

.  bfd_reloc_overflow,

.

.

.  {* The address to relocate was not within the section supplied.  *}

.  {* The address to relocate was not within the section supplied.  *}

.  bfd_reloc_outofrange,

.  bfd_reloc_outofrange,

.

.

.  {* Used by special functions.  *}

.  {* Used by special functions.  *}

.  bfd_reloc_continue,

.  bfd_reloc_continue,

.

.

.  {* Unsupported relocation size requested.  *}

.  {* Unsupported relocation size requested.  *}

.  bfd_reloc_notsupported,

.  bfd_reloc_notsupported,

.

.

.  {* Unused.  *}

.  {* Unused.  *}

.  bfd_reloc_other,

.  bfd_reloc_other,

.

.

.  {* The symbol to relocate against was undefined.  *}

.  {* The symbol to relocate against was undefined.  *}

.  bfd_reloc_undefined,

.  bfd_reloc_undefined,

.

.

.  {* The relocation was performed, but may not be ok - presently

.  {* The relocation was performed, but may not be ok - presently

.     generated only when linking i960 coff files with i960 b.out

.     generated only when linking i960 coff files with i960 b.out

.     symbols.  If this type is returned, the error_message argument

.     symbols.  If this type is returned, the error_message argument

.     to bfd_perform_relocation will be set.  *}

.     to bfd_perform_relocation will be set.  *}

.  bfd_reloc_dangerous

.  bfd_reloc_dangerous

. }

. }

. bfd_reloc_status_type;

. bfd_reloc_status_type;

.

.

.

.

.typedef struct reloc_cache_entry

.typedef struct reloc_cache_entry

.{

.{

.  {* A pointer into the canonical table of pointers.  *}

.  {* A pointer into the canonical table of pointers.  *}

.  struct symbol_cache_entry **sym_ptr_ptr;

.  struct symbol_cache_entry **sym_ptr_ptr;

.

.

.  {* offset in section.  *}

.  {* offset in section.  *}

.  bfd_size_type address;

.  bfd_size_type address;

.

.

.  {* addend for relocation value.  *}

.  {* addend for relocation value.  *}

.  bfd_vma addend;

.  bfd_vma addend;

.

.

.  {* Pointer to how to perform the required relocation.  *}

.  {* Pointer to how to perform the required relocation.  *}

.  reloc_howto_type *howto;

.  reloc_howto_type *howto;

.

.

.}

.}

.arelent;

.arelent;

.

.

*/

*/

/*

/*

DESCRIPTION

DESCRIPTION

        Here is a description of each of the fields within an <<arelent>>:

        Here is a description of each of the fields within an <<arelent>>:

        o <<sym_ptr_ptr>>

        o <<sym_ptr_ptr>>

        The symbol table pointer points to a pointer to the symbol

        The symbol table pointer points to a pointer to the symbol

        associated with the relocation request.  It is

        associated with the relocation request.  It is

        the pointer into the table returned by the back end's

        the pointer into the table returned by the back end's

        <<get_symtab>> action. @xref{Symbols}. The symbol is referenced

        <<get_symtab>> action. @xref{Symbols}. The symbol is referenced

        through a pointer to a pointer so that tools like the linker

        through a pointer to a pointer so that tools like the linker

        can fix up all the symbols of the same name by modifying only

        can fix up all the symbols of the same name by modifying only

        one pointer. The relocation routine looks in the symbol and

        one pointer. The relocation routine looks in the symbol and

        uses the base of the section the symbol is attached to and the

        uses the base of the section the symbol is attached to and the

        value of the symbol as the initial relocation offset. If the

        value of the symbol as the initial relocation offset. If the

        symbol pointer is zero, then the section provided is looked up.

        symbol pointer is zero, then the section provided is looked up.

        o <<address>>

        o <<address>>

        The <<address>> field gives the offset in bytes from the base of

        The <<address>> field gives the offset in bytes from the base of

        the section data which owns the relocation record to the first

        the section data which owns the relocation record to the first

        byte of relocatable information. The actual data relocated

        byte of relocatable information. The actual data relocated

        will be relative to this point; for example, a relocation

        will be relative to this point; for example, a relocation

        type which modifies the bottom two bytes of a four byte word

        type which modifies the bottom two bytes of a four byte word

        would not touch the first byte pointed to in a big endian

        would not touch the first byte pointed to in a big endian

        world.

        world.

        o <<addend>>

        o <<addend>>

        The <<addend>> is a value provided by the back end to be added (!)

        The <<addend>> is a value provided by the back end to be added (!)

        to the relocation offset. Its interpretation is dependent upon

        to the relocation offset. Its interpretation is dependent upon

        the howto. For example, on the 68k the code:

        the howto. For example, on the 68k the code:

|        char foo[];

|        char foo[];

|        main()

|        main()

|                {

|                {

|                return foo[0x12345678];

|                return foo[0x12345678];

|                }

|                }

        Could be compiled into:

        Could be compiled into:

|        linkw fp,#-4

|        linkw fp,#-4

|        moveb @@#12345678,d0

|        moveb @@#12345678,d0

|        extbl d0

|        extbl d0

|        unlk fp

|        unlk fp

|        rts

|        rts

        This could create a reloc pointing to <<foo>>, but leave the

        This could create a reloc pointing to <<foo>>, but leave the

        offset in the data, something like:

        offset in the data, something like:

|RELOCATION RECORDS FOR [.text]:

|RELOCATION RECORDS FOR [.text]:

|offset   type      value

|offset   type      value

|00000006 32        _foo

|00000006 32        _foo

|

|

|00000000 4e56 fffc          ; linkw fp,#-4

|00000000 4e56 fffc          ; linkw fp,#-4

|00000004 1039 1234 5678     ; moveb @@#12345678,d0

|00000004 1039 1234 5678     ; moveb @@#12345678,d0

|0000000a 49c0               ; extbl d0

|0000000a 49c0               ; extbl d0

|0000000c 4e5e               ; unlk fp

|0000000c 4e5e               ; unlk fp

|0000000e 4e75               ; rts

|0000000e 4e75               ; rts

        Using coff and an 88k, some instructions don't have enough

        Using coff and an 88k, some instructions don't have enough

        space in them to represent the full address range, and

        space in them to represent the full address range, and

        pointers have to be loaded in two parts. So you'd get something like:

        pointers have to be loaded in two parts. So you'd get something like:

|        or.u     r13,r0,hi16(_foo+0x12345678)

|        or.u     r13,r0,hi16(_foo+0x12345678)

|        ld.b     r2,r13,lo16(_foo+0x12345678)

|        ld.b     r2,r13,lo16(_foo+0x12345678)

|        jmp      r1

|        jmp      r1

        This should create two relocs, both pointing to <<_foo>>, and with

        This should create two relocs, both pointing to <<_foo>>, and with

        0x12340000 in their addend field. The data would consist of:

        0x12340000 in their addend field. The data would consist of:

|RELOCATION RECORDS FOR [.text]:

|RELOCATION RECORDS FOR [.text]:

|offset   type      value

|offset   type      value

|00000002 HVRT16    _foo+0x12340000

|00000002 HVRT16    _foo+0x12340000

|00000006 LVRT16    _foo+0x12340000

|00000006 LVRT16    _foo+0x12340000

|

|

|00000000 5da05678           ; or.u r13,r0,0x5678

|00000000 5da05678           ; or.u r13,r0,0x5678

|00000004 1c4d5678           ; ld.b r2,r13,0x5678

|00000004 1c4d5678           ; ld.b r2,r13,0x5678

|00000008 f400c001           ; jmp r1

|00000008 f400c001           ; jmp r1

        The relocation routine digs out the value from the data, adds

        The relocation routine digs out the value from the data, adds

        it to the addend to get the original offset, and then adds the

        it to the addend to get the original offset, and then adds the

        value of <<_foo>>. Note that all 32 bits have to be kept around

        value of <<_foo>>. Note that all 32 bits have to be kept around

        somewhere, to cope with carry from bit 15 to bit 16.

        somewhere, to cope with carry from bit 15 to bit 16.

        One further example is the sparc and the a.out format. The

        One further example is the sparc and the a.out format. The

        sparc has a similar problem to the 88k, in that some

        sparc has a similar problem to the 88k, in that some

        instructions don't have room for an entire offset, but on the

        instructions don't have room for an entire offset, but on the

        sparc the parts are created in odd sized lumps. The designers of

        sparc the parts are created in odd sized lumps. The designers of

        the a.out format chose to not use the data within the section

        the a.out format chose to not use the data within the section

        for storing part of the offset; all the offset is kept within

        for storing part of the offset; all the offset is kept within

        the reloc. Anything in the data should be ignored.

        the reloc. Anything in the data should be ignored.

|        save %sp,-112,%sp

|        save %sp,-112,%sp

|        sethi %hi(_foo+0x12345678),%g2

|        sethi %hi(_foo+0x12345678),%g2

|        ldsb [%g2+%lo(_foo+0x12345678)],%i0

|        ldsb [%g2+%lo(_foo+0x12345678)],%i0

|        ret

|        ret

|        restore

|        restore

        Both relocs contain a pointer to <<foo>>, and the offsets

        Both relocs contain a pointer to <<foo>>, and the offsets

        contain junk.

        contain junk.

|RELOCATION RECORDS FOR [.text]:

|RELOCATION RECORDS FOR [.text]:

|offset   type      value

|offset   type      value

|00000004 HI22      _foo+0x12345678

|00000004 HI22      _foo+0x12345678

|00000008 LO10      _foo+0x12345678

|00000008 LO10      _foo+0x12345678

|

|

|00000000 9de3bf90     ; save %sp,-112,%sp

|00000000 9de3bf90     ; save %sp,-112,%sp

|00000004 05000000     ; sethi %hi(_foo+0),%g2

|00000004 05000000     ; sethi %hi(_foo+0),%g2

|00000008 f048a000     ; ldsb [%g2+%lo(_foo+0)],%i0

|00000008 f048a000     ; ldsb [%g2+%lo(_foo+0)],%i0

|0000000c 81c7e008     ; ret

|0000000c 81c7e008     ; ret

|00000010 81e80000     ; restore

|00000010 81e80000     ; restore

        o <<howto>>

        o <<howto>>

        The <<howto>> field can be imagined as a

        The <<howto>> field can be imagined as a

        relocation instruction. It is a pointer to a structure which

        relocation instruction. It is a pointer to a structure which

        contains information on what to do with all of the other

        contains information on what to do with all of the other

        information in the reloc record and data section. A back end

        information in the reloc record and data section. A back end

        would normally have a relocation instruction set and turn

        would normally have a relocation instruction set and turn

        relocations into pointers to the correct structure on input -

        relocations into pointers to the correct structure on input -

        but it would be possible to create each howto field on demand.

        but it would be possible to create each howto field on demand.

*/

*/

/*

/*

SUBSUBSECTION

SUBSUBSECTION

        <<enum complain_overflow>>

        <<enum complain_overflow>>

        Indicates what sort of overflow checking should be done when

        Indicates what sort of overflow checking should be done when

        performing a relocation.

        performing a relocation.

CODE_FRAGMENT

CODE_FRAGMENT

.

.

.enum complain_overflow

.enum complain_overflow

.{

.{

.  {* Do not complain on overflow.  *}

.  {* Do not complain on overflow.  *}

.  complain_overflow_dont,

.  complain_overflow_dont,

.

.

.  {* Complain if the bitfield overflows, whether it is considered

.  {* Complain if the bitfield overflows, whether it is considered

.     as signed or unsigned.  *}

.     as signed or unsigned.  *}

.  complain_overflow_bitfield,

.  complain_overflow_bitfield,

.

.

.  {* Complain if the value overflows when considered as signed

.  {* Complain if the value overflows when considered as signed

.     number.  *}

.     number.  *}

.  complain_overflow_signed,

.  complain_overflow_signed,

.

.

.  {* Complain if the value overflows when considered as an

.  {* Complain if the value overflows when considered as an

.     unsigned number.  *}

.     unsigned number.  *}

.  complain_overflow_unsigned

.  complain_overflow_unsigned

.};

.};

*/

*/

/*

/*

SUBSUBSECTION

SUBSUBSECTION

        <<reloc_howto_type>>

        <<reloc_howto_type>>

        The <<reloc_howto_type>> is a structure which contains all the

        The <<reloc_howto_type>> is a structure which contains all the

        information that libbfd needs to know to tie up a back end's data.

        information that libbfd needs to know to tie up a back end's data.

CODE_FRAGMENT

CODE_FRAGMENT

.struct symbol_cache_entry;             {* Forward declaration.  *}

.struct symbol_cache_entry;             {* Forward declaration.  *}

.

.

.struct reloc_howto_struct

.struct reloc_howto_struct

.{

.{

.  {*  The type field has mainly a documentary use - the back end can

.  {*  The type field has mainly a documentary use - the back end can

.      do what it wants with it, though normally the back end's

.      do what it wants with it, though normally the back end's

.      external idea of what a reloc number is stored

.      external idea of what a reloc number is stored

.      in this field.  For example, a PC relative word relocation

.      in this field.  For example, a PC relative word relocation

.      in a coff environment has the type 023 - because that's

.      in a coff environment has the type 023 - because that's

.      what the outside world calls a R_PCRWORD reloc.  *}

.      what the outside world calls a R_PCRWORD reloc.  *}

.  unsigned int type;

.  unsigned int type;

.

.

.  {*  The value the final relocation is shifted right by.  This drops

.  {*  The value the final relocation is shifted right by.  This drops

.      unwanted data from the relocation.  *}

.      unwanted data from the relocation.  *}

.  unsigned int rightshift;

.  unsigned int rightshift;

.

.

.  {*  The size of the item to be relocated.  This is *not* a

.  {*  The size of the item to be relocated.  This is *not* a

.      power-of-two measure.  To get the number of bytes operated

.      power-of-two measure.  To get the number of bytes operated

.      on by a type of relocation, use bfd_get_reloc_size.  *}

.      on by a type of relocation, use bfd_get_reloc_size.  *}

.  int size;

.  int size;

.

.

.  {*  The number of bits in the item to be relocated.  This is used

.  {*  The number of bits in the item to be relocated.  This is used

.      when doing overflow checking.  *}

.      when doing overflow checking.  *}

.  unsigned int bitsize;

.  unsigned int bitsize;

.

.

.  {*  Notes that the relocation is relative to the location in the

.  {*  Notes that the relocation is relative to the location in the

.      data section of the addend.  The relocation function will

.      data section of the addend.  The relocation function will

.      subtract from the relocation value the address of the location

.      subtract from the relocation value the address of the location

.      being relocated.  *}

.      being relocated.  *}

.  boolean pc_relative;

.  boolean pc_relative;

.

.

.  {*  The bit position of the reloc value in the destination.

.  {*  The bit position of the reloc value in the destination.

.      The relocated value is left shifted by this amount.  *}

.      The relocated value is left shifted by this amount.  *}

.  unsigned int bitpos;

.  unsigned int bitpos;

.

.

.  {* What type of overflow error should be checked for when

.  {* What type of overflow error should be checked for when

.     relocating.  *}

.     relocating.  *}

.  enum complain_overflow complain_on_overflow;

.  enum complain_overflow complain_on_overflow;

.

.

.  {* If this field is non null, then the supplied function is

.  {* If this field is non null, then the supplied function is

.     called rather than the normal function.  This allows really

.     called rather than the normal function.  This allows really

.     strange relocation methods to be accomodated (e.g., i960 callj

.     strange relocation methods to be accomodated (e.g., i960 callj

.     instructions).  *}

.     instructions).  *}

.  bfd_reloc_status_type (*special_function)

.  bfd_reloc_status_type (*special_function)

.    PARAMS ((bfd *, arelent *, struct symbol_cache_entry *, PTR, asection *,

.    PARAMS ((bfd *, arelent *, struct symbol_cache_entry *, PTR, asection *,

.             bfd *, char **));

.             bfd *, char **));

.

.

.  {* The textual name of the relocation type.  *}

.  {* The textual name of the relocation type.  *}

.  char *name;

.  char *name;

.

.

.  {* Some formats record a relocation addend in the section contents

.  {* Some formats record a relocation addend in the section contents

.     rather than with the relocation.  For ELF formats this is the

.     rather than with the relocation.  For ELF formats this is the

.     distinction between USE_REL and USE_RELA (though the code checks

.     distinction between USE_REL and USE_RELA (though the code checks

.     for USE_REL == 1/0).  The value of this field is TRUE if the

.     for USE_REL == 1/0).  The value of this field is TRUE if the

.     addend is recorded with the section contents; when performing a

.     addend is recorded with the section contents; when performing a

.     partial link (ld -r) the section contents (the data) will be

.     partial link (ld -r) the section contents (the data) will be

.     modified.  The value of this field is FALSE if addends are

.     modified.  The value of this field is FALSE if addends are

.     recorded with the relocation (in arelent.addend); when performing

.     recorded with the relocation (in arelent.addend); when performing

.     a partial link the relocation will be modified.

.     a partial link the relocation will be modified.

.     All relocations for all ELF USE_RELA targets should set this field

.     All relocations for all ELF USE_RELA targets should set this field

.     to FALSE (values of TRUE should be looked on with suspicion).

.     to FALSE (values of TRUE should be looked on with suspicion).

.     However, the converse is not true: not all relocations of all ELF

.     However, the converse is not true: not all relocations of all ELF

.     USE_REL targets set this field to TRUE.  Why this is so is peculiar

.     USE_REL targets set this field to TRUE.  Why this is so is peculiar

.     to each particular target.  For relocs that aren't used in partial

.     to each particular target.  For relocs that aren't used in partial

.     links (e.g. GOT stuff) it doesn't matter what this is set to.  *}

.     links (e.g. GOT stuff) it doesn't matter what this is set to.  *}

.  boolean partial_inplace;

.  boolean partial_inplace;

.

.

.  {* The src_mask selects which parts of the read in data

.  {* The src_mask selects which parts of the read in data

.     are to be used in the relocation sum.  E.g., if this was an 8 bit

.     are to be used in the relocation sum.  E.g., if this was an 8 bit

.     byte of data which we read and relocated, this would be

.     byte of data which we read and relocated, this would be

.     0x000000ff.  When we have relocs which have an addend, such as

.     0x000000ff.  When we have relocs which have an addend, such as

.     sun4 extended relocs, the value in the offset part of a

.     sun4 extended relocs, the value in the offset part of a

.     relocating field is garbage so we never use it.  In this case

.     relocating field is garbage so we never use it.  In this case

.     the mask would be 0x00000000.  *}

.     the mask would be 0x00000000.  *}

.  bfd_vma src_mask;

.  bfd_vma src_mask;

.

.

.  {* The dst_mask selects which parts of the instruction are replaced

.  {* The dst_mask selects which parts of the instruction are replaced

.     into the instruction.  In most cases src_mask == dst_mask,

.     into the instruction.  In most cases src_mask == dst_mask,

.     except in the above special case, where dst_mask would be

.     except in the above special case, where dst_mask would be

.     0x000000ff, and src_mask would be 0x00000000.  *}

.     0x000000ff, and src_mask would be 0x00000000.  *}

.  bfd_vma dst_mask;

.  bfd_vma dst_mask;

.

.

.  {* When some formats create PC relative instructions, they leave

.  {* When some formats create PC relative instructions, they leave

.     the value of the pc of the place being relocated in the offset

.     the value of the pc of the place being relocated in the offset

.     slot of the instruction, so that a PC relative relocation can

.     slot of the instruction, so that a PC relative relocation can

.     be made just by adding in an ordinary offset (e.g., sun3 a.out).

.     be made just by adding in an ordinary offset (e.g., sun3 a.out).

.     Some formats leave the displacement part of an instruction

.     Some formats leave the displacement part of an instruction

.     empty (e.g., m88k bcs); this flag signals the fact.  *}

.     empty (e.g., m88k bcs); this flag signals the fact.  *}

.  boolean pcrel_offset;

.  boolean pcrel_offset;

.};

.};

.

.

*/

*/

/*

/*

FUNCTION

FUNCTION

        The HOWTO Macro

        The HOWTO Macro

DESCRIPTION

DESCRIPTION

        The HOWTO define is horrible and will go away.

        The HOWTO define is horrible and will go away.

.#define HOWTO(C, R, S, B, P, BI, O, SF, NAME, INPLACE, MASKSRC, MASKDST, PC) \

.#define HOWTO(C, R, S, B, P, BI, O, SF, NAME, INPLACE, MASKSRC, MASKDST, PC) \

.  { (unsigned) C, R, S, B, P, BI, O, SF, NAME, INPLACE, MASKSRC, MASKDST, PC }

.  { (unsigned) C, R, S, B, P, BI, O, SF, NAME, INPLACE, MASKSRC, MASKDST, PC }

DESCRIPTION

DESCRIPTION

        And will be replaced with the totally magic way. But for the

        And will be replaced with the totally magic way. But for the

        moment, we are compatible, so do it this way.

        moment, we are compatible, so do it this way.

.#define NEWHOWTO(FUNCTION, NAME, SIZE, REL, IN) \

.#define NEWHOWTO(FUNCTION, NAME, SIZE, REL, IN) \

.  HOWTO (0, 0, SIZE, 0, REL, 0, complain_overflow_dont, FUNCTION, \

.  HOWTO (0, 0, SIZE, 0, REL, 0, complain_overflow_dont, FUNCTION, \

.         NAME, false, 0, 0, IN)

.         NAME, false, 0, 0, IN)

.

.

DESCRIPTION

DESCRIPTION

        This is used to fill in an empty howto entry in an array.

        This is used to fill in an empty howto entry in an array.

.#define EMPTY_HOWTO(C) \

.#define EMPTY_HOWTO(C) \

.  HOWTO ((C), 0, 0, 0, false, 0, complain_overflow_dont, NULL, \

.  HOWTO ((C), 0, 0, 0, false, 0, complain_overflow_dont, NULL, \

.         NULL, false, 0, 0, false)

.         NULL, false, 0, 0, false)

.

.

DESCRIPTION

DESCRIPTION

        Helper routine to turn a symbol into a relocation value.

        Helper routine to turn a symbol into a relocation value.

.#define HOWTO_PREPARE(relocation, symbol)               \

.#define HOWTO_PREPARE(relocation, symbol)               \

.  {                                                     \

.  {                                                     \

.    if (symbol != (asymbol *) NULL)                     \

.    if (symbol != (asymbol *) NULL)                     \

.      {                                                 \

.      {                                                 \

.        if (bfd_is_com_section (symbol->section))       \

.        if (bfd_is_com_section (symbol->section))       \

.          {                                             \

.          {                                             \

.            relocation = 0;                             \

.            relocation = 0;                             \

.          }                                             \

.          }                                             \

.        else                                            \

.        else                                            \

.          {                                             \

.          {                                             \

.            relocation = symbol->value;                 \

.            relocation = symbol->value;                 \

.          }                                             \

.          }                                             \

.      }                                                 \

.      }                                                 \

.  }

.  }

.

.

*/

*/

/*

/*

FUNCTION

FUNCTION

        bfd_get_reloc_size

        bfd_get_reloc_size

SYNOPSIS

SYNOPSIS

        unsigned int bfd_get_reloc_size (reloc_howto_type *);

        unsigned int bfd_get_reloc_size (reloc_howto_type *);

DESCRIPTION

DESCRIPTION

        For a reloc_howto_type that operates on a fixed number of bytes,

        For a reloc_howto_type that operates on a fixed number of bytes,

        this returns the number of bytes operated on.

        this returns the number of bytes operated on.

 */

 */

unsigned int

unsigned int

bfd_get_reloc_size (howto)

bfd_get_reloc_size (howto)

     reloc_howto_type *howto;

     reloc_howto_type *howto;

{

{

  switch (howto->size)

  switch (howto->size)

    {

    {

    case 0: return 1;

    case 0: return 1;

    case 1: return 2;

    case 1: return 2;

    case 2: return 4;

    case 2: return 4;

    case 3: return 0;

    case 3: return 0;

    case 4: return 8;

    case 4: return 8;

    case 8: return 16;

    case 8: return 16;

    case -2: return 4;

    case -2: return 4;

    default: abort ();

    default: abort ();

    }

    }

}

}

/*

/*

TYPEDEF

TYPEDEF

        arelent_chain

        arelent_chain

DESCRIPTION

DESCRIPTION

        How relocs are tied together in an <<asection>>:

        How relocs are tied together in an <<asection>>:

.typedef struct relent_chain

.typedef struct relent_chain

.{

.{

.  arelent relent;

.  arelent relent;

.  struct relent_chain *next;

.  struct relent_chain *next;

.}

.}

.arelent_chain;

.arelent_chain;

.

.

*/

*/

/* N_ONES produces N one bits, without overflowing machine arithmetic.  */

/* N_ONES produces N one bits, without overflowing machine arithmetic.  */

#define N_ONES(n) (((((bfd_vma) 1 << ((n) - 1)) - 1) << 1) | 1)

#define N_ONES(n) (((((bfd_vma) 1 << ((n) - 1)) - 1) << 1) | 1)

/*

/*

FUNCTION

FUNCTION

        bfd_check_overflow

        bfd_check_overflow

SYNOPSIS

SYNOPSIS

        bfd_reloc_status_type

        bfd_reloc_status_type

                bfd_check_overflow

                bfd_check_overflow

                        (enum complain_overflow how,

                        (enum complain_overflow how,

                         unsigned int bitsize,

                         unsigned int bitsize,

                         unsigned int rightshift,

                         unsigned int rightshift,

                         unsigned int addrsize,

                         unsigned int addrsize,

                         bfd_vma relocation);

                         bfd_vma relocation);

DESCRIPTION

DESCRIPTION

        Perform overflow checking on @var{relocation} which has

        Perform overflow checking on @var{relocation} which has

        @var{bitsize} significant bits and will be shifted right by

        @var{bitsize} significant bits and will be shifted right by

        @var{rightshift} bits, on a machine with addresses containing

        @var{rightshift} bits, on a machine with addresses containing

        @var{addrsize} significant bits.  The result is either of

        @var{addrsize} significant bits.  The result is either of

        @code{bfd_reloc_ok} or @code{bfd_reloc_overflow}.

        @code{bfd_reloc_ok} or @code{bfd_reloc_overflow}.

*/

*/

bfd_reloc_status_type

bfd_reloc_status_type

bfd_check_overflow (how, bitsize, rightshift, addrsize, relocation)

bfd_check_overflow (how, bitsize, rightshift, addrsize, relocation)

     enum complain_overflow how;

     enum complain_overflow how;

     unsigned int bitsize;

     unsigned int bitsize;

     unsigned int rightshift;

     unsigned int rightshift;

     unsigned int addrsize;

     unsigned int addrsize;

     bfd_vma relocation;

     bfd_vma relocation;

{

{

  bfd_vma fieldmask, addrmask, signmask, ss, a;

  bfd_vma fieldmask, addrmask, signmask, ss, a;

  bfd_reloc_status_type flag = bfd_reloc_ok;

  bfd_reloc_status_type flag = bfd_reloc_ok;

  a = relocation;

  a = relocation;

  /* Note: BITSIZE should always be <= ADDRSIZE, but in case it's not,

  /* Note: BITSIZE should always be <= ADDRSIZE, but in case it's not,

     we'll be permissive: extra bits in the field mask will

     we'll be permissive: extra bits in the field mask will

     automatically extend the address mask for purposes of the

     automatically extend the address mask for purposes of the

     overflow check.  */

     overflow check.  */

  fieldmask = N_ONES (bitsize);

  fieldmask = N_ONES (bitsize);

  addrmask = N_ONES (addrsize) | fieldmask;

  addrmask = N_ONES (addrsize) | fieldmask;

  switch (how)

  switch (how)

    {

    {

    case complain_overflow_dont:

    case complain_overflow_dont:

      break;

      break;

    case complain_overflow_signed:

    case complain_overflow_signed:

      /* If any sign bits are set, all sign bits must be set.  That

      /* If any sign bits are set, all sign bits must be set.  That

         is, A must be a valid negative address after shifting.  */

         is, A must be a valid negative address after shifting.  */

      a = (a & addrmask) >> rightshift;

      a = (a & addrmask) >> rightshift;

      signmask = ~ (fieldmask >> 1);

      signmask = ~ (fieldmask >> 1);

      ss = a & signmask;

      ss = a & signmask;

      if (ss != 0 && ss != ((addrmask >> rightshift) & signmask))

      if (ss != 0 && ss != ((addrmask >> rightshift) & signmask))

        flag = bfd_reloc_overflow;

        flag = bfd_reloc_overflow;

      break;

      break;

    case complain_overflow_unsigned:

    case complain_overflow_unsigned:

      /* We have an overflow if the address does not fit in the field.  */

      /* We have an overflow if the address does not fit in the field.  */

      a = (a & addrmask) >> rightshift;

      a = (a & addrmask) >> rightshift;

      if ((a & ~ fieldmask) != 0)

      if ((a & ~ fieldmask) != 0)

        flag = bfd_reloc_overflow;

        flag = bfd_reloc_overflow;

      break;

      break;

    case complain_overflow_bitfield:

    case complain_overflow_bitfield:

      /* Bitfields are sometimes signed, sometimes unsigned.  We

      /* Bitfields are sometimes signed, sometimes unsigned.  We

         explicitly allow an address wrap too, which means a bitfield

         explicitly allow an address wrap too, which means a bitfield

         of n bits is allowed to store -2**n to 2**n-1.  Thus overflow

         of n bits is allowed to store -2**n to 2**n-1.  Thus overflow

         if the value has some, but not all, bits set outside the

         if the value has some, but not all, bits set outside the

         field.  */

         field.  */

      a >>= rightshift;

      a >>= rightshift;

      ss = a & ~ fieldmask;

      ss = a & ~ fieldmask;

      if (ss != 0 && ss != (((bfd_vma) -1 >> rightshift) & ~ fieldmask))

      if (ss != 0 && ss != (((bfd_vma) -1 >> rightshift) & ~ fieldmask))

        flag = bfd_reloc_overflow;

        flag = bfd_reloc_overflow;

      break;

      break;

    default:

    default:

      abort ();

      abort ();

    }

    }

  return flag;

  return flag;

}

}

/*

/*

FUNCTION

FUNCTION

        bfd_perform_relocation

        bfd_perform_relocation

SYNOPSIS

SYNOPSIS

        bfd_reloc_status_type

        bfd_reloc_status_type

                bfd_perform_relocation

                bfd_perform_relocation

                        (bfd *abfd,

                        (bfd *abfd,

                         arelent *reloc_entry,

                         arelent *reloc_entry,

                         PTR data,

                         PTR data,

                         asection *input_section,

                         asection *input_section,

                         bfd *output_bfd,

                         bfd *output_bfd,

                         char **error_message);

                         char **error_message);

DESCRIPTION

DESCRIPTION

        If @var{output_bfd} is supplied to this function, the

        If @var{output_bfd} is supplied to this function, the

        generated image will be relocatable; the relocations are

        generated image will be relocatable; the relocations are

        copied to the output file after they have been changed to

        copied to the output file after they have been changed to

        reflect the new state of the world. There are two ways of

        reflect the new state of the world. There are two ways of

        reflecting the results of partial linkage in an output file:

        reflecting the results of partial linkage in an output file:

        by modifying the output data in place, and by modifying the

        by modifying the output data in place, and by modifying the

        relocation record.  Some native formats (e.g., basic a.out and

        relocation record.  Some native formats (e.g., basic a.out and

        basic coff) have no way of specifying an addend in the

        basic coff) have no way of specifying an addend in the

        relocation type, so the addend has to go in the output data.

        relocation type, so the addend has to go in the output data.

        This is no big deal since in these formats the output data

        This is no big deal since in these formats the output data

        slot will always be big enough for the addend. Complex reloc

        slot will always be big enough for the addend. Complex reloc

        types with addends were invented to solve just this problem.

        types with addends were invented to solve just this problem.

        The @var{error_message} argument is set to an error message if

        The @var{error_message} argument is set to an error message if

        this return @code{bfd_reloc_dangerous}.

        this return @code{bfd_reloc_dangerous}.

*/

*/

bfd_reloc_status_type

bfd_reloc_status_type

bfd_perform_relocation (abfd, reloc_entry, data, input_section, output_bfd,

bfd_perform_relocation (abfd, reloc_entry, data, input_section, output_bfd,

                        error_message)

                        error_message)

     bfd *abfd;

     bfd *abfd;

     arelent *reloc_entry;

     arelent *reloc_entry;

     PTR data;

     PTR data;

     asection *input_section;

     asection *input_section;

     bfd *output_bfd;

     bfd *output_bfd;

     char **error_message;

     char **error_message;

{

{

  bfd_vma relocation;

  bfd_vma relocation;

  bfd_reloc_status_type flag = bfd_reloc_ok;

  bfd_reloc_status_type flag = bfd_reloc_ok;

  bfd_size_type octets = reloc_entry->address * bfd_octets_per_byte (abfd);

  bfd_size_type octets = reloc_entry->address * bfd_octets_per_byte (abfd);

  bfd_vma output_base = 0;

  bfd_vma output_base = 0;

  reloc_howto_type *howto = reloc_entry->howto;

  reloc_howto_type *howto = reloc_entry->howto;

  asection *reloc_target_output_section;

  asection *reloc_target_output_section;

  asymbol *symbol;

  asymbol *symbol;

  symbol = *(reloc_entry->sym_ptr_ptr);

  symbol = *(reloc_entry->sym_ptr_ptr);

  if (bfd_is_abs_section (symbol->section)

  if (bfd_is_abs_section (symbol->section)

      && output_bfd != (bfd *) NULL)

      && output_bfd != (bfd *) NULL)

    {

    {

      reloc_entry->address += input_section->output_offset;

      reloc_entry->address += input_section->output_offset;

      return bfd_reloc_ok;

      return bfd_reloc_ok;

    }

    }

  /* If we are not producing relocateable output, return an error if

  /* If we are not producing relocateable output, return an error if

     the symbol is not defined.  An undefined weak symbol is

     the symbol is not defined.  An undefined weak symbol is

     considered to have a value of zero (SVR4 ABI, p. 4-27).  */

     considered to have a value of zero (SVR4 ABI, p. 4-27).  */

  if (bfd_is_und_section (symbol->section)

  if (bfd_is_und_section (symbol->section)

      && (symbol->flags & BSF_WEAK) == 0

      && (symbol->flags & BSF_WEAK) == 0

      && output_bfd == (bfd *) NULL)

      && output_bfd == (bfd *) NULL)

    flag = bfd_reloc_undefined;

    flag = bfd_reloc_undefined;

  /* If there is a function supplied to handle this relocation type,

  /* If there is a function supplied to handle this relocation type,

     call it.  It'll return `bfd_reloc_continue' if further processing

     call it.  It'll return `bfd_reloc_continue' if further processing

     can be done.  */

     can be done.  */

  if (howto->special_function)

  if (howto->special_function)

    {

    {

      bfd_reloc_status_type cont;

      bfd_reloc_status_type cont;

      cont = howto->special_function (abfd, reloc_entry, symbol, data,

      cont = howto->special_function (abfd, reloc_entry, symbol, data,

                                      input_section, output_bfd,

                                      input_section, output_bfd,

                                      error_message);

                                      error_message);

      if (cont != bfd_reloc_continue)

      if (cont != bfd_reloc_continue)

        return cont;

        return cont;

    }

    }

  /* Is the address of the relocation really within the section?  */

  /* Is the address of the relocation really within the section?  */

  if (reloc_entry->address > (input_section->_cooked_size

  if (reloc_entry->address > (input_section->_cooked_size

                              / bfd_octets_per_byte (abfd)))

                              / bfd_octets_per_byte (abfd)))

    return bfd_reloc_outofrange;

    return bfd_reloc_outofrange;

  /* Work out which section the relocation is targetted at and the

  /* Work out which section the relocation is targetted at and the

     initial relocation command value.  */

     initial relocation command value.  */

  /* Get symbol value.  (Common symbols are special.)  */

  /* Get symbol value.  (Common symbols are special.)  */

  if (bfd_is_com_section (symbol->section))

  if (bfd_is_com_section (symbol->section))

    relocation = 0;

    relocation = 0;

  else

  else

    relocation = symbol->value;

    relocation = symbol->value;

  reloc_target_output_section = symbol->section->output_section;

  reloc_target_output_section = symbol->section->output_section;

  /* Convert input-section-relative symbol value to absolute.  */

  /* Convert input-section-relative symbol value to absolute.  */

  if (output_bfd && ! howto->partial_inplace)

  if (output_bfd && ! howto->partial_inplace)

    output_base = 0;

    output_base = 0;

  else

  else

    output_base = reloc_target_output_section->vma;

    output_base = reloc_target_output_section->vma;

  relocation += output_base + symbol->section->output_offset;

  relocation += output_base + symbol->section->output_offset;

  /* Add in supplied addend.  */

  /* Add in supplied addend.  */

  relocation += reloc_entry->addend;

  relocation += reloc_entry->addend;

  /* Here the variable relocation holds the final address of the

  /* Here the variable relocation holds the final address of the

     symbol we are relocating against, plus any addend.  */

     symbol we are relocating against, plus any addend.  */

  if (howto->pc_relative)

  if (howto->pc_relative)

    {

    {

      /* This is a PC relative relocation.  We want to set RELOCATION

      /* This is a PC relative relocation.  We want to set RELOCATION

         to the distance between the address of the symbol and the

         to the distance between the address of the symbol and the

         location.  RELOCATION is already the address of the symbol.

         location.  RELOCATION is already the address of the symbol.

         We start by subtracting the address of the section containing

         We start by subtracting the address of the section containing

         the location.

         the location.

         If pcrel_offset is set, we must further subtract the position

         If pcrel_offset is set, we must further subtract the position

         of the location within the section.  Some targets arrange for

         of the location within the section.  Some targets arrange for

         the addend to be the negative of the position of the location

         the addend to be the negative of the position of the location

         within the section; for example, i386-aout does this.  For

         within the section; for example, i386-aout does this.  For

         i386-aout, pcrel_offset is false.  Some other targets do not

         i386-aout, pcrel_offset is false.  Some other targets do not

         include the position of the location; for example, m88kbcs,

         include the position of the location; for example, m88kbcs,

         or ELF.  For those targets, pcrel_offset is true.

         or ELF.  For those targets, pcrel_offset is true.

         If we are producing relocateable output, then we must ensure

         If we are producing relocateable output, then we must ensure

         that this reloc will be correctly computed when the final

         that this reloc will be correctly computed when the final

         relocation is done.  If pcrel_offset is false we want to wind

         relocation is done.  If pcrel_offset is false we want to wind

         up with the negative of the location within the section,

         up with the negative of the location within the section,

         which means we must adjust the existing addend by the change

         which means we must adjust the existing addend by the change

         in the location within the section.  If pcrel_offset is true

         in the location within the section.  If pcrel_offset is true

         we do not want to adjust the existing addend at all.

         we do not want to adjust the existing addend at all.

         FIXME: This seems logical to me, but for the case of

         FIXME: This seems logical to me, but for the case of

         producing relocateable output it is not what the code

         producing relocateable output it is not what the code

         actually does.  I don't want to change it, because it seems

         actually does.  I don't want to change it, because it seems

         far too likely that something will break.  */

         far too likely that something will break.  */

      relocation -=

      relocation -=

        input_section->output_section->vma + input_section->output_offset;

        input_section->output_section->vma + input_section->output_offset;

      if (howto->pcrel_offset)

      if (howto->pcrel_offset)

        relocation -= reloc_entry->address;

        relocation -= reloc_entry->address;

    }

    }

  if (output_bfd != (bfd *) NULL)

  if (output_bfd != (bfd *) NULL)

    {

    {

      if (! howto->partial_inplace)

      if (! howto->partial_inplace)

        {

        {

          /* This is a partial relocation, and we want to apply the relocation

          /* This is a partial relocation, and we want to apply the relocation

             to the reloc entry rather than the raw data. Modify the reloc

             to the reloc entry rather than the raw data. Modify the reloc

             inplace to reflect what we now know.  */

             inplace to reflect what we now know.  */

          reloc_entry->addend = relocation;

          reloc_entry->addend = relocation;

          reloc_entry->address += input_section->output_offset;

          reloc_entry->address += input_section->output_offset;

          return flag;

          return flag;

        }

        }

      else

      else

        {

        {

          /* This is a partial relocation, but inplace, so modify the

          /* This is a partial relocation, but inplace, so modify the

             reloc record a bit.

             reloc record a bit.

             If we've relocated with a symbol with a section, change

             If we've relocated with a symbol with a section, change

             into a ref to the section belonging to the symbol.  */

             into a ref to the section belonging to the symbol.  */

          reloc_entry->address += input_section->output_offset;

          reloc_entry->address += input_section->output_offset;

          /* WTF?? */

          /* WTF?? */

          if (abfd->xvec->flavour == bfd_target_coff_flavour

          if (abfd->xvec->flavour == bfd_target_coff_flavour

              && strcmp (abfd->xvec->name, "coff-Intel-little") != 0

              && strcmp (abfd->xvec->name, "coff-Intel-little") != 0

              && strcmp (abfd->xvec->name, "coff-Intel-big") != 0)

              && strcmp (abfd->xvec->name, "coff-Intel-big") != 0)

            {

            {

#if 1

#if 1

              /* For m68k-coff, the addend was being subtracted twice during

              /* For m68k-coff, the addend was being subtracted twice during

                 relocation with -r.  Removing the line below this comment

                 relocation with -r.  Removing the line below this comment

                 fixes that problem; see PR 2953.

                 fixes that problem; see PR 2953.

However, Ian wrote the following, regarding removing the line below,

However, Ian wrote the following, regarding removing the line below,

which explains why it is still enabled:  --djm

which explains why it is still enabled:  --djm

If you put a patch like that into BFD you need to check all the COFF

If you put a patch like that into BFD you need to check all the COFF

linkers.  I am fairly certain that patch will break coff-i386 (e.g.,

linkers.  I am fairly certain that patch will break coff-i386 (e.g.,

SCO); see coff_i386_reloc in coff-i386.c where I worked around the

SCO); see coff_i386_reloc in coff-i386.c where I worked around the

problem in a different way.  There may very well be a reason that the

problem in a different way.  There may very well be a reason that the

code works as it does.

code works as it does.

Hmmm.  The first obvious point is that bfd_perform_relocation should

Hmmm.  The first obvious point is that bfd_perform_relocation should

not have any tests that depend upon the flavour.  It's seem like

not have any tests that depend upon the flavour.  It's seem like

entirely the wrong place for such a thing.  The second obvious point

entirely the wrong place for such a thing.  The second obvious point

is that the current code ignores the reloc addend when producing

is that the current code ignores the reloc addend when producing

relocateable output for COFF.  That's peculiar.  In fact, I really

relocateable output for COFF.  That's peculiar.  In fact, I really

have no idea what the point of the line you want to remove is.

have no idea what the point of the line you want to remove is.

A typical COFF reloc subtracts the old value of the symbol and adds in

A typical COFF reloc subtracts the old value of the symbol and adds in

the new value to the location in the object file (if it's a pc

the new value to the location in the object file (if it's a pc

relative reloc it adds the difference between the symbol value and the

relative reloc it adds the difference between the symbol value and the

location).  When relocating we need to preserve that property.

location).  When relocating we need to preserve that property.

BFD handles this by setting the addend to the negative of the old

BFD handles this by setting the addend to the negative of the old

value of the symbol.  Unfortunately it handles common symbols in a

value of the symbol.  Unfortunately it handles common symbols in a

non-standard way (it doesn't subtract the old value) but that's a

non-standard way (it doesn't subtract the old value) but that's a

different story (we can't change it without losing backward

different story (we can't change it without losing backward

compatibility with old object files) (coff-i386 does subtract the old

compatibility with old object files) (coff-i386 does subtract the old

value, to be compatible with existing coff-i386 targets, like SCO).

value, to be compatible with existing coff-i386 targets, like SCO).

So everything works fine when not producing relocateable output.  When

So everything works fine when not producing relocateable output.  When

we are producing relocateable output, logically we should do exactly

we are producing relocateable output, logically we should do exactly

what we do when not producing relocateable output.  Therefore, your

what we do when not producing relocateable output.  Therefore, your

patch is correct.  In fact, it should probably always just set

patch is correct.  In fact, it should probably always just set

reloc_entry->addend to 0 for all cases, since it is, in fact, going to

reloc_entry->addend to 0 for all cases, since it is, in fact, going to

add the value into the object file.  This won't hurt the COFF code,

add the value into the object file.  This won't hurt the COFF code,

which doesn't use the addend; I'm not sure what it will do to other

which doesn't use the addend; I'm not sure what it will do to other

formats (the thing to check for would be whether any formats both use

formats (the thing to check for would be whether any formats both use

the addend and set partial_inplace).

the addend and set partial_inplace).

When I wanted to make coff-i386 produce relocateable output, I ran

When I wanted to make coff-i386 produce relocateable output, I ran

into the problem that you are running into: I wanted to remove that

into the problem that you are running into: I wanted to remove that

line.  Rather than risk it, I made the coff-i386 relocs use a special

line.  Rather than risk it, I made the coff-i386 relocs use a special

function; it's coff_i386_reloc in coff-i386.c.  The function

function; it's coff_i386_reloc in coff-i386.c.  The function

specifically adds the addend field into the object file, knowing that

specifically adds the addend field into the object file, knowing that

bfd_perform_relocation is not going to.  If you remove that line, then

bfd_perform_relocation is not going to.  If you remove that line, then

coff-i386.c will wind up adding the addend field in twice.  It's

coff-i386.c will wind up adding the addend field in twice.  It's

trivial to fix; it just needs to be done.

trivial to fix; it just needs to be done.

The problem with removing the line is just that it may break some

The problem with removing the line is just that it may break some

working code.  With BFD it's hard to be sure of anything.  The right

working code.  With BFD it's hard to be sure of anything.  The right

way to deal with this is simply to build and test at least all the

way to deal with this is simply to build and test at least all the

supported COFF targets.  It should be straightforward if time and disk

supported COFF targets.  It should be straightforward if time and disk

space consuming.  For each target:

space consuming.  For each target:

    1) build the linker

    1) build the linker

    2) generate some executable, and link it using -r (I would

    2) generate some executable, and link it using -r (I would

       probably use paranoia.o and link against newlib/libc.a, which

       probably use paranoia.o and link against newlib/libc.a, which

       for all the supported targets would be available in

       for all the supported targets would be available in

       /usr/cygnus/progressive/H-host/target/lib/libc.a).

       /usr/cygnus/progressive/H-host/target/lib/libc.a).

    3) make the change to reloc.c

    3) make the change to reloc.c

    4) rebuild the linker

    4) rebuild the linker

    5) repeat step 2

    5) repeat step 2

    6) if the resulting object files are the same, you have at least

    6) if the resulting object files are the same, you have at least

       made it no worse

       made it no worse

    7) if they are different you have to figure out which version is

    7) if they are different you have to figure out which version is

       right

       right

*/

*/

              relocation -= reloc_entry->addend;

              relocation -= reloc_entry->addend;

#endif

#endif

              reloc_entry->addend = 0;

              reloc_entry->addend = 0;

            }

            }

          else

          else

            {

            {

              reloc_entry->addend = relocation;

              reloc_entry->addend = relocation;

            }

            }