public inbox for archer-commits@sourceware.org
help / color / mirror / Atom feed
* [SCM]  master: bfd/  From Mike Frysinger <michael.frysinger@analog.com>  * elf32-bfin.c (bfin_howto_table, bfin_reloc_map, bfin_check_relocs,  bfin_final_link_relocate, bfin_relocate_section, bfin_gc_sweep_hook,  _bfinfdpic_emit_got_relocs_plt_entries, bfinfdpic_relocate_section,  bfinfdpic_gc_sweep_hook, bfinfdpic_check_relocs,  bfin_finish_dynamic_symbol, bfd_bfin_elf32_create_embedded_relocs):  Adjust to match the renamed reloc definitions.
@ 2009-08-09 22:25 jkratoch
  0 siblings, 0 replies; only message in thread
From: jkratoch @ 2009-08-09 22:25 UTC (permalink / raw)
  To: archer-commits

The branch, master has been updated
       via  f80adbadde1c393245886ba552e52db127c960f3 (commit)
       via  64e9019a85a8d0dc0e5fe2beed6abeb1da67dbed (commit)
       via  1d5318dc45855f473ad33e4bafa8bf2effb25ccb (commit)
       via  57cf4a5f772468936aff9ebb62e4e397989baf12 (commit)
       via  1d349d49a76c08f6a5186518fc6a988a1c2519c9 (commit)
       via  4a1ddb7af6265b14166560a5a8780cac38fe5714 (commit)
       via  86866f8195e3bf342978b7c2440f012ad9a85bc4 (commit)
       via  23d99e586244496a9997a0882e3905eda4524050 (commit)
       via  add11f5965470355efd26795cb71bb32ad8b8fc0 (commit)
       via  72d61d7ad7cbec581e39e01789ccb101ba1ff458 (commit)
       via  a096cf45b9b40cdf83bd7ce681ab65183a788fcf (commit)
      from  b5990caf2ba1cba165ebf6d57e09f5284aef53f6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 bfd/ChangeLog                      |   16 +++
 bfd/elf.c                          |   19 +---
 bfd/elf32-bfin.c                   |  200 ++++++++++++++++++------------------
 bfd/version.h                      |    2 +-
 gdb/ChangeLog                      |   40 +++++++
 gdb/bfd-target.c                   |   44 ++++++---
 gdb/cli/cli-decode.c               |   54 +++++++---
 gdb/command.h                      |  128 ++++++++++++-----------
 gdb/language.c                     |  133 ++++++++++++++++++------
 gdb/record.c                       |    1 -
 gdb/testsuite/ChangeLog            |    5 +
 gdb/testsuite/gdb.base/setshow.exp |   15 +++
 gdb/version.in                     |    2 +-
 include/elf/ChangeLog              |   28 +++++
 include/elf/bfin.h                 |   88 ++++++++--------
 include/elf/common.h               |   64 ++++++++++--
 16 files changed, 542 insertions(+), 297 deletions(-)

First 500 lines of diff:
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e7d0e94..9ba413c 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,19 @@
+2006-08-09  Bernd Schmidt  <bernd.schmidt@analog.com>
+
+	From Mike Frysinger <michael.frysinger@analog.com>
+	* elf32-bfin.c (bfin_howto_table, bfin_reloc_map, bfin_check_relocs,
+	bfin_final_link_relocate, bfin_relocate_section, bfin_gc_sweep_hook,
+	_bfinfdpic_emit_got_relocs_plt_entries, bfinfdpic_relocate_section,
+	bfinfdpic_gc_sweep_hook, bfinfdpic_check_relocs,
+	bfin_finish_dynamic_symbol, bfd_bfin_elf32_create_embedded_relocs):
+	Adjust to match the renamed reloc definitions.
+	
+2009-08-08  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 10494
+	* elf.c (_bfd_elf_make_section_from_shdr): When setting up section
+	LMAs, use ELF_IS_SECTION_IN_SEGMENT to match sections with headers.
+
 2009-08-07  Tom Tromey  <tromey@redhat.com>
 
 	* elf32-microblaze.c (microblaze_elf_check_relocs): Avoid strict
