gmane.comp.gnu.binutils

Re: [Patch,AVR] Support instrucions XCH, LAT, LAC, LAS

Georg-Johann Lay — 2012-05-24T10:57:36

Would someone commit, please? I have to write access to binutils.

Re: New port: Renesas RL78

antoine odonne — 2012-05-24T10:36:41


Hello,

I have seen that you have run coremark on RL78 G13,
Should it be possible to know the coremark score you get on this platform?
Thank you a lot,
Best regards 

Antoine

Re: PATCH: PR ld/13909: PR ld/12570 causes eh_frame_hdr section to be sometimes too large

Alan Modra — 2012-05-24T08:22:52

HJ, how does this look to you?  Moving _bfd_elf_maybe_strip_eh_frame_hdr
later in bfd_elf_size_dynamic_sections allows us to treat the linker
created PLT .eh_frame section like most other linker created sections.
We don't need to set it up as early, nor do we rely on elf-eh-frame.c
stripping the section by cunningly leaving an FDE range as zero.

bfd/
* elf-eh-frame.c (_bfd_elf_eh_frame_present): New function.
(_bfd_elf_maybe_strip_eh_frame_hdr): Use it here.
* elf-bfd.h (_bfd_elf_eh_frame_present): Declare.
* elflink.c (bfd_elf_size_dynamic_sections): Let the backend
size dynamic sections before stripping eh_frame_hdr.
(bfd_elf_gc_sections): Handle multiple .eh_frame sections.
* elf32-ppc.c (ppc_elf_size_dynamic_sections): Drop glink_eh_frame
if no other .eh_frame sections exist.
* elf64-ppc.c (ppc64_elf_size_stubs): Likewise.
* elf32-i386.c (elf_i386_create_dynamic_sections): Don't size
or alloc plt_eh_frame here..
(elf_i386_size_dynamic_sections): ..do it here instead.  Don't
specially keep sgotplt, iplt, tgotplt, sdynbss for symbols.
(elf_i386_finish_dynamic_sections): Check plt_eh_frame->contents
before writing plt offset.
* elf64-x86-64.c (elf_x86_64_create_dynamic_sections): Don't size
or alloc plt_eh_frame here..
(elf_x86_64_size_dynamic_sections): ..do it here instead.
(elf_x86_64_finish_dynamic_sections): Check plt_eh_frame->contents
before writing plt offset.
ld/
* emultempl/elf32.em (gld${EMULATION_NAME}_after_open): Handle
multiple .eh_frame sections attached to bfd.

Index: bfd/elf-bfd.h
===================================================================
RCS file: /cvs/src/src/bfd/elf-bfd.h,v
retrieving revision 1.338
diff -u -p -r1.338 elf-bfd.h
--- bfd/elf-bfd.h14 May 2012 19:45:17 -00001.338
+++ bfd/elf-bfd.h24 May 2012 04:49:46 -0000
< at >< at > -1950,6 +1950,8 < at >< at > extern bfd_boolean _bfd_elf_write_sectio
   (bfd *, struct bfd_link_info *, asection *, bfd_byte *);
 extern bfd_boolean _bfd_elf_write_section_eh_frame_hdr
   (bfd *, struct bfd_link_info *);
+extern bfd_boolean _bfd_elf_eh_frame_present
+  (struct bfd_link_info *);
 extern bfd_boolean _bfd_elf_maybe_strip_eh_frame_hdr
   (struct bfd_link_info *);
 
Index: bfd/elf-eh-frame.c
===================================================================
RCS file: /cvs/src/src/bfd/elf-eh-frame.c,v
retrieving revision 1.89
diff -u -p -r1.89 elf-eh-frame.c
--- bfd/elf-eh-frame.c23 May 2012 04:38:08 -00001.89
+++ bfd/elf-eh-frame.c24 May 2012 07:44:31 -0000
< at >< at > -1247,6 +1247,26 < at >< at > _bfd_elf_discard_section_eh_frame_hdr (b
   return TRUE;
 }
 
