Merge commit 'upstream/2.20'

[msp430-binutils.git] / bfd / reloc.c

diff --git a/bfd/reloc.c b/bfd/reloc.c
index cb9269b08c0d3c3d14be2297e09b09d0a572529a..3be29fea333d27d1b97a4df1d19acc87a4efc57b 100644 (file)
--- a/bfd/reloc.c
+++ b/bfd/reloc.c
@@ -1,6 +1,6 @@
 /* BFD support for handling relocation entries.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 /* BFD support for handling relocation entries.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,

-   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009

    Free Software Foundation, Inc.
    Written by Cygnus Support.
 
    Free Software Foundation, Inc.
    Written by Cygnus Support.
 


@@ -1734,6 +1734,36 @@ ENUMX
   BFD_RELOC_68K_JMP_SLOT
 ENUMX
   BFD_RELOC_68K_RELATIVE
   BFD_RELOC_68K_JMP_SLOT
 ENUMX
   BFD_RELOC_68K_RELATIVE

+ENUMX
+  BFD_RELOC_68K_TLS_GD32
+ENUMX
+  BFD_RELOC_68K_TLS_GD16
+ENUMX
+  BFD_RELOC_68K_TLS_GD8
+ENUMX
+  BFD_RELOC_68K_TLS_LDM32
+ENUMX
+  BFD_RELOC_68K_TLS_LDM16
+ENUMX
+  BFD_RELOC_68K_TLS_LDM8
+ENUMX
+  BFD_RELOC_68K_TLS_LDO32
+ENUMX
+  BFD_RELOC_68K_TLS_LDO16
+ENUMX
+  BFD_RELOC_68K_TLS_LDO8
+ENUMX
+  BFD_RELOC_68K_TLS_IE32
+ENUMX
+  BFD_RELOC_68K_TLS_IE16
+ENUMX
+  BFD_RELOC_68K_TLS_IE8
+ENUMX
+  BFD_RELOC_68K_TLS_LE32
+ENUMX
+  BFD_RELOC_68K_TLS_LE16
+ENUMX
+  BFD_RELOC_68K_TLS_LE8

 ENUMDOC
   Relocations used by 68K ELF.
 
 ENUMDOC
   Relocations used by 68K ELF.
 


@@ -1830,6 +1860,16 @@ ENUMX
   BFD_RELOC_SPARC_UA32
 ENUMX
   BFD_RELOC_SPARC_UA64
   BFD_RELOC_SPARC_UA32
 ENUMX
   BFD_RELOC_SPARC_UA64

+ENUMX
+  BFD_RELOC_SPARC_GOTDATA_HIX22
+ENUMX
+  BFD_RELOC_SPARC_GOTDATA_LOX10
+ENUMX
+  BFD_RELOC_SPARC_GOTDATA_OP_HIX22
+ENUMX
+  BFD_RELOC_SPARC_GOTDATA_OP_LOX10
+ENUMX
+  BFD_RELOC_SPARC_GOTDATA_OP

 ENUMDOC
   SPARC ELF relocations.  There is probably some overlap with other
   relocation types already defined.
 ENUMDOC
   SPARC ELF relocations.  There is probably some overlap with other
   relocation types already defined.


@@ -1977,6 +2017,8 @@ ENUMX
   BFD_RELOC_SPU_PPU32
 ENUMX
   BFD_RELOC_SPU_PPU64
   BFD_RELOC_SPU_PPU32
 ENUMX
   BFD_RELOC_SPU_PPU64

+ENUMX
+  BFD_RELOC_SPU_ADD_PIC

 ENUMDOC
   SPU Relocations.
 
 ENUMDOC
   SPU Relocations.
 


@@ -2069,6 +2111,30 @@ ENUMDOC
   share a common GP, and the target address is adjusted for
   STO_ALPHA_STD_GPLOAD.
 
   share a common GP, and the target address is adjusted for
   STO_ALPHA_STD_GPLOAD.
 

+ENUM
+  BFD_RELOC_ALPHA_NOP
+ENUMDOC
+  The NOP relocation outputs a NOP if the longword displacement
+     between two procedure entry points is < 2^21.
+
+ENUM
+  BFD_RELOC_ALPHA_BSR
+ENUMDOC
+  The BSR relocation outputs a BSR if the longword displacement
+     between two procedure entry points is < 2^21.
+
+ENUM
+  BFD_RELOC_ALPHA_LDA
+ENUMDOC
+  The LDA relocation outputs a LDA if the longword displacement
+     between two procedure entry points is < 2^16.
+
+ENUM
+  BFD_RELOC_ALPHA_BOH
+ENUMDOC
+  The BOH relocation outputs a BSR if the longword displacement
+     between two procedure entry points is < 2^21, or else a hint.
+

 ENUM
   BFD_RELOC_ALPHA_TLSGD
 ENUMX
 ENUM
   BFD_RELOC_ALPHA_TLSGD
 ENUMX


@@ -2143,6 +2209,13 @@ ENUM
 ENUMDOC
   Low 16 bits of pc-relative value
 
 ENUMDOC
   Low 16 bits of pc-relative value
 

+ENUM
+  BFD_RELOC_MIPS16_GOT16
+ENUMX
+  BFD_RELOC_MIPS16_CALL16
+ENUMDOC
+  Equivalent of BFD_RELOC_MIPS_*, but with the MIPS16 layout of
+     16-bit immediate fields

 ENUM
   BFD_RELOC_MIPS16_HI16
 ENUMDOC
 ENUM
   BFD_RELOC_MIPS16_HI16
 ENUMDOC


@@ -2241,7 +2314,13 @@ ENUM
 ENUMX
   BFD_RELOC_MIPS_JUMP_SLOT
 ENUMDOC
 ENUMX
   BFD_RELOC_MIPS_JUMP_SLOT
 ENUMDOC

-  MIPS ELF relocations (VxWorks extensions).
+  MIPS ELF relocations (VxWorks and PLT extensions).
+COMMENT
+
+ENUM
+  BFD_RELOC_MOXIE_10_PCREL
+ENUMDOC
+  Moxie ELF relocations.

 COMMENT
 
 ENUM
 COMMENT
 
 ENUM


@@ -2361,6 +2440,18 @@ ENUM
   BFD_RELOC_MN10300_RELATIVE
 ENUMDOC
   Adjust by program base.
   BFD_RELOC_MN10300_RELATIVE
 ENUMDOC
   Adjust by program base.

+ENUM
+  BFD_RELOC_MN10300_SYM_DIFF
+ENUMDOC
+  Together with another reloc targeted at the same location,
+  allows for a value that is the difference of two symbols
+  in the same section.
+ENUM
+  BFD_RELOC_MN10300_ALIGN
+ENUMDOC
+  The addend of this reloc is an alignment power that must
+  be honoured at the offset's location, regardless of linker
+  relaxation.

 COMMENT
 
 ENUM
 COMMENT
 
 ENUM


@@ -2409,6 +2500,8 @@ ENUMX
   BFD_RELOC_386_TLS_DESC_CALL
 ENUMX
   BFD_RELOC_386_TLS_DESC
   BFD_RELOC_386_TLS_DESC_CALL
 ENUMX
   BFD_RELOC_386_TLS_DESC

+ENUMX
+  BFD_RELOC_386_IRELATIVE

 ENUMDOC
   i386/elf relocations
 
 ENUMDOC
   i386/elf relocations
 


@@ -2464,6 +2557,8 @@ ENUMX
   BFD_RELOC_X86_64_TLSDESC_CALL
 ENUMX
   BFD_RELOC_X86_64_TLSDESC
   BFD_RELOC_X86_64_TLSDESC_CALL
 ENUMX
   BFD_RELOC_X86_64_TLSDESC

+ENUMX
+  BFD_RELOC_X86_64_IRELATIVE

 ENUMDOC
   x86-64/elf relocations
 
 ENUMDOC
   x86-64/elf relocations
 


@@ -2627,6 +2722,10 @@ ENUMDOC
 
 ENUM
   BFD_RELOC_PPC_TLS
 
 ENUM
   BFD_RELOC_PPC_TLS

+ENUMX
+  BFD_RELOC_PPC_TLSGD
+ENUMX
+  BFD_RELOC_PPC_TLSLD

 ENUMX
   BFD_RELOC_PPC_DTPMOD
 ENUMX
 ENUMX
   BFD_RELOC_PPC_DTPMOD
 ENUMX


@@ -2912,6 +3011,11 @@ ENUMX
 ENUMDOC
   ARM group relocations.
 
 ENUMDOC
   ARM group relocations.
 

+ENUM
+  BFD_RELOC_ARM_V4BX
+ENUMDOC
+  Annotation of BX instructions.
+

 ENUM
   BFD_RELOC_ARM_IMMEDIATE
 ENUMX
 ENUM
   BFD_RELOC_ARM_IMMEDIATE
 ENUMX


@@ -4106,13 +4210,10 @@ ENUMX
 ENUMDOC
   Long displacement extension.
 
 ENUMDOC
   Long displacement extension.
 

-ENUM
-  BFD_RELOC_SCORE_DUMMY1
-ENUMDOC
-  Score relocations

 ENUM
   BFD_RELOC_SCORE_GPREL15
 ENUMDOC
 ENUM
   BFD_RELOC_SCORE_GPREL15
 ENUMDOC

+  Score relocations

   Low 16 bit for load/store  
 ENUM
   BFD_RELOC_SCORE_DUMMY2
   Low 16 bit for load/store  
 ENUM
   BFD_RELOC_SCORE_DUMMY2


@@ -4124,6 +4225,14 @@ ENUM
   BFD_RELOC_SCORE_BRANCH
 ENUMDOC
   This is a 19-bit reloc with the right 1 bit assumed to be 0
   BFD_RELOC_SCORE_BRANCH
 ENUMDOC
   This is a 19-bit reloc with the right 1 bit assumed to be 0

+ENUM
+  BFD_RELOC_SCORE_IMM30
+ENUMDOC
+  This is a 32-bit reloc for 48-bit instructions.
+ENUM
+  BFD_RELOC_SCORE_IMM32
+ENUMDOC
+  This is a 32-bit reloc for 48-bit instructions.

 ENUM
   BFD_RELOC_SCORE16_JMP
 ENUMDOC
 ENUM
   BFD_RELOC_SCORE16_JMP
 ENUMDOC


@@ -4132,6 +4241,10 @@ ENUM
   BFD_RELOC_SCORE16_BRANCH
 ENUMDOC
   This is a 8-bit reloc with the right 1 bit assumed to be 0
   BFD_RELOC_SCORE16_BRANCH
 ENUMDOC
   This is a 8-bit reloc with the right 1 bit assumed to be 0

+ENUM
+  BFD_RELOC_SCORE_BCMP
+ENUMDOC
+   This is a 9-bit reloc with the right 1 bit assumed to be 0

 ENUM
   BFD_RELOC_SCORE_GOT15
 ENUMX
 ENUM
   BFD_RELOC_SCORE_GOT15
 ENUMX


@@ -4570,6 +4683,18 @@ ENUMX
   BFD_RELOC_CR16_DISP24
 ENUMX
   BFD_RELOC_CR16_DISP24a
   BFD_RELOC_CR16_DISP24
 ENUMX
   BFD_RELOC_CR16_DISP24a

+ENUMX
+  BFD_RELOC_CR16_SWITCH8
+ENUMX
+  BFD_RELOC_CR16_SWITCH16
+ENUMX
+  BFD_RELOC_CR16_SWITCH32
+ENUMX
+  BFD_RELOC_CR16_GOT_REGREL20
+ENUMX
+  BFD_RELOC_CR16_GOTC_REGREL20
+ENUMX
+  BFD_RELOC_CR16_GLOB_DAT

 ENUMDOC
   NS CR16 Relocations.
 
 ENUMDOC
   NS CR16 Relocations.
 


@@ -4678,6 +4803,33 @@ ENUM
 ENUMDOC
   32-bit offset to symbol with PLT entry, relative to this relocation.
 
 ENUMDOC
   32-bit offset to symbol with PLT entry, relative to this relocation.
 

+ENUM
+  BFD_RELOC_CRIS_32_GOT_GD
+ENUMX
+  BFD_RELOC_CRIS_16_GOT_GD
+ENUMX
+  BFD_RELOC_CRIS_32_GD
+ENUMX
+  BFD_RELOC_CRIS_DTP
+ENUMX
+  BFD_RELOC_CRIS_32_DTPREL
+ENUMX
+  BFD_RELOC_CRIS_16_DTPREL
+ENUMX
+  BFD_RELOC_CRIS_32_GOT_TPREL
+ENUMX
+  BFD_RELOC_CRIS_16_GOT_TPREL
+ENUMX
+  BFD_RELOC_CRIS_32_TPREL
+ENUMX
+  BFD_RELOC_CRIS_16_TPREL
+ENUMX
+  BFD_RELOC_CRIS_DTPMOD
+ENUMX
+  BFD_RELOC_CRIS_32_IE
+ENUMDOC
+  Relocs used in TLS code for CRIS.
+

 ENUM
   BFD_RELOC_860_COPY
 ENUMX
 ENUM
   BFD_RELOC_860_COPY
 ENUMX


@@ -4975,6 +5127,22 @@ ENUMDOC
   assembler-expanded instructions.  This is commonly used
   internally by the linker after analysis of a
   BFD_RELOC_XTENSA_ASM_EXPAND.
   assembler-expanded instructions.  This is commonly used
   internally by the linker after analysis of a
   BFD_RELOC_XTENSA_ASM_EXPAND.

+ENUM
+  BFD_RELOC_XTENSA_TLSDESC_FN
+ENUMX
+  BFD_RELOC_XTENSA_TLSDESC_ARG
+ENUMX
+  BFD_RELOC_XTENSA_TLS_DTPOFF
+ENUMX
+  BFD_RELOC_XTENSA_TLS_TPOFF
+ENUMX
+  BFD_RELOC_XTENSA_TLS_FUNC
+ENUMX
+  BFD_RELOC_XTENSA_TLS_ARG
+ENUMX
+  BFD_RELOC_XTENSA_TLS_CALL
+ENUMDOC
+  Xtensa TLS relocations.

 
 ENUM
   BFD_RELOC_Z80_DISP8
 
 ENUM
   BFD_RELOC_Z80_DISP8


@@ -4994,6 +5162,105 @@ ENUM
 ENUMDOC
   4 bit value.
 
 ENUMDOC
   4 bit value.
 

+ENUM
+   BFD_RELOC_LM32_CALL
+ENUMX
+   BFD_RELOC_LM32_BRANCH
+ENUMX
+   BFD_RELOC_LM32_16_GOT
+ENUMX
+   BFD_RELOC_LM32_GOTOFF_HI16
+ENUMX
+   BFD_RELOC_LM32_GOTOFF_LO16
+ENUMX
+   BFD_RELOC_LM32_COPY
+ENUMX
+   BFD_RELOC_LM32_GLOB_DAT
+ENUMX
+   BFD_RELOC_LM32_JMP_SLOT
+ENUMX
+   BFD_RELOC_LM32_RELATIVE
+ENUMDOC
+ Lattice Mico32 relocations.
+
+ENUM
+   BFD_RELOC_MACH_O_SECTDIFF
+ENUMDOC
+   Difference between two section addreses.  Must be followed by a
+   BFD_RELOC_MACH_O_PAIR.
+ENUM
+   BFD_RELOC_MACH_O_PAIR
+ENUMDOC
+ Mach-O generic relocations.
+
+ENUM
+  BFD_RELOC_MICROBLAZE_32_LO
+ENUMDOC
+  This is a 32 bit reloc for the microblaze that stores the 
+  low 16 bits of a value
+ENUM
+  BFD_RELOC_MICROBLAZE_32_LO_PCREL
+ENUMDOC
+  This is a 32 bit pc-relative reloc for the microblaze that 
+  stores the low 16 bits of a value
+ENUM
+  BFD_RELOC_MICROBLAZE_32_ROSDA
+ENUMDOC
+  This is a 32 bit reloc for the microblaze that stores a 
+  value relative to the read-only small data area anchor
+ENUM
+  BFD_RELOC_MICROBLAZE_32_RWSDA
+ENUMDOC
+  This is a 32 bit reloc for the microblaze that stores a 
+  value relative to the read-write small data area anchor
+ENUM
+  BFD_RELOC_MICROBLAZE_32_SYM_OP_SYM
+ENUMDOC
+  This is a 32 bit reloc for the microblaze to handle 
+  expressions of the form "Symbol Op Symbol"
+ENUM
+  BFD_RELOC_MICROBLAZE_64_NONE
+ENUMDOC
+  This is a 64 bit reloc that stores the 32 bit pc relative 
+  value in two words (with an imm instruction).  No relocation is 
+  done here - only used for relaxing
+ENUM
+  BFD_RELOC_MICROBLAZE_64_GOTPC
+ENUMDOC
+  This is a 64 bit reloc that stores the 32 bit pc relative 
+  value in two words (with an imm instruction).  The relocation is
+  PC-relative GOT offset
+ENUM
+  BFD_RELOC_MICROBLAZE_64_GOT
+ENUMDOC
+  This is a 64 bit reloc that stores the 32 bit pc relative 
+  value in two words (with an imm instruction).  The relocation is
+  GOT offset
+ENUM
+  BFD_RELOC_MICROBLAZE_64_PLT
+ENUMDOC
+  This is a 64 bit reloc that stores the 32 bit pc relative 
+  value in two words (with an imm instruction).  The relocation is
+  PC-relative offset into PLT
+ENUM
+  BFD_RELOC_MICROBLAZE_64_GOTOFF
+ENUMDOC
+  This is a 64 bit reloc that stores the 32 bit GOT relative 
+  value in two words (with an imm instruction).  The relocation is
+  relative offset from _GLOBAL_OFFSET_TABLE_
+ENUM
+  BFD_RELOC_MICROBLAZE_32_GOTOFF
+ENUMDOC
+  This is a 32 bit reloc that stores the 32 bit GOT relative 
+  value in a word.  The relocation is relative offset from 
+  _GLOBAL_OFFSET_TABLE_
+ENUM
+  BFD_RELOC_MICROBLAZE_COPY
+ENUMDOC
+  This is used to tell the dynamic linker to copy the value out of
+  the dynamic object into the runtime process image.
+
+

 ENDSENUM
   BFD_RELOC_UNUSED
 CODE_FRAGMENT
 ENDSENUM
   BFD_RELOC_UNUSED
 CODE_FRAGMENT


@@ -5114,6 +5381,10 @@ bfd_generic_relax_section (bfd *abfd ATTRIBUTE_UNUSED,
                           struct bfd_link_info *link_info ATTRIBUTE_UNUSED,
                           bfd_boolean *again)
 {
                           struct bfd_link_info *link_info ATTRIBUTE_UNUSED,
                           bfd_boolean *again)
 {

+  if (link_info->relocatable)
+    (*link_info->callbacks->einfo)
+      (_("%P%F: --relax and -r may not be used together\n"));
+

   *again = FALSE;
   return TRUE;
 }
   *again = FALSE;
   return TRUE;
 }


@@ -5204,7 +5475,7 @@ bfd_generic_get_relocated_section_contents (bfd *abfd,
   if (reloc_size == 0)
     return data;
 
   if (reloc_size == 0)
     return data;
 

-  reloc_vector = bfd_malloc (reloc_size);
+  reloc_vector = (arelent **) bfd_malloc (reloc_size);

   if (reloc_vector == NULL)
     return NULL;
 
   if (reloc_vector == NULL)
     return NULL;