diff --git a/bfd/elf.c b/bfd/elf.c
index 85829ec..408cebd 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -971,25 +971,8 @@ _bfd_elf_make_section_from_shdr (bfd *abfd,
       phdr = elf_tdata (abfd)->phdr;
       for (i = 0; i < elf_elfheader (abfd)->e_phnum; i++, phdr++)
 	{
-	  /* This section is part of this segment if its file
-	     offset plus size lies within the segment's memory
-	     span and, if the section is loaded, the extent of the
-	     loaded data lies within the extent of the segment.
-
-	     Note - we used to check the p_paddr field as well, and
-	     refuse to set the LMA if it was 0.  This is wrong
-	     though, as a perfectly valid initialised segment can
-	     have a p_paddr of zero.  Some architectures, eg ARM,
-	     place special significance on the address 0 and
-	     executables need to be able to have a segment which
-	     covers this address.  */
 	  if (phdr->p_type == PT_LOAD
-	      && (bfd_vma) hdr->sh_offset >= phdr->p_offset
-	      && (hdr->sh_offset + hdr->sh_size
-		  <= phdr->p_offset + phdr->p_memsz)
-	      && ((flags & SEC_LOAD) == 0
-		  || (hdr->sh_offset + hdr->sh_size
-		      <= phdr->p_offset + phdr->p_filesz)))
+	      && ELF_IS_SECTION_IN_SEGMENT (hdr, phdr))
 	    {
 	      if ((flags & SEC_LOAD) == 0)
 		newsect->lma = (phdr->p_paddr
diff --git a/bfd/elf32-bfin.c b/bfd/elf32-bfin.c
index a0947b6..3752d52 100644
--- a/bfd/elf32-bfin.c
+++ b/bfd/elf32-bfin.c
@@ -421,7 +421,7 @@ bfin_bfd_reloc (bfd *abfd,
 static reloc_howto_type bfin_howto_table [] =
 {
   /* This reloc does nothing. .  */
-  HOWTO (R_unused0,		/* type.  */
+  HOWTO (R_BFIN_UNUSED0,	/* type.  */
 	 0,			/* rightshift.  */
 	 2,			/* size (0 = byte, 1 = short, 2 = long).  */
 	 32,			/* bitsize.  */
@@ -429,13 +429,13 @@ static reloc_howto_type bfin_howto_table [] =
 	 0,			/* bitpos.  */
 	 complain_overflow_bitfield, /* complain_on_overflow.  */
 	 bfd_elf_generic_reloc,	/* special_function.  */
-	 "R_unused0",		/* name.  */
+	 "R_BFIN_UNUSED0",	/* name.  */
 	 FALSE,			/* partial_inplace.  */
 	 0,			/* src_mask.  */
 	 0,			/* dst_mask.  */
 	 FALSE),		/* pcrel_offset.  */
 
-  HOWTO (R_pcrel5m2,		/* type.  */
+  HOWTO (R_BFIN_PCREL5M2,	/* type.  */
 	 1,			/* rightshift.  */
 	 1,			/* size (0 = byte, 1 = short, 2 = long)..  */
 	 4,			/* bitsize.  */
@@ -443,13 +443,13 @@ static reloc_howto_type bfin_howto_table [] =
 	 0,			/* bitpos.  */
 	 complain_overflow_unsigned, /* complain_on_overflow.  */
 	 bfin_bfd_reloc,	/* special_function.  */
-	 "R_pcrel5m2",		/* name.  */
+	 "R_BFIN_PCREL5M2",	/* name.  */
 	 FALSE,			/* partial_inplace.  */
 	 0,			/* src_mask.  */
 	 0x0000000F,		/* dst_mask.  */
 	 FALSE),		/* pcrel_offset.  */
 
-  HOWTO (R_unused1,		/* type.  */
+  HOWTO (R_BFIN_UNUSED1,	/* type.  */
 	 0,			/* rightshift.  */
 	 2,			/* size (0 = byte, 1 = short, 2 = long).  */
 	 32,			/* bitsize.  */
@@ -457,13 +457,13 @@ static reloc_howto_type bfin_howto_table [] =
 	 0,			/* bitpos.  */
 	 complain_overflow_bitfield, /* complain_on_overflow.  */
 	 bfd_elf_generic_reloc,	/* special_function.  */
-	 "R_unused1",		/* name.  */
+	 "R_BFIN_UNUSED1",	/* name.  */
 	 FALSE,			/* partial_inplace.  */
 	 0,			/* src_mask.  */
 	 0,			/* dst_mask.  */
 	 FALSE),		/* pcrel_offset.  */
 
-  HOWTO (R_pcrel10,		/* type.  */
+  HOWTO (R_BFIN_PCREL10,	/* type.  */
 	 1,			/* rightshift.  */
 	 1,			/* size (0 = byte, 1 = short, 2 = long).  */
 	 10,			/* bitsize.  */
@@ -471,13 +471,13 @@ static reloc_howto_type bfin_howto_table [] =
 	 0,			/* bitpos.  */
 	 complain_overflow_signed, /* complain_on_overflow.  */
 	 bfin_bfd_reloc,	/* special_function.  */
-	 "R_pcrel10",		/* name.  */
+	 "R_BFIN_PCREL10",	/* name.  */
 	 FALSE,			/* partial_inplace.  */
 	 0,			/* src_mask.  */
 	 0x000003FF,		/* dst_mask.  */
 	 TRUE),			/* pcrel_offset.  */
 
-  HOWTO (R_pcrel12_jump,	/* type.  */
+  HOWTO (R_BFIN_PCREL12_JUMP,	/* type.  */
 	 1,			/* rightshift.  */
 				/* the offset is actually 13 bit
 				   aligned on a word boundary so
@@ -489,13 +489,13 @@ static reloc_howto_type bfin_howto_table [] =
 	 0,			/* bitpos.  */
 	 complain_overflow_signed, /* complain_on_overflow.  */
 	 bfin_bfd_reloc,	/* special_function.  */
-	 "R_pcrel12_jump",	/* name.  */
+	 "R_BFIN_PCREL12_JUMP",	/* name.  */
 	 FALSE,			/* partial_inplace.  */
 	 0,			/* src_mask.  */
 	 0x0FFF,		/* dst_mask.  */
 	 TRUE),			/* pcrel_offset.  */
 
-  HOWTO (R_rimm16,		/* type.  */
+  HOWTO (R_BFIN_RIMM16,		/* type.  */
 	 0,			/* rightshift.  */
 	 1,			/* size (0 = byte, 1 = short, 2 = long).  */
 	 16,			/* bitsize.  */
@@ -503,13 +503,13 @@ static reloc_howto_type bfin_howto_table [] =
 	 0,			/* bitpos.  */
 	 complain_overflow_signed, /* complain_on_overflow.  */
 	 bfin_imm16_reloc,	/* special_function.  */
-	 "R_rimm16",		/* name.  */
+	 "R_BFIN_RIMM16",	/* name.  */
 	 FALSE,			/* partial_inplace.  */
 	 0,			/* src_mask.  */
 	 0x0000FFFF,		/* dst_mask.  */
 	 TRUE),			/* pcrel_offset.  */
 
-  HOWTO (R_luimm16,		/* type.  */
+  HOWTO (R_BFIN_LUIMM16,	/* type.  */
 	 0,			/* rightshift.  */
 	 1,			/* size (0 = byte, 1 = short, 2 = long).  */
 	 16,			/* bitsize.  */
@@ -517,13 +517,13 @@ static reloc_howto_type bfin_howto_table [] =
 	 0,			/* bitpos.  */
 	 complain_overflow_dont, /* complain_on_overflow.  */
 	 bfin_imm16_reloc,	/* special_function.  */
-	 "R_luimm16",		/* name.  */
+	 "R_BFIN_LUIMM16",	/* name.  */
 	 FALSE,			/* partial_inplace.  */
 	 0,			/* src_mask.  */
 	 0x0000FFFF,		/* dst_mask.  */
 	 TRUE),			/* pcrel_offset.  */
 
-  HOWTO (R_huimm16,		/* type.  */
+  HOWTO (R_BFIN_HUIMM16,	/* type.  */
 	 16,			/* rightshift.  */
 	 1,			/* size (0 = byte, 1 = short, 2 = long).  */
 	 16,			/* bitsize.  */
@@ -531,13 +531,13 @@ static reloc_howto_type bfin_howto_table [] =
 	 0,			/* bitpos.  */
 	 complain_overflow_unsigned, /* complain_on_overflow.  */
 	 bfin_imm16_reloc,	/* special_function.  */
-	 "R_huimm16",		/* name.  */
+	 "R_BFIN_HUIMM16",	/* name.  */
 	 FALSE,			/* partial_inplace.  */
 	 0,			/* src_mask.  */
 	 0x0000FFFF,		/* dst_mask.  */
 	 TRUE),			/* pcrel_offset.  */
 
-  HOWTO (R_pcrel12_jump_s,	/* type.  */
+  HOWTO (R_BFIN_PCREL12_JUMP_S,	/* type.  */
 	 1,			/* rightshift.  */
 	 1,			/* size (0 = byte, 1 = short, 2 = long).  */
 	 12,			/* bitsize.  */
@@ -545,13 +545,13 @@ static reloc_howto_type bfin_howto_table [] =
 	 0,			/* bitpos.  */
 	 complain_overflow_signed, /* complain_on_overflow.  */
 	 bfin_bfd_reloc,	/* special_function.  */
-	 "R_pcrel12_jump_s",	/* name.  */
+	 "R_BFIN_PCREL12_JUMP_S", /* name.  */
 	 FALSE,			/* partial_inplace.  */
 	 0,			/* src_mask.  */
 	 0x00000FFF,		/* dst_mask.  */
 	 TRUE),			/* pcrel_offset.  */
 
-  HOWTO (R_pcrel24_jump_x,	/* type.  */
+  HOWTO (R_BFIN_PCREL24_JUMP_X,	/* type.  */
          1,			/* rightshift.  */
          2,			/* size (0 = byte, 1 = short, 2 = long).  */
          24,			/* bitsize.  */
@@ -559,13 +559,13 @@ static reloc_howto_type bfin_howto_table [] =
          0,			/* bitpos.  */
          complain_overflow_signed, /* complain_on_overflow.  */
          bfin_pcrel24_reloc,	/* special_function.  */
-         "R_pcrel24_jump_x",	/* name.  */
+	"R_BFIN_PCREL24_JUMP_X", /* name.  */
 	 FALSE,			/* partial_inplace.  */
 	 0,			/* src_mask.  */
 	 0x00FFFFFF,		/* dst_mask.  */
 	 TRUE),			/* pcrel_offset.  */
 
-  HOWTO (R_pcrel24,		/* type.  */
+  HOWTO (R_BFIN_PCREL24,	/* type.  */
 	 1,			/* rightshift.  */
 	 2,			/* size (0 = byte, 1 = short, 2 = long).  */
 	 24,			/* bitsize.  */
@@ -573,13 +573,13 @@ static reloc_howto_type bfin_howto_table [] =
 	 0,			/* bitpos.  */
 	 complain_overflow_signed, /* complain_on_overflow.  */
 	 bfin_pcrel24_reloc,	/* special_function.  */
-	 "R_pcrel24",		/* name.  */
+	 "R_BFIN_PCREL24",	/* name.  */
 	 FALSE,			/* partial_inplace.  */
 	 0,			/* src_mask.  */
 	 0x00FFFFFF,		/* dst_mask.  */
 	 TRUE),			/* pcrel_offset.  */
 
-  HOWTO (R_unusedb,		/* type.  */
+  HOWTO (R_BFIN_UNUSEDB,	/* type.  */
 	 0,			/* rightshift.  */
 	 2,			/* size (0 = byte, 1 = short, 2 = long).  */
 	 32,			/* bitsize.  */
@@ -587,13 +587,13 @@ static reloc_howto_type bfin_howto_table [] =
 	 0,			/* bitpos.  */
 	 complain_overflow_dont, /* complain_on_overflow.  */
 	 bfd_elf_generic_reloc,	/* special_function.  */
-	 "R_unusedb",		/* name.  */
+	 "R_BFIN_UNUSEDB",	/* name.  */
 	 FALSE,			/* partial_inplace.  */
 	 0,			/* src_mask.  */
 	 0,			/* dst_mask.  */
 	 FALSE),		/* pcrel_offset.  */
 
-  HOWTO (R_unusedc,		/* type.  */
+  HOWTO (R_BFIN_UNUSEDC,	/* type.  */
 	 0,			/* rightshift.  */
 	 2,			/* size (0 = byte, 1 = short, 2 = long).  */
 	 32,			/* bitsize.  */
@@ -601,13 +601,13 @@ static reloc_howto_type bfin_howto_table [] =
 	 0,			/* bitpos.  */
 	 complain_overflow_dont, /* complain_on_overflow.  */
 	 bfd_elf_generic_reloc,	/* special_function.  */
-	 "R_unusedc",		/* name.  */
+	 "R_BFIN_UNUSEDC",	/* name.  */
 	 FALSE,			/* partial_inplace.  */
 	 0,			/* src_mask.  */
 	 0,			/* dst_mask.  */
 	 FALSE),		/* pcrel_offset.  */
 
-  HOWTO (R_pcrel24_jump_l,	/* type.  */
+  HOWTO (R_BFIN_PCREL24_JUMP_L,	/* type.  */
 	 1,			/* rightshift.  */
 	 2,			/* size (0 = byte, 1 = short, 2 = long).  */
 	 24,			/* bitsize.  */
@@ -615,13 +615,13 @@ static reloc_howto_type bfin_howto_table [] =
 	 0,			/* bitpos.  */
 	 complain_overflow_signed, /* complain_on_overflow.  */
 	 bfin_pcrel24_reloc,	/* special_function.  */
-	 "R_pcrel24_jump_l",	/* name.  */
+	 "R_BFIN_PCREL24_JUMP_L", /* name.  */
 	 FALSE,			/* partial_inplace.  */
 	 0,			/* src_mask.  */
 	 0x00FFFFFF,		/* dst_mask.  */
 	 TRUE),			/* pcrel_offset.  */
 
-  HOWTO (R_pcrel24_call_x,	/* type.  */
+  HOWTO (R_BFIN_PCREL24_CALL_X,	/* type.  */
 	 1,			/* rightshift.  */
 	 2,			/* size (0 = byte, 1 = short, 2 = long).  */
 	 24,			/* bitsize.  */
@@ -629,13 +629,13 @@ static reloc_howto_type bfin_howto_table [] =
 	 0,			/* bitpos.  */
 	 complain_overflow_signed, /* complain_on_overflow.  */
 	 bfin_pcrel24_reloc,	/* special_function.  */
-	 "R_pcrel24_call_x",	/* name.  */
+	 "R_BFIN_PCREL24_CALL_X", /* name.  */
 	 FALSE,			/* partial_inplace.  */
 	 0,			/* src_mask.  */
 	 0x00FFFFFF,		/* dst_mask.  */
 	 TRUE),			/* pcrel_offset.  */
 
-  HOWTO (R_var_eq_symb,		/* type.  */
+  HOWTO (R_BFIN_VAR_EQ_SYMB,	/* type.  */
 	 0,			/* rightshift.  */
 	 2,			/* size (0 = byte, 1 = short, 2 = long).  */
 	 32,			/* bitsize.  */
@@ -643,13 +643,13 @@ static reloc_howto_type bfin_howto_table [] =
 	 0,			/* bitpos.  */
 	 complain_overflow_bitfield, /* complain_on_overflow.  */
 	 bfin_bfd_reloc,	/* special_function.  */
-	 "R_var_eq_symb",		/* name.  */
+	 "R_BFIN_VAR_EQ_SYMB",	/* name.  */
 	 FALSE,			/* partial_inplace.  */
 	 0,			/* src_mask.  */
 	 0,			/* dst_mask.  */
 	 FALSE),		/* pcrel_offset.  */
 
-  HOWTO (R_byte_data,		/* type.  */
+  HOWTO (R_BFIN_BYTE_DATA,	/* type.  */
 	 0,			/* rightshift.  */
 	 0,			/* size (0 = byte, 1 = short, 2 = long).  */
 	 8,			/* bitsize.  */
@@ -657,13 +657,13 @@ static reloc_howto_type bfin_howto_table [] =
 	 0,			/* bitpos.  */
 	 complain_overflow_unsigned, /* complain_on_overflow.  */
 	 bfin_bfd_reloc,	/* special_function.  */
-	 "R_byte_data",		/* name.  */
+	 "R_BFIN_BYTE_DATA",	/* name.  */
 	 FALSE,			/* partial_inplace.  */
 	 0,			/* src_mask.  */
 	 0xFF,			/* dst_mask.  */
 	 TRUE),			/* pcrel_offset.  */
 
-  HOWTO (R_byte2_data,		/* type.  */
+  HOWTO (R_BFIN_BYTE2_DATA,	/* type.  */
 	 0,			/* rightshift.  */
 	 1,			/* size (0 = byte, 1 = short, 2 = long).  */
 	 16,			/* bitsize.  */
@@ -671,13 +671,13 @@ static reloc_howto_type bfin_howto_table [] =
 	 0,			/* bitpos.  */
 	 complain_overflow_signed, /* complain_on_overflow.  */
 	 bfin_bfd_reloc,	/* special_function.  */
-	 "R_byte2_data",	/* name.  */
+	 "R_BFIN_BYTE2_DATA",	/* name.  */
 	 FALSE,			/* partial_inplace.  */
 	 0,			/* src_mask.  */
 	 0xFFFF,		/* dst_mask.  */
 	 TRUE),			/* pcrel_offset.  */
 
-  HOWTO (R_byte4_data,		/* type.  */
+  HOWTO (R_BFIN_BYTE4_DATA,	/* type.  */
 	 0,			/* rightshift.  */
 	 2,			/* size (0 = byte, 1 = short, 2 = long).  */
 	 32,			/* bitsize.  */
@@ -685,13 +685,13 @@ static reloc_howto_type bfin_howto_table [] =
 	 0,			/* bitpos.  */
 	 complain_overflow_unsigned, /* complain_on_overflow.  */
 	 bfin_byte4_reloc,	/* special_function.  */
-	 "R_byte4_data",	/* name.  */
+	 "R_BFIN_BYTE4_DATA",	/* name.  */
 	 FALSE,			/* partial_inplace.  */
 	 0,			/* src_mask.  */
 	 0xFFFFFFFF,		/* dst_mask.  */
 	 TRUE),			/* pcrel_offset.  */
 
-  HOWTO (R_pcrel11,		/* type.  */
+  HOWTO (R_BFIN_PCREL11,	/* type.  */
 	 1,			/* rightshift.  */
 	 1,			/* size (0 = byte, 1 = short, 2 = long).  */
 	 10,			/* bitsize.  */
@@ -699,7 +699,7 @@ static reloc_howto_type bfin_howto_table [] =
 	 0,			/* bitpos.  */
 	 complain_overflow_unsigned, /* complain_on_overflow.  */
 	 bfin_bfd_reloc,	/* special_function.  */
-	 "R_pcrel11",		/* name.  */
+	 "R_BFIN_PCREL11",	/* name.  */
 	 FALSE,			/* partial_inplace.  */
 	 0,			/* src_mask.  */
 	 0x000003FF,		/* dst_mask.  */
@@ -931,7 +931,7 @@ static reloc_howto_type bfin_howto_table [] =
 
 static reloc_howto_type bfin_gnuext_howto_table [] =
 {
-  HOWTO (R_pltpc,		/* type.  */
+  HOWTO (R_BFIN_PLTPC,		/* type.  */
 	 0,			/* rightshift.  */
 	 1,			/* size (0 = byte, 1 = short, 2 = long).  */
 	 16,			/* bitsize.  */
@@ -939,13 +939,13 @@ static reloc_howto_type bfin_gnuext_howto_table [] =
 	 0,			/* bitpos.  */
 	 complain_overflow_bitfield, /* complain_on_overflow.  */
 	 bfin_pltpc_reloc,	/* special_function.  */
-	 "R_pltpc",		/* name.  */
+	 "R_BFIN_PLTPC",	/* name.  */
 	 FALSE,			/* partial_inplace.  */
 	 0xffff,		/* src_mask.  */
 	 0xffff,		/* dst_mask.  */
 	 FALSE),		/* pcrel_offset.  */
 
-  HOWTO (R_got,			/* type.  */
+  HOWTO (R_BFIN_GOT,		/* type.  */
 	 0,			/* rightshift.  */
 	 1,			/* size (0 = byte, 1 = short, 2 = long).  */
 	 16,			/* bitsize.  */
@@ -953,7 +953,7 @@ static reloc_howto_type bfin_gnuext_howto_table [] =
 	 0,			/* bitpos.  */
 	 complain_overflow_bitfield, /* complain_on_overflow.  */
 	 bfd_elf_generic_reloc,	/* special_function.  */
-	 "R_got",		/* name.  */
+	 "R_BFIN_GOT",		/* name.  */
 	 FALSE,			/* partial_inplace.  */
 	 0x7fff,		/* src_mask.  */
 	 0x7fff,		/* dst_mask.  */
@@ -998,27 +998,27 @@ struct bfin_reloc_map
 
 static const struct bfin_reloc_map bfin_reloc_map [] =
 {
-  { BFD_RELOC_NONE,			R_unused0 },
-  { BFD_RELOC_BFIN_5_PCREL,		R_pcrel5m2 },
-  { BFD_RELOC_NONE,			R_unused1 },
-  { BFD_RELOC_BFIN_10_PCREL,		R_pcrel10 },
-  { BFD_RELOC_BFIN_12_PCREL_JUMP,	R_pcrel12_jump },
-  { BFD_RELOC_BFIN_16_IMM,		R_rimm16 },
-  { BFD_RELOC_BFIN_16_LOW,		R_luimm16 },
-  { BFD_RELOC_BFIN_16_HIGH,		R_huimm16 },
-  { BFD_RELOC_BFIN_12_PCREL_JUMP_S,	R_pcrel12_jump_s },
-  { BFD_RELOC_24_PCREL,			R_pcrel24 },
-  { BFD_RELOC_24_PCREL,			R_pcrel24 },
-  { BFD_RELOC_BFIN_24_PCREL_JUMP_L,	R_pcrel24_jump_l },
-  { BFD_RELOC_NONE,			R_unusedb },
-  { BFD_RELOC_NONE,			R_unusedc },
-  { BFD_RELOC_BFIN_24_PCREL_CALL_X,	R_pcrel24_call_x },
-  { BFD_RELOC_8,			R_byte_data },
-  { BFD_RELOC_16,			R_byte2_data },
-  { BFD_RELOC_32,			R_byte4_data },
-  { BFD_RELOC_BFIN_11_PCREL,		R_pcrel11 },
-  { BFD_RELOC_BFIN_GOT,			R_got },
-  { BFD_RELOC_BFIN_PLTPC,		R_pltpc },
+  { BFD_RELOC_NONE,			R_BFIN_UNUSED0 },
+  { BFD_RELOC_BFIN_5_PCREL,		R_BFIN_PCREL5M2 },
+  { BFD_RELOC_NONE,			R_BFIN_UNUSED1 },
+  { BFD_RELOC_BFIN_10_PCREL,		R_BFIN_PCREL10 },
+  { BFD_RELOC_BFIN_12_PCREL_JUMP,	R_BFIN_PCREL12_JUMP },
+  { BFD_RELOC_BFIN_16_IMM,		R_BFIN_RIMM16 },
+  { BFD_RELOC_BFIN_16_LOW,		R_BFIN_LUIMM16 },
+  { BFD_RELOC_BFIN_16_HIGH,		R_BFIN_HUIMM16 },
+  { BFD_RELOC_BFIN_12_PCREL_JUMP_S,	R_BFIN_PCREL12_JUMP_S },
+  { BFD_RELOC_24_PCREL,			R_BFIN_PCREL24 },
+  { BFD_RELOC_24_PCREL,			R_BFIN_PCREL24 },
+  { BFD_RELOC_BFIN_24_PCREL_JUMP_L,	R_BFIN_PCREL24_JUMP_L },
+  { BFD_RELOC_NONE,			R_BFIN_UNUSEDB },
+  { BFD_RELOC_NONE,			R_BFIN_UNUSEDC },
+  { BFD_RELOC_BFIN_24_PCREL_CALL_X,	R_BFIN_PCREL24_CALL_X },
+  { BFD_RELOC_8,			R_BFIN_BYTE_DATA },
+  { BFD_RELOC_16,			R_BFIN_BYTE2_DATA },
+  { BFD_RELOC_32,			R_BFIN_BYTE4_DATA },
+  { BFD_RELOC_BFIN_11_PCREL,		R_BFIN_PCREL11 },
+  { BFD_RELOC_BFIN_GOT,			R_BFIN_GOT },
+  { BFD_RELOC_BFIN_PLTPC,		R_BFIN_PLTPC },
 
   { BFD_RELOC_BFIN_GOT17M4,      R_BFIN_GOT17M4 },
   { BFD_RELOC_BFIN_GOTHI,      R_BFIN_GOTHI },
@@ -1191,7 +1191,7 @@ bfin_check_relocs (bfd * abfd,
             return FALSE;
           break;
 
-	case R_got:
+	case R_BFIN_GOT:
 	  if (h != NULL
 	      && strcmp (h->root.root.string, "__GLOBAL_OFFSET_TABLE_") == 0)
 	    break;
@@ -1301,7 +1301,7 @@ bfin_final_link_relocate (Elf_Internal_Rela *rel, reloc_howto_type *howto,
 {
   int r_type = ELF32_R_TYPE (rel->r_info);
 
-  if (r_type == R_pcrel24 || r_type == R_pcrel24_jump_l)
+  if (r_type == R_BFIN_PCREL24 || r_type == R_BFIN_PCREL24_JUMP_L)
     {
       bfd_reloc_status_type r = bfd_reloc_ok;
       bfd_vma x;
@@ -1450,7 +1450,7 @@ bfin_relocate_section (bfd * output_bfd,
 	case R_BFIN_GNU_VTENTRY:
 	  return bfd_reloc_ok;
 
-	case R_got:
+	case R_BFIN_GOT:
 	  /* Relocation is to the address of the entry for this symbol
 	     in the global offset table.  */
 	  if (h != NULL
@@ -1543,7 +1543,7 @@ bfin_relocate_section (bfd * output_bfd,
 			outrel.r_offset = (sgot->output_section->vma
 					   + sgot->output_offset + off);
 			outrel.r_info =
-			  ELF32_R_INFO (0, R_pcrel24);
+			  ELF32_R_INFO (0, R_BFIN_PCREL24);
 			outrel.r_addend = relocation;
 			loc = s->contents;
 			loc +=


hooks/post-receive
--
Repository for Project Archer.


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2009-08-09 22:25 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-08-09 22:25 [SCM] master: bfd/ From Mike Frysinger <michael.frysinger@analog.com> * elf32-bfin.c (bfin_howto_table, bfin_reloc_map, bfin_check_relocs, bfin_final_link_relocate, bfin_relocate_section, bfin_gc_sweep_hook, _bfinfdpic_emit_got_relocs_plt_entries, bfinfdpic_relocate_section, bfinfdpic_gc_sweep_hook, bfinfdpic_check_relocs, bfin_finish_dynamic_symbol, bfd_bfin_elf32_create_embedded_relocs): Adjust to match the renamed reloc definitions jkratoch

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).