+/* Return true if there is at least one non-empty .eh_frame section in
+   input files.  Can only be called after ld has mapped input to
+   output sections, and before sections are stripped.  */
+bfd_boolean
+_bfd_elf_eh_frame_present (struct bfd_link_info *info)
+{
+  asection *eh = bfd_get_section_by_name (info->output_bfd, ".eh_frame");
+
+  if (eh == NULL)
+    return FALSE;
+
+  /* Count only sections which have at least a single CIE or FDE.
+     There cannot be any CIE or FDE <= 8 bytes.  */
+  for (eh = eh->map_head.s; eh != NULL; eh = eh->map_head.s)
+    if (eh->size > 8)
+      return TRUE;
+
+  return FALSE;
+}
+
 /* This function is called from size_dynamic_sections.
    It needs to decide whether .eh_frame_hdr should be output or not,
    because when the dynamic symbol table has been sized it is too late
< at >< at > -1255,8 +1275,6 < at >< at > _bfd_elf_discard_section_eh_frame_hdr (b
 bfd_boolean
 _bfd_elf_maybe_strip_eh_frame_hdr (struct bfd_link_info *info)
 {
-  asection *o;
-  bfd *abfd;
   struct elf_link_hash_table *htab;
   struct eh_frame_hdr_info *hdr_info;
 
< at >< at > -1265,28 +1283,9 < at >< at > _bfd_elf_maybe_strip_eh_frame_hdr (struc
   if (hdr_info->hdr_sec == NULL)
     return TRUE;
 
-  if (bfd_is_abs_section (hdr_info->hdr_sec->output_section))
-    {
-      hdr_info->hdr_sec = NULL;
-      return TRUE;
-    }
-
-  abfd = NULL;
-  if (info->eh_frame_hdr)
-    for (abfd = info->input_bfds; abfd != NULL; abfd = abfd->link_next)
-      {
-/* Count only sections which have at least a single CIE or FDE.
-   There cannot be any CIE or FDE <= 8 bytes.  */
-o = bfd_get_section_by_name (abfd, ".eh_frame");
-while (o != NULL
-       && (o->size <= 8
-   || bfd_is_abs_section (o->output_section)))
-  o = bfd_get_next_section_by_name (o);
-if (o != NULL)
-  break;
-      }
-
-  if (abfd == NULL)
+  if (bfd_is_abs_section (hdr_info->hdr_sec->output_section)
+      || !info->eh_frame_hdr
+      || !_bfd_elf_eh_frame_present (info))
     {
       hdr_info->hdr_sec->flags |= SEC_EXCLUDE;
       hdr_info->hdr_sec = NULL;
Index: bfd/elf32-i386.c
===================================================================
RCS file: /cvs/src/src/bfd/elf32-i386.c,v
retrieving revision 1.276
diff -u -p -r1.276 elf32-i386.c
--- bfd/elf32-i386.c22 May 2012 15:54:58 -00001.276
+++ bfd/elf32-i386.c24 May 2012 04:49:51 -0000
< at >< at > -1027,12 +1027,6 < at >< at > elf_i386_create_dynamic_sections (bfd *d
       if (htab->plt_eh_frame == NULL
   || !bfd_set_section_alignment (dynobj, htab->plt_eh_frame, 2))
 return FALSE;
-
-      htab->plt_eh_frame->size = sizeof (elf_i386_eh_frame_plt);
-      htab->plt_eh_frame->contents
-= bfd_alloc (dynobj, htab->plt_eh_frame->size);
-      memcpy (htab->plt_eh_frame->contents, elf_i386_eh_frame_plt,
-      sizeof (elf_i386_eh_frame_plt));
     }
 
   return TRUE;
< at >< at > -2726,7 +2720,7 < at >< at > elf_i386_size_dynamic_sections (bfd *out
   FALSE, FALSE, FALSE);
 
       /* Don't allocate .got.plt section if there are no GOT nor PLT
-         entries and there is no refeence to _GLOBAL_OFFSET_TABLE_.  */
+         entries and there is no reference to _GLOBAL_OFFSET_TABLE_.  */
       if ((got == NULL
    || !got->ref_regular_nonweak)
   && (htab->elf.sgotplt->size
< at >< at > -2742,6 +2736,14 < at >< at > elf_i386_size_dynamic_sections (bfd *out
 htab->elf.sgotplt->size = 0;
     }
 
+
+  if (htab->plt_eh_frame != NULL
+      && htab->elf.splt != NULL
+      && htab->elf.splt->size != 0
+      && !bfd_is_abs_section (htab->elf.splt->output_section)
+      && _bfd_elf_eh_frame_present (info))
+    htab->plt_eh_frame->size = sizeof (elf_i386_eh_frame_plt);
+
   /* We now have determined the sizes of the various dynamic sections.
      Allocate memory for them.  */
   relocs = FALSE;
< at >< at > -2753,11 +2755,7 < at >< at > elf_i386_size_dynamic_sections (bfd *out
 continue;
 
       if (s == htab->elf.splt
-  || s == htab->elf.sgot
-  || s == htab->elf.sgotplt
-  || s == htab->elf.iplt
-  || s == htab->elf.igotplt
-  || s == htab->sdynbss)
+  || s == htab->elf.sgot)
 {
   /* Strip this section if we don't need it; see the
      comment below.  */
< at >< at > -2768,6 +2766,14 < at >< at > elf_i386_size_dynamic_sections (bfd *out
   if (htab->elf.hplt != NULL)
     strip_section = FALSE;
 }
+      else if (s == htab->elf.sgotplt
+       || s == htab->elf.iplt
+       || s == htab->elf.igotplt
+       || s == htab->plt_eh_frame
+       || s == htab->sdynbss)
+{
+  /* Strip these too.  */
+}
       else if (CONST_STRNEQ (bfd_get_section_name (dynobj, s), ".rel"))
 {
   if (s->size != 0
< at >< at > -2815,11 +2821,13 < at >< at > elf_i386_size_dynamic_sections (bfd *out
     }
 
   if (htab->plt_eh_frame != NULL
-      && htab->elf.splt != NULL
-      && htab->elf.splt->size != 0
-      && (htab->elf.splt->flags & SEC_EXCLUDE) == 0)
-    bfd_put_32 (dynobj, htab->elf.splt->size,
-htab->plt_eh_frame->contents + PLT_FDE_LEN_OFFSET);
+      && htab->plt_eh_frame->contents != NULL)
+    {
+      memcpy (htab->plt_eh_frame->contents, elf_i386_eh_frame_plt,
+      sizeof (elf_i386_eh_frame_plt));
+      bfd_put_32 (dynobj, htab->elf.splt->size,
+  htab->plt_eh_frame->contents + PLT_FDE_LEN_OFFSET);
+    }
 
   if (htab->elf.dynamic_sections_created)
     {
< at >< at > -4840,7 +4848,8 < at >< at > elf_i386_finish_dynamic_sections (bfd *o
     }
 
   /* Adjust .eh_frame for .plt section.  */
-  if (htab->plt_eh_frame != NULL)
+  if (htab->plt_eh_frame != NULL
+      && htab->plt_eh_frame->contents != NULL)
     {
       if (htab->elf.splt != NULL
   && htab->elf.splt->size != 0
Index: bfd/elf32-ppc.c
===================================================================
RCS file: /cvs/src/src/bfd/elf32-ppc.c,v
retrieving revision 1.316
diff -u -p -r1.316 elf32-ppc.c
--- bfd/elf32-ppc.c22 May 2012 14:58:15 -00001.316
+++ bfd/elf32-ppc.c24 May 2012 04:49:52 -0000
< at >< at > -6244,7 +6244,8 < at >< at > ppc_elf_size_dynamic_sections (bfd *outp
   if (htab->glink != NULL
       && htab->glink->size != 0
       && htab->glink_eh_frame != NULL
-      && !bfd_is_abs_section (htab->glink_eh_frame->output_section))
+      && !bfd_is_abs_section (htab->glink_eh_frame->output_section)
+      && _bfd_elf_eh_frame_present (info))
     {
       s = htab->glink_eh_frame;
       s->size = sizeof (glink_eh_frame_cie) + 20;
Index: bfd/elf64-ppc.c
===================================================================
RCS file: /cvs/src/src/bfd/elf64-ppc.c,v
retrieving revision 1.384
diff -u -p -r1.384 elf64-ppc.c
--- bfd/elf64-ppc.c24 May 2012 06:20:52 -00001.384
+++ bfd/elf64-ppc.c24 May 2012 07:10:52 -0000
< at >< at > -11662,7 +11662,7 < at >< at > ppc64_elf_size_stubs (struct bfd_link_in
 
       if (htab->glink_eh_frame != NULL
   && !bfd_is_abs_section (htab->glink_eh_frame->output_section)
-  && (htab->glink_eh_frame->flags & SEC_EXCLUDE) == 0)
+  && htab->glink_eh_frame->output_section->size != 0)
 {
   size_t size = 0, align;
 
Index: bfd/elf64-x86-64.c
===================================================================
RCS file: /cvs/src/src/bfd/elf64-x86-64.c,v
retrieving revision 1.266
diff -u -p -r1.266 elf64-x86-64.c
--- bfd/elf64-x86-64.c22 May 2012 15:54:58 -00001.266
+++ bfd/elf64-x86-64.c24 May 2012 04:49:56 -0000
< at >< at > -982,8 +982,6 < at >< at > elf_x86_64_create_dynamic_sections (bfd 
       && htab->plt_eh_frame == NULL
       && htab->elf.splt != NULL)
     {
-      const struct elf_x86_64_backend_data *const abed
-= get_elf_x86_64_backend_data (dynobj);
       flagword flags = get_elf_backend_data (dynobj)->dynamic_sec_flags;
       htab->plt_eh_frame
 = bfd_make_section_anyway_with_flags (dynobj, ".eh_frame",
< at >< at > -993,12 +991,6 < at >< at > elf_x86_64_create_dynamic_sections (bfd 
       if (htab->plt_eh_frame == NULL
   || !bfd_set_section_alignment (dynobj, htab->plt_eh_frame, 3))
 return FALSE;
-
-      htab->plt_eh_frame->size = abed->eh_frame_plt_size;
-      htab->plt_eh_frame->contents
-= bfd_alloc (dynobj, htab->plt_eh_frame->size);
-      memcpy (htab->plt_eh_frame->contents,
-      abed->eh_frame_plt, abed->eh_frame_plt_size);
     }
   return TRUE;
 }
< at >< at > -2797,6 +2789,17 < at >< at > elf_x86_64_size_dynamic_sections (bfd *o
 htab->elf.sgotplt->size = 0;
     }
 
+  if (htab->plt_eh_frame != NULL
+      && htab->elf.splt != NULL
+      && htab->elf.splt->size != 0
+      && !bfd_is_abs_section (htab->elf.splt->output_section)
+      && _bfd_elf_eh_frame_present (info))
+    {
+      const struct elf_x86_64_backend_data *arch_data
+= (const struct elf_x86_64_backend_data *) bed->arch_data;
+      htab->plt_eh_frame->size = arch_data->eh_frame_plt_size;
+    }
+
   /* We now have determined the sizes of the various dynamic sections.
      Allocate memory for them.  */
   relocs = FALSE;
< at >< at > -2810,6 +2813,7 < at >< at > elf_x86_64_size_dynamic_sections (bfd *o
   || s == htab->elf.sgotplt
   || s == htab->elf.iplt
   || s == htab->elf.igotplt
+  || s == htab->plt_eh_frame
   || s == htab->sdynbss)
 {
   /* Strip this section if we don't need it; see the
< at >< at > -2861,11 +2865,16 < at >< at > elf_x86_64_size_dynamic_sections (bfd *o
     }
 
   if (htab->plt_eh_frame != NULL
-      && htab->elf.splt != NULL
-      && htab->elf.splt->size != 0
-      && (htab->elf.splt->flags & SEC_EXCLUDE) == 0)
-    bfd_put_32 (dynobj, htab->elf.splt->size,
-htab->plt_eh_frame->contents + PLT_FDE_LEN_OFFSET);
+      && htab->plt_eh_frame->contents != NULL)
+    {
+      const struct elf_x86_64_backend_data *arch_data
+= (const struct elf_x86_64_backend_data *) bed->arch_data;
+
+      memcpy (htab->plt_eh_frame->contents,
+      arch_data->eh_frame_plt, htab->plt_eh_frame->size);
+      bfd_put_32 (dynobj, htab->elf.splt->size,
+  htab->plt_eh_frame->contents + PLT_FDE_LEN_OFFSET);
+    }
 
   if (htab->elf.dynamic_sections_created)
     {
< at >< at > -4725,7 +4734,8 < at >< at > elf_x86_64_finish_dynamic_sections (bfd 
     }
 
   /* Adjust .eh_frame for .plt section.  */
-  if (htab->plt_eh_frame != NULL)
+  if (htab->plt_eh_frame != NULL
+      && htab->plt_eh_frame->contents != NULL)
     {
       if (htab->elf.splt != NULL
   && htab->elf.splt->size != 0
Index: bfd/elflink.c
===================================================================
RCS file: /cvs/src/src/bfd/elflink.c,v
retrieving revision 1.444
diff -u -p -r1.444 elflink.c
--- bfd/elflink.c23 May 2012 04:35:31 -00001.444
+++ bfd/elflink.c24 May 2012 04:49:58 -0000
< at >< at > -5584,17 +5584,9 < at >< at > bfd_elf_size_dynamic_sections (bfd *outp
       && ! (*bed->elf_backend_always_size_sections) (output_bfd, info))
     return FALSE;
 
-  if (! _bfd_elf_maybe_strip_eh_frame_hdr (info))
-    return FALSE;
-
   dynobj = elf_hash_table (info)->dynobj;
 
-  /* If there were no dynamic objects in the link, there is nothing to
-     do here.  */
-  if (dynobj == NULL)
-    return TRUE;
-
-  if (elf_hash_table (info)->dynamic_sections_created)
+  if (dynobj != NULL && elf_hash_table (info)->dynamic_sections_created)
     {
       struct elf_info_failed eif;
       struct elf_link_hash_entry *h;
< at >< at > -5897,11 +5889,15 < at >< at > bfd_elf_size_dynamic_sections (bfd *outp
 
   /* The backend must work out the sizes of all the other dynamic
      sections.  */
-  if (bed->elf_backend_size_dynamic_sections
+  if (dynobj != NULL
+      && bed->elf_backend_size_dynamic_sections != NULL
       && ! (*bed->elf_backend_size_dynamic_sections) (output_bfd, info))
     return FALSE;
 
-  if (elf_hash_table (info)->dynamic_sections_created)
+  if (! _bfd_elf_maybe_strip_eh_frame_hdr (info))
+    return FALSE;
+
+  if (dynobj != NULL && elf_hash_table (info)->dynamic_sections_created)
     {
       unsigned long section_sym_count;
       struct bfd_elf_version_tree *verdefs;
< at >< at > -12002,12 +11998,14 < at >< at > bfd_elf_gc_sections (bfd *abfd, struct b
       struct elf_reloc_cookie cookie;
 
       sec = bfd_get_section_by_name (sub, ".eh_frame");
-      if (sec && init_reloc_cookie_for_section (&cookie, info, sec))
+      while (sec && init_reloc_cookie_for_section (&cookie, info, sec))
 {
   _bfd_elf_parse_eh_frame (sub, info, sec, &cookie);
-  if (elf_section_data (sec)->sec_info)
+  if (elf_section_data (sec)->sec_info
+      && (sec->flags & SEC_LINKER_CREATED) == 0)
     elf_eh_frame_section (sub) = sec;
   fini_reloc_cookie_for_section (&cookie, sec);
+  sec = bfd_get_next_section_by_name (sec);
 }
     }
   _bfd_elf_end_eh_frame_parsing (info);
Index: ld/emultempl/elf32.em
===================================================================
RCS file: /cvs/src/src/ld/emultempl/elf32.em,v
retrieving revision 1.227
diff -u -p -r1.227 elf32.em
--- ld/emultempl/elf32.em16 May 2012 10:43:41 -00001.227
+++ ld/emultempl/elf32.em24 May 2012 04:50:21 -0000
< at >< at > -1142,10 +1142,11 < at >< at > gld${EMULATION_NAME}_after_open (void)
   if (!warn_eh_frame)
     {
       s = bfd_get_section_by_name (abfd, ".eh_frame");
-      warn_eh_frame
-= (s
-   && s->size > 8
-   && !bfd_is_abs_section (s->output_section));
+      while (s != NULL
+     && (s->size <= 8
+ || bfd_is_abs_section (s->output_section)))
+s = bfd_get_next_section_by_name (s);
+      warn_eh_frame = s != NULL;
     }
   if (elfbfd && warn_eh_frame)
     break;

Re: [Patch,AVR] Support instrucions XCH, LAT, LAC, LAS

Denis Chertykov — 2012-05-24T07:23:57

2012/5/23 Georg-Johann Lay <avr< at >gjlay.de>:

Approved.

Denis.

pr14158, hole in powerpc64 .eh_frame

Alan Modra — 2012-05-24T06:20:12

PowerPC64 linker generated .eh_frame for PLT call stubs uses
DW_EH_PE_pcrel | DW_EH_PE_sdata4 encoding for addresses, and thus
aligns .eh_frame to 4 bytes.  Current gcc uses the same encoding, but
probably because gcc hasn't changed its .eh_frame alignment from the
days it generated 8-byte addresses, aligns to 8 bytes.  This means ld
will insert padding between the linker generated .eh_frame and user
.eh_frame sections.  The padding is seen as a terminator, which breaks
exception handling for anyone not reading the FDEs via .eh_frame_hdr.
The common case of course is to call ld with --eh-frame-hdr, which is
why I hadn't seen this problem until now.

PR ld/14158
* elf64-ppc.c (ppc64_elf_size_stubs): Round up glink_eh_frame
size to output section alignment.
(ppc64_elf_build_stubs): Likewise, and extend last FDE to cover.

Index: bfd/elf64-ppc.c
===================================================================
RCS file: /cvs/src/src/bfd/elf64-ppc.c,v
retrieving revision 1.383
diff -u -p -r1.383 elf64-ppc.c
--- bfd/elf64-ppc.c17 May 2012 02:43:34 -00001.383
+++ bfd/elf64-ppc.c24 May 2012 04:49:55 -0000
< at >< at > -11664,7 +11664,7 < at >< at > ppc64_elf_size_stubs (struct bfd_link_in
   && !bfd_is_abs_section (htab->glink_eh_frame->output_section)
   && (htab->glink_eh_frame->flags & SEC_EXCLUDE) == 0)
 {
-  bfd_size_type size = 0;
+  size_t size = 0, align;
 
   for (stub_sec = htab->stub_bfd->sections;
        stub_sec != NULL;
< at >< at > -11675,6 +11675,10 < at >< at > ppc64_elf_size_stubs (struct bfd_link_in
     size += 24;
   if (size != 0)
     size += sizeof (glink_eh_frame_cie);
+  align = 1;
+  align <<= htab->glink_eh_frame->output_section->alignment_power;
+  align -= 1;
+  size = (size + align) & ~align;
   htab->glink_eh_frame->rawsize = htab->glink_eh_frame->size;
   htab->glink_eh_frame->size = size;
 }
< at >< at > -11916,17 +11920,21 < at >< at > ppc64_elf_build_stubs (bfd_boolean emit_
       && htab->glink_eh_frame->size != 0)
     {
       bfd_vma val;
+      bfd_byte *last_fde;
+      size_t last_fde_len, size, align, pad;
 
       p = bfd_zalloc (htab->glink_eh_frame->owner, htab->glink_eh_frame->size);
       if (p == NULL)
 return FALSE;
       htab->glink_eh_frame->contents = p;
+      last_fde = p;
 
       htab->glink_eh_frame->rawsize = htab->glink_eh_frame->size;
 
       memcpy (p, glink_eh_frame_cie, sizeof (glink_eh_frame_cie));
       /* CIE length (rewrite in case little-endian).  */
-      bfd_put_32 (htab->elf.dynobj, sizeof (glink_eh_frame_cie) - 4, p);
+      last_fde_len = sizeof (glink_eh_frame_cie) - 4;
+      bfd_put_32 (htab->elf.dynobj, last_fde_len, p);
       p += sizeof (glink_eh_frame_cie);
 
       for (stub_sec = htab->stub_bfd->sections;
< at >< at > -11934,6 +11942,8 < at >< at > ppc64_elf_build_stubs (bfd_boolean emit_
    stub_sec = stub_sec->next)
 if ((stub_sec->flags & SEC_LINKER_CREATED) == 0)
   {
+    last_fde = p;
+    last_fde_len = 16;
     /* FDE length.  */
     bfd_put_32 (htab->elf.dynobj, 16, p);
     p += 4;
< at >< at > -11966,6 +11976,8 < at >< at > ppc64_elf_build_stubs (bfd_boolean emit_
   }
       if (htab->glink != NULL && htab->glink->size != 0)
 {
+  last_fde = p;
+  last_fde_len = 20;
   /* FDE length.  */
   bfd_put_32 (htab->elf.dynobj, 20, p);
   p += 4;
< at >< at > -12003,7 +12015,16 < at >< at > ppc64_elf_build_stubs (bfd_boolean emit_
   *p++ = DW_CFA_restore_extended;
   *p++ = 65;
 }
-      htab->glink_eh_frame->size = p - htab->glink_eh_frame->contents;
+      /* Subsume any padding into the last FDE if user .eh_frame
+ sections are aligned more than glink_eh_frame.  Otherwise any
+ zero padding will be seen as a terminator.  */
+      size = p - htab->glink_eh_frame->contents;
+      align = 1;
+      align <<= htab->glink_eh_frame->output_section->alignment_power;
+      align -= 1;
+      pad = ((size + align) & ~align) - size;
+      htab->glink_eh_frame->size = size + pad;
+      bfd_put_32 (htab->elf.dynobj, last_fde_len + pad, last_fde);
     }
 
   /* Build the stubs as directed by the stub hash table.  */

Re: [patch] Fix ld to match .data.rel.ro sections more carefully

Cary Coutant — 2012-05-24T01:05:16

Fine with me!

-cary

Re: [binutils-owner] Re: RFC: Displaying multibyte symbol names in readelf

suzuki toshiya — 2012-05-24T01:02:27

Excuse me, please let me ask a stupid question.

I guess some people want to receive raw constant data (e.g. hardwired
string data) instead of hexadecimalized constant data, so I believe
there is a requirement of such feature.

But, I'm not sure if the case that the character encoding in ELF binary
and that in current (terminal emulator's) locale are matched is common.
I'm afraid that the mismatched case, like, encoding in binary is UCS2,
UTF-16 or UTF-32 but the locale is UTF-8 would be popular (I'm not saying
it's the most popular case).

According to GCC manual:
       -fwide-exec-charset=charset
           Set the wide execution character set, used for wide string and
           character constants.  The default is UTF-32 or UTF-16, whichever
           corresponds to the width of "wchar_t".  As with -fexec-charset,
           charset can be any encoding supported by the system's "iconv"
           library routine; however, you will have problems with encodings
           that do not fit exactly in "wchar_t".
I'm afraid that the constant wide character string in the binary executable
might be coded by UTF-32 or UTF-16 (I'm not saying it's the most popular case).

If you have already evaluated the proportions of such mismatched cases,
please let me know.

Regards,
mpsuzuki

Hans-Peter Nilsson wrote:

Re: [patch] Fix ld to match .data.rel.ro sections more carefully

Alan Modra — 2012-05-24T00:29:26

Call it a gcc bug?

Re: [patch] Fix ld to match .data.rel.ro sections more carefully

Alan Modra — 2012-05-24T00:28:41

OK, thanks!

Re: [gold patch] Fix gold to match .data.rel.ro sections more carefully

Ian Lance Taylor — 2012-05-24T00:27:04


This is OK.

Thanks.

Ian

Re: [gold patch] Fix gold to match .data.rel.ro sections more carefully

Cary Coutant — 2012-05-23T23:03:54

This patch adds a couple of entries to the table that require an exact
match (setting fromlen to 0 as a flag).

There's probably a better way to do this -- maybe just drop the
trailing dot in all cases, and check for either "." or "\0" after the
matched part. It wasn't clear to me that that strategy would apply
universally, though.

Tested (and looked at the results this time) on x86_64.

OK as is? Or does a different approach look better?

-cary


2012-05-23  Cary Coutant  <ccoutant< at >google.com>

* gold/layout.cc (Layout::section_name_mapping): Add rules to handle
exact match on .data.rel.ro.local or .data.rel.ro.
(Layout::output_section_name): Check for exact matches.


commit 699a0be246948f5696dfb6c2f1d41f18a5e12d4b
Author: Cary Coutant <ccoutant< at >google.com>
Date:   Wed May 23 15:53:19 2012 -0700

    Fix to handle .data.rel.ro correctly.

diff --git a/gold/layout.cc b/gold/layout.cc
index e9aeef5..c7ca322 100644
--- a/gold/layout.cc
+++ b/gold/layout.cc
< at >< at > -4569,12 +4569,15 < at >< at > Layout::set_dynamic_symbol_size(const
Symbol_table* symtab)
 // based on the GNU linker default ELF linker script.

 #define MAPPING_INIT(f, t) { f, sizeof(f) - 1, t, sizeof(t) - 1 }
+#define MAPPING_INIT_EXACT(f, t) { f, 0, t, sizeof(t) - 1 }
 const Layout::Section_name_mapping Layout::section_name_mapping[] =
 {
   MAPPING_INIT(".text.", ".text"),
   MAPPING_INIT(".rodata.", ".rodata"),
   MAPPING_INIT(".data.rel.ro.local.", ".data.rel.ro.local"),
+  MAPPING_INIT_EXACT(".data.rel.ro.local", ".data.rel.ro.local"),
   MAPPING_INIT(".data.rel.ro.", ".data.rel.ro"),
+  MAPPING_INIT_EXACT(".data.rel.ro", ".data.rel.ro"),
   MAPPING_INIT(".data.", ".data"),
   MAPPING_INIT(".bss.", ".bss"),
   MAPPING_INIT(".tdata.", ".tdata"),
< at >< at > -4613,6 +4616,7 < at >< at > const Layout::Section_name_mapping
Layout::section_name_mapping[] =
   MAPPING_INIT(".gnu.linkonce.armexidx.", ".ARM.exidx"),
 };
 #undef MAPPING_INIT
+#undef MAPPING_INIT_EXACT

 const int Layout::section_name_mapping_count =
   (sizeof(Layout::section_name_mapping)
< at >< at > -4664,10 +4668,21 < at >< at > Layout::output_section_name(const Relobj*
relobj, const char* name,
   const Section_name_mapping* psnm = section_name_mapping;
   for (int i = 0; i < section_name_mapping_count; ++i, ++psnm)
     {
-      if (strncmp(name, psnm->from, psnm->fromlen) == 0)
+      if (psnm->fromlen > 0)
 {
-  *plen = psnm->tolen;
-  return psnm->to;
+  if (strncmp(name, psnm->from, psnm->fromlen) == 0)
+    {
+      *plen = psnm->tolen;
+      return psnm->to;
+    }
+}
+      else
+{
+  if (strcmp(name, psnm->from) == 0)
+    {
+      *plen = psnm->tolen;
+      return psnm->to;
+    }
 }
     }

Re: [patch] Fix ld to match .data.rel.ro sections more carefully

Cary Coutant — 2012-05-23T22:44:41

Unfortunately, this still doesn't handle the case where we have a
variable named simply "ro" that happens to have a relocation. That
will get placed into a ".data.rel.ro" section that is
indistinguishable from a real ".data.rel.ro" section generated without
-fdata-sections. Does anyone have any suggestions for how to handle
this?

-cary

Re: [gold patch] Fix gold to match .data.rel.ro sections more carefully

Cary Coutant — 2012-05-23T22:36:24

Sorry, I committed this without noticing a couple of testsuite
failures. Adding the "." here caused sections named ".data.rel.ro" to
match the next entry in the table, which maps ".data.*" to ".data". I
need to make the mapping a bit smarter...

-cary

Re: [gold patch] Fix gold to match .data.rel.ro sections more carefully

Ian Lance Taylor — 2012-05-23T20:28:45


This is OK.

Thanks.

Ian

[gold patch] Fix gold to match .data.rel.ro sections more carefully

Cary Coutant — 2012-05-23T19:05:44

This patch fixes gold, which has the same problem placing
.data.rel.rome (for example) in the .data.rel.ro section.

Tested on x86_64.

OK to commit?

-cary


2012-05-23  Cary Coutant  <ccoutant< at >google.com>

gold/
* layout.cc (Layout::section_name_mapping): Match .data.rel.ro.*
more carefully.


commit 4055988862278017c0564c81e8cee7fd001e6507
Author: Cary Coutant <ccoutant< at >google.com>
Date:   Wed May 23 11:44:38 2012 -0700

    Fix handling of .data.rel.ro* vs. .data.rel.ro.* sections.

diff --git a/gold/layout.cc b/gold/layout.cc
index 0ac0fbf..e9aeef5 100644
--- a/gold/layout.cc
+++ b/gold/layout.cc
< at >< at > -4573,8 +4573,8 < at >< at > const Layout::Section_name_mapping
Layout::section_name_mapping[] =
 {
   MAPPING_INIT(".text.", ".text"),
   MAPPING_INIT(".rodata.", ".rodata"),
-  MAPPING_INIT(".data.rel.ro.local", ".data.rel.ro.local"),
-  MAPPING_INIT(".data.rel.ro", ".data.rel.ro"),
+  MAPPING_INIT(".data.rel.ro.local.", ".data.rel.ro.local"),
+  MAPPING_INIT(".data.rel.ro.", ".data.rel.ro"),
   MAPPING_INIT(".data.", ".data"),
   MAPPING_INIT(".bss.", ".bss"),
   MAPPING_INIT(".tdata.", ".tdata"),

[patch] Fix ld to match .data.rel.ro sections more carefully

Cary Coutant — 2012-05-23T18:58:55

Both GNU ld and gold share a problem where a variable whose name
begins with "ro" might accidentally end up in a RELRO segment. Compile
the following test program with -fpic -fdata-sections:

#include <stdio.h>

char p[] = "Paris";
char r[] = "Rome";
char l[] = "London";

const char * const paris = p;
const char * rome = r;
const char * london = l;

int main()
{
  printf("%s\n", paris);
  printf("%s\n", london);
  london = "England";
  printf("%s\n", london);
  printf("%s\n", rome);
  rome = "Italy";
  printf("%s\n", rome);
  return 0;
}

The variable "rome" is placed in a data section named
".data.rel.rome", and that matches the pattern that ld uses to place
input sections into .data.rel.ro, which then gets placed in the RELRO
segment, and the program segfaults when trying to assign to "rome".

The attached patch fixes this by matching ".data.rel.ro" and
".data.rel.ro.*" separately (a pattern used for most other similar
cases, but not for the relro sections), and likewise for the
corresponding relocation sections.

Along the way, I found a typo in armbpabi.sc and mep.sc where the
pattern for .rela.data.rel.ro had ".rel.data.rel.ro" ("rel" instead of
"rela").

Tested on x86_64. OK to install?

-cary


2012-05-23  Cary Coutant  <ccoutant< at >google.com>

ld/
* scripttempl/armbpabi.sc: Match .data.rel.ro.* sections more
carefully.  Fix typo where .rela.data.rel.ro matches
.rel.data.rel.ro.
* scripttempl/mep.sc: Likewise.
* scripttempl/elf.sc: Match .data.rel.ro.* sections more carefully.
* scripttempl/elf64hppa.sc: Likewise.
* scripttempl/elfxtensa.sc: Likewise.
2012-05-23  Cary Coutant  <ccoutant< at >google.com>

ld/
* scripttempl/armbpabi.sc: Match .data.rel.ro.* sections more
carefully.  Fix typo where .rela.data.rel.ro matches
.rel.data.rel.ro.
* scripttempl/mep.sc: Likewise.
* scripttempl/elf.sc: Match .data.rel.ro.* sections more carefully.
* scripttempl/elf64hppa.sc: Likewise.
* scripttempl/elfxtensa.sc: Likewise.


commit 8645b4433b06db38940160c5357fc82221fa49b3
Author: Cary Coutant <ccoutant< at >google.com>
Date:   Wed May 23 11:44:17 2012 -0700

    Fix handling of .data.rel.ro* vs. .data.rel.ro.* sections.

diff --git a/ld/scripttempl/armbpabi.sc b/ld/scripttempl/armbpabi.sc
index 8b3ea0a..ea01ce2 100644
--- a/ld/scripttempl/armbpabi.sc
+++ b/ld/scripttempl/armbpabi.sc
< at >< at > -29,7 +29,7 < at >< at > fi
 INTERP=".interp       0 : { *(.interp) }"
 PLT=".plt          ${RELOCATING-0} : { *(.plt) }"
 RODATA=".rodata       ${RELOCATING-0} : { *(.rodata${RELOCATING+ .rodata.* .gnu.linkonce.r.*}) }"
-DATARELRO=".data.rel.ro : { *(.data.rel.ro.local) *(.data.rel.ro*) }"
+DATARELRO=".data.rel.ro : { *(.data.rel.ro.local) *(.data.rel.ro .data.rel.ro.*) }"
 DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink)  *(.gnu.lto_*) }"
 if test -z "${NO_SMALL_DATA}"; then
   SBSS=".sbss         ${RELOCATING-0} :
< at >< at > -380,8 +380,8 < at >< at > eval $COMBRELOCCAT <<EOF
   .rel.rodata   0 : { *(.rel.rodata${RELOCATING+ .rel.rodata.* .rel.gnu.linkonce.r.*}) }
   .rela.rodata  0 : { *(.rela.rodata${RELOCATING+ .rela.rodata.* .rela.gnu.linkonce.r.*}) }
   ${OTHER_READONLY_RELOC_SECTIONS}
-  .rel.data.rel.ro 0 : { *(.rel.data.rel.ro${RELOCATING+*}) }
-  .rela.data.rel.ro 0 : { *(.rel.data.rel.ro${RELOCATING+*}) }
+  .rel.data.rel.ro 0 : { *(.rel.data.rel.ro${RELOCATING+ .rel.data.rel.ro.*}) }
+  .rela.data.rel.ro 0 : { *(.rela.data.rel.ro${RELOCATING+ .rela.data.rel.ro.*}) }
   .rel.data     0 : { *(.rel.data${RELOCATING+ .rel.data.* .rel.gnu.linkonce.d.*}) }
   .rela.data    0 : { *(.rela.data${RELOCATING+ .rela.data.* .rela.gnu.linkonce.d.*}) }
   .rel.tdata0 : { *(.rel.tdata${RELOCATING+ .rel.tdata.* .rel.gnu.linkonce.td.*}) }
diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
index 5796b0a..37a3124 100644
--- a/ld/scripttempl/elf.sc
+++ b/ld/scripttempl/elf.sc
< at >< at > -157,7 +157,7 < at >< at > RELA_IPLT=".rela.iplt    ${RELOCATING-0} :
     }"
 DYNAMIC=".dynamic      ${RELOCATING-0} : { *(.dynamic) }"
 RODATA=".${RODATA_NAME}       ${RELOCATING-0} : { *(.${RODATA_NAME}${RELOCATING+ .${RODATA_NAME}.* .gnu.linkonce.r.*}) }"
-DATARELRO=".data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro* .gnu.linkonce.d.rel.ro.*) }"
+DATARELRO=".data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro .data.rel.ro.* .gnu.linkonce.d.rel.ro.*) }"
 DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) }"
 if test -z "${NO_SMALL_DATA}"; then
   SBSS=".${SBSS_NAME}         ${RELOCATING-0} :
< at >< at > -377,8 +377,8 < at >< at > eval $COMBRELOCCAT <<EOF
   .rel.${RODATA_NAME}   ${RELOCATING-0} : { *(.rel.${RODATA_NAME}${RELOCATING+ .rel.${RODATA_NAME}.* .rel.gnu.linkonce.r.*}) }
   .rela.${RODATA_NAME}  ${RELOCATING-0} : { *(.rela.${RODATA_NAME}${RELOCATING+ .rela.${RODATA_NAME}.* .rela.gnu.linkonce.r.*}) }
   ${OTHER_READONLY_RELOC_SECTIONS}
-  .rel.data.rel.ro ${RELOCATING-0} : { *(.rel.data.rel.ro${RELOCATING+* .rel.gnu.linkonce.d.rel.ro.*}) }
-  .rela.data.rel.ro ${RELOCATING-0} : { *(.rela.data.rel.ro${RELOCATING+* .rela.gnu.linkonce.d.rel.ro.*}) }
+  .rel.data.rel.ro ${RELOCATING-0} : { *(.rel.data.rel.ro${RELOCATING+ .rel.data.rel.ro.* .rel.gnu.linkonce.d.rel.ro.*}) }
+  .rela.data.rel.ro ${RELOCATING-0} : { *(.rela.data.rel.ro${RELOCATING+ .rela.data.rel.ro.* .rela.gnu.linkonce.d.rel.ro.*}) }
   .rel.data     ${RELOCATING-0} : { *(.rel.data${RELOCATING+ .rel.data.* .rel.gnu.linkonce.d.*}) }
   .rela.data    ${RELOCATING-0} : { *(.rela.data${RELOCATING+ .rela.data.* .rela.gnu.linkonce.d.*}) }
   ${OTHER_READWRITE_RELOC_SECTIONS}
diff --git a/ld/scripttempl/elf64hppa.sc b/ld/scripttempl/elf64hppa.sc
index 584192a..136156d 100644
--- a/ld/scripttempl/elf64hppa.sc
+++ b/ld/scripttempl/elf64hppa.sc
< at >< at > -126,7 +126,7 < at >< at > if test -z "$GOT"; then
 fi
 DYNAMIC=".dynamic      ${RELOCATING-0} : { *(.dynamic) }"
 RODATA=".rodata       ${RELOCATING-0} : { *(.rodata${RELOCATING+ .rodata.* .gnu.linkonce.r.*}) }"
-DATARELRO=".data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro* .gnu.linkonce.d.rel.ro.*) }"
+DATARELRO=".data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro .data.rel.ro.* .gnu.linkonce.d.rel.ro.*) }"
 DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink)  *(.gnu.lto_*) }"
 if test -z "${NO_SMALL_DATA}"; then
   SBSS=".sbss         ${RELOCATING-0} :
< at >< at > -318,8 +318,8 < at >< at > eval $COMBRELOCCAT <<EOF
   .rel.rodata   ${RELOCATING-0} : { *(.rel.rodata${RELOCATING+ .rel.rodata.* .rel.gnu.linkonce.r.*}) }
   .rela.rodata  ${RELOCATING-0} : { *(.rela.rodata${RELOCATING+ .rela.rodata.* .rela.gnu.linkonce.r.*}) }
   ${OTHER_READONLY_RELOC_SECTIONS}
-  .rel.data.rel.ro ${RELOCATING-0} : { *(.rel.data.rel.ro${RELOCATING+* .rel.gnu.linkonce.d.rel.ro.*}) }
-  .rela.data.rel.ro ${RELOCATING-0} : { *(.rela.data.rel.ro${RELOCATING+* .rela.gnu.linkonce.d.rel.ro.*}) }
+  .rel.data.rel.ro ${RELOCATING-0} : { *(.rel.data.rel.ro${RELOCATING+ .rel.data.rel.ro.* .rel.gnu.linkonce.d.rel.ro.*}) }
+  .rela.data.rel.ro ${RELOCATING-0} : { *(.rela.data.rel.ro${RELOCATING+ .rela.data.rel.ro.* .rela.gnu.linkonce.d.rel.ro.*}) }
   .rel.data     ${RELOCATING-0} : { *(.rel.data${RELOCATING+ .rel.data.* .rel.gnu.linkonce.d.*}) }
   .rela.data    ${RELOCATING-0} : { *(.rela.data${RELOCATING+ .rela.data.* .rela.gnu.linkonce.d.*}) }
   .rel.tdata${RELOCATING-0} : { *(.rel.tdata${RELOCATING+ .rel.tdata.* .rel.gnu.linkonce.td.*}) }
diff --git a/ld/scripttempl/elfxtensa.sc b/ld/scripttempl/elfxtensa.sc
index 53cec71..f9e5745 100644
--- a/ld/scripttempl/elfxtensa.sc
+++ b/ld/scripttempl/elfxtensa.sc
< at >< at > -139,7 +139,7 < at >< at > if test -z "$GOT"; then
 fi
 DYNAMIC=".dynamic      ${RELOCATING-0} : { *(.dynamic) }"
 RODATA=".rodata       ${RELOCATING-0} : { *(.rodata${RELOCATING+ .rodata.* .gnu.linkonce.r.*}) }"
-DATARELRO=".data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro* .gnu.linkonce.d.rel.ro.*) }"
+DATARELRO=".data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro .data.rel.ro.* .gnu.linkonce.d.rel.ro.*) }"
 DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink)  *(.gnu.lto_*) }"
 INIT_LIT=".init.literal 0 : { *(.init.literal)}"
 INIT=".init         0 : { *(.init)}"
< at >< at > -329,8 +329,8 < at >< at > eval $COMBRELOCCAT <<EOF
   .rel.rodata   ${RELOCATING-0} : { *(.rel.rodata${RELOCATING+ .rel.rodata.* .rel.gnu.linkonce.r.*}) }
   .rela.rodata  ${RELOCATING-0} : { *(.rela.rodata${RELOCATING+ .rela.rodata.* .rela.gnu.linkonce.r.*}) }
   ${OTHER_READONLY_RELOC_SECTIONS}
-  .rel.data.rel.ro ${RELOCATING-0} : { *(.rel.data.rel.ro${RELOCATING+* .rel.gnu.linkonce.d.rel.ro.*}) }
-  .rela.data.rel.ro ${RELOCATING-0} : { *(.rela.data.rel.ro${RELOCATING+* .rela.gnu.linkonce.d.rel.ro.*}) }
+  .rel.data.rel.ro ${RELOCATING-0} : { *(.rel.data.rel.ro${RELOCATING+ .rel.data.rel.ro.* .rel.gnu.linkonce.d.rel.ro.*}) }
+  .rela.data.rel.ro ${RELOCATING-0} : { *(.rela.data.rel.ro${RELOCATING+ .rela.data.rel.ro.* .rela.gnu.linkonce.d.rel.ro.*}) }
   .rel.data     ${RELOCATING-0} : { *(.rel.data${RELOCATING+ .rel.data.* .rel.gnu.linkonce.d.*}) }
   .rela.data    ${RELOCATING-0} : { *(.rela.data${RELOCATING+ .rela.data.* .rela.gnu.linkonce.d.*}) }
   .rel.tdata${RELOCATING-0} : { *(.rel.tdata${RELOCATING+ .rel.tdata.* .rel.gnu.linkonce.td.*}) }
diff --git a/ld/scripttempl/mep.sc b/ld/scripttempl/mep.sc
index e61342d..23b6c54 100644
--- a/ld/scripttempl/mep.sc
+++ b/ld/scripttempl/mep.sc
< at >< at > -113,7 +113,7 < at >< at > if test -z "$GOT"; then
 fi
 DYNAMIC=".dynamic      ${RELOCATING-0} : { *(.dynamic) }"
 RODATA=".rodata       ${RELOCATING-0} : { *(.rodata${RELOCATING+ .rodata.* .gnu.linkonce.r.*}) }"
-DATARELRO=".data.rel.ro : { *(.data.rel.ro.local) *(.data.rel.ro*) }"
+DATARELRO=".data.rel.ro : { *(.data.rel.ro.local) *(.data.rel.ro .data.rel.ro.*) }"
 DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink)  *(.gnu.lto_*) }"
 if test -z "${NO_SMALL_DATA}"; then
   SBSS=".sbss         ${RELOCATING-0} :
< at >< at > -245,8 +245,8 < at >< at > eval $COMBRELOCCAT <<EOF
   .rel.rodata   ${RELOCATING-0} : { *(.rel.rodata${RELOCATING+ .rel.rodata.* .rel.gnu.linkonce.r.*}) }
   .rela.rodata  ${RELOCATING-0} : { *(.rela.rodata${RELOCATING+ .rela.rodata.* .rela.gnu.linkonce.r.*}) }
   ${OTHER_READONLY_RELOC_SECTIONS}
-  .rel.data.rel.ro ${RELOCATING-0} : { *(.rel.data.rel.ro${RELOCATING+*}) }
-  .rela.data.rel.ro ${RELOCATING-0} : { *(.rel.data.rel.ro${RELOCATING+*}) }
+  .rel.data.rel.ro ${RELOCATING-0} : { *(.rel.data.rel.ro${RELOCATING+ .rel.data.rel.ro.*}) }
+  .rela.data.rel.ro ${RELOCATING-0} : { *(.rela.data.rel.ro${RELOCATING+ .rela.data.rel.ro.*}) }
   .rel.data     ${RELOCATING-0} : { *(.rel.data${RELOCATING+ .rel.data.* .rel.gnu.linkonce.d.*}) }
   .rela.data    ${RELOCATING-0} : { *(.rela.data${RELOCATING+ .rela.data.* .rela.gnu.linkonce.d.*}) }
   .rel.tdata${RELOCATING-0} : { *(.rel.tdata${RELOCATING+ .rel.tdata.* .rel.gnu.linkonce.td.*}) }

Re: [RFA] leb128.h: Umm, how about int64_t?

Ian Lance Taylor — 2012-05-23T18:30:57


This is OK.

Thanks.

Ian

Re: RFC: Displaying multibyte symbol names in readelf

Hans-Peter Nilsson — 2012-05-23T18:01:30

Test-cases, that it works for some common locale (possibly need
the testing framework to check that it exists, else flag as
UNTESTED) and as before for the "C" locale?

brgds, H-P

[RFA] leb128.h: Umm, how about int64_t?

Doug Evans — 2012-05-23T16:41:22

It turns out gdb can't use long long but it can use {,u}int64_t.

[Insert lament that we're debating whether to switch to C++ and yet
we can't even use C99. :-(]

I opted for renaming the functions instead of adding new ones
since there'd be no current users.  I left adding the long long
versions back for when there's an actual need for them.

Ok to check in?

2012-05-23  Doug Evans  <dje< at >google.com>

* leb128.h: #include stdint.h, inttypes.h.
(read_uleb128_to_uint64): Renamed from read_uleb128_to_ull.
Change to take a uint64_t * argument instead of unsigned long long.
(read_sleb128_to_uint64): Renamed from read_sleb128_to_ll.
Change to take an int64_t * argument instead of long long.

Index: leb128.h
===================================================================
RCS file: /cvs/src/src/include/leb128.h,v
retrieving revision 1.1
diff -u -p -r1.1 leb128.h
--- leb128.h22 May 2012 18:05:30 -00001.1
+++ leb128.h23 May 2012 16:27:53 -0000
< at >< at > -19,7 +19,12 < at >< at > Boston, MA 02110-1301, USA.  */
 
 /* The functions defined here can be speed critical.
    Since they are all pretty small we keep things simple and just define
-   them all as "static inline".  */
+   them all as "static inline".
+
+   WARNING: This file is used by GDB which is stuck at C90. :-(
+   Though it can use stdint.h, inttypes.h.
+   Therefore if you want to add support for "long long" you need
+   to wrap it in #ifdef CC_HAS_LONG_LONG.  */
 
 #ifndef LEB128_H
 #define LEB128_H
< at >< at > -30,6 +35,13 < at >< at > Boston, MA 02110-1301, USA.  */
 /* Get a definition for NULL, size_t.  */
 #include <stddef.h>
 
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+
 /* Decode the unsigned LEB128 constant at BUF into the variable pointed to
    by R, and return the number of bytes read.
    If we read off the end of the buffer, zero is returned,
< at >< at > -39,12 +51,12 < at >< at > Boston, MA 02110-1301, USA.  */
    read to avoid const-vs-non-const problems.  */
 
 static inline size_t
-read_uleb128_to_ull (const unsigned char *buf, const unsigned char *buf_end,
-     unsigned long long *r)
+read_uleb128_to_uint64 (const unsigned char *buf, const unsigned char *buf_end,
+uint64_t *r)
 {
   const unsigned char *p = buf;
   unsigned int shift = 0;
-  unsigned long long result = 0;
+  uint64_t result = 0;
   unsigned char byte;
 
   while (1)
< at >< at > -53,7 +65,7 < at >< at > read_uleb128_to_ull (const unsigned char
 return 0;
 
       byte = *p++;
-      result |= ((unsigned long long) (byte & 0x7f)) << shift;
+      result |= ((uint64_t) (byte & 0x7f)) << shift;
       if ((byte & 0x80) == 0)
 break;
       shift += 7;
< at >< at > -72,12 +84,12 < at >< at > read_uleb128_to_ull (const unsigned char
    read to avoid const-vs-non-const problems.  */
 
 static inline size_t
-read_sleb128_to_ll (const unsigned char *buf, const unsigned char *buf_end,
-    long long *r)
+read_sleb128_to_int64 (const unsigned char *buf, const unsigned char *buf_end,
+       int64_t *r)
 {
   const unsigned char *p = buf;
   unsigned int shift = 0;
-  long long result = 0;
+  int64_t result = 0;
   unsigned char byte;
 
   while (1)
< at >< at > -86,13 +98,13 < at >< at > read_sleb128_to_ll (const unsigned char 
 return 0;
 
       byte = *p++;
-      result |= ((unsigned long long) (byte & 0x7f)) << shift;
+      result |= ((uint64_t) (byte & 0x7f)) << shift;
       shift += 7;
       if ((byte & 0x80) == 0)
 break;
     }
   if (shift < (sizeof (*r) * 8) && (byte & 0x40) != 0)
-    result |= -(((unsigned long long) 1) << shift);
+    result |= -(((uint64_t) 1) << shift);
 
   *r = result;
   return p - buf;

[Patch,AVR] Support instrucions XCH, LAT, LAC, LAS

Georg-Johann Lay — 2012-05-23T16:15:50

This patch adds support for the XMEGA atomic memory instructions

o exchange
o load-and-set
o load-and-clear
o load-and-toggle


Johann


include/
* opcode/avr.h (AVR_ISA_XCH): New define.
(AVR_ISA_XMEGA): Use it.
(XCH, LAS, LAT, LAC): New XMEGA opcodes.

Re: PATCH: PR ld/13909: PR ld/12570 causes eh_frame_hdr section to be sometimes too large

Alan Modra — 2012-05-23T14:31:27

Why?  It's eh data like any other .eh_frame.



Your PLT eh_frame is discarded because it is not being set up early
enough.  elf-eh-frame.c:1166 "keep = value != 0;" gets a value of 0.

PowerPC has a problem with ordering too, in that .eh_frame_hdr is
stripped when only PLT/glink has eh_frame info.  I want to allow
sizing of the PLT/glink .eh_frame in elf_backend_size_dynamic_sections,
rather than sizing and filling in some data early like x86 does.
The following fixes the PowerPC problem, and should also fix the above
x86 problem.  You'll also be able to size plt_eh_frame to zero when
no plt section is needed.  I'm not going to commit this tonight
though.  It needs testing and I need sleep.

bfd/
* elflink.c (bfd_elf_size_dynamic_sections): Let the backend
size dynamic sections before stripping eh_frame_hdr.
(bfd_elf_gc_sections): Handle multiple .eh_frame sections.
ld/
* emultempl/elf32.em (gld${EMULATION_NAME}_after_open): Handle
multiple .eh_frame sections attached to bfd.

Index: bfd/elflink.c
===================================================================
RCS file: /cvs/src/src/bfd/elflink.c,v
retrieving revision 1.444
diff -u -p -r1.444 elflink.c
--- bfd/elflink.c23 May 2012 04:35:31 -00001.444
+++ bfd/elflink.c23 May 2012 13:31:03 -0000
< at >< at > -5584,17 +5584,9 < at >< at > bfd_elf_size_dynamic_sections (bfd *outp
       && ! (*bed->elf_backend_always_size_sections) (output_bfd, info))
     return FALSE;
 
-  if (! _bfd_elf_maybe_strip_eh_frame_hdr (info))
-    return FALSE;
-
   dynobj = elf_hash_table (info)->dynobj;
 
-  /* If there were no dynamic objects in the link, there is nothing to
-     do here.  */
-  if (dynobj == NULL)
-    return TRUE;
-
-  if (elf_hash_table (info)->dynamic_sections_created)
+  if (dynobj != NULL && elf_hash_table (info)->dynamic_sections_created)
     {
       struct elf_info_failed eif;
       struct elf_link_hash_entry *h;
< at >< at > -5897,11 +5889,15 < at >< at > bfd_elf_size_dynamic_sections (bfd *outp
 
   /* The backend must work out the sizes of all the other dynamic
      sections.  */
-  if (bed->elf_backend_size_dynamic_sections
+  if (dynobj != NULL
+      && bed->elf_backend_size_dynamic_sections != NULL
       && ! (*bed->elf_backend_size_dynamic_sections) (output_bfd, info))
     return FALSE;
 
-  if (elf_hash_table (info)->dynamic_sections_created)
+  if (! _bfd_elf_maybe_strip_eh_frame_hdr (info))
+    return FALSE;
+
+  if (dynobj != NULL && elf_hash_table (info)->dynamic_sections_created)
     {
       unsigned long section_sym_count;
       struct bfd_elf_version_tree *verdefs;
< at >< at > -12002,12 +11998,14 < at >< at > bfd_elf_gc_sections (bfd *abfd, struct b
       struct elf_reloc_cookie cookie;
 
       sec = bfd_get_section_by_name (sub, ".eh_frame");
-      if (sec && init_reloc_cookie_for_section (&cookie, info, sec))
+      while (sec && init_reloc_cookie_for_section (&cookie, info, sec))
 {
   _bfd_elf_parse_eh_frame (sub, info, sec, &cookie);
-  if (elf_section_data (sec)->sec_info)
+  if (elf_section_data (sec)->sec_info
+      && (sec->flags & SEC_LINKER_CREATED) == 0)
     elf_eh_frame_section (sub) = sec;
   fini_reloc_cookie_for_section (&cookie, sec);
+  sec = bfd_get_next_section_by_name (sec);
 }
     }
   _bfd_elf_end_eh_frame_parsing (info);
Index: ld/emultempl/elf32.em
===================================================================
RCS file: /cvs/src/src/ld/emultempl/elf32.em,v
retrieving revision 1.227
diff -u -p -r1.227 elf32.em
--- ld/emultempl/elf32.em16 May 2012 10:43:41 -00001.227
+++ ld/emultempl/elf32.em23 May 2012 13:31:26 -0000
< at >< at > -1142,10 +1142,11 < at >< at > gld${EMULATION_NAME}_after_open (void)
   if (!warn_eh_frame)
     {
       s = bfd_get_section_by_name (abfd, ".eh_frame");
-      warn_eh_frame
-= (s
-   && s->size > 8
-   && !bfd_is_abs_section (s->output_section));
+      while (s != NULL
+     && (s->size <= 8
+ || bfd_is_abs_section (s->output_section)))
+s = bfd_get_next_section_by_name (s);
+      warn_eh_frame = s != NULL;
     }
   if (elfbfd && warn_eh_frame)
     break;