* elf32-i386.c (elf_i386_check_relocs): Don't cast a unary &

address operator, as that breaks GCC's strict aliasing rules.
(elf_i386_size_dynamic_sections): Avoid the need for type
punning.
* elf64-x86-64.c (elf_x86_64_check_relocs): Don't cast a unary
& address operator, as that breaks GCC's strict aliasing
rules.
(elf_x86_64_size_dynamic_sections): Avoid the need for type
punning.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 6746e07867ca74157a0b874ae6a95872484d3067..33f5f558962c0f7bdf02666954b606777491d7ca 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,15 @@
+2005-08-31  DJ Delorie  <dj@redhat.com>
+
+       * elf32-i386.c (elf_i386_check_relocs): Don't cast a unary &
+       address operator, as that breaks GCC's strict aliasing rules.
+       (elf_i386_size_dynamic_sections): Avoid the need for type
+       punning.
+       * elf64-x86-64.c (elf_x86_64_check_relocs): Don't cast a unary
+       & address operator, as that breaks GCC's strict aliasing
+       rules.
+       (elf_x86_64_size_dynamic_sections): Avoid the need for type
+       punning.
+
 2005-08-30  Phil Edwards  <phil@codesourcery.com>
 
        * config.bfd (i[3-7]86-*-vxworks):  Match vxworks* instead.

diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index 78c4fa34672a7065fa2c894c3dcf4bad2d3ad605..acb9f1936eed64165d0b75859f7f168729174664 100644 (file)
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -1165,6 +1165,7 @@ elf_i386_check_relocs (bfd *abfd,
                }
              else
                {
+                 void **vpp;
                  /* Track dynamic relocs needed for local syms too.
                     We really need local syms available to do this
                     easily.  Oh well.  */
@@ -1175,8 +1176,8 @@ elf_i386_check_relocs (bfd *abfd,
                  if (s == NULL)
                    return FALSE;
 
-                 head = ((struct elf_i386_dyn_relocs **)
-                         &elf_section_data (s)->local_dynrel);
+                 vpp = &elf_section_data (s)->local_dynrel;
+                 head = (struct elf_i386_dyn_relocs **)vpp;
                }
 
              p = *head;
@@ -1823,8 +1824,8 @@ elf_i386_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
        {
          struct elf_i386_dyn_relocs *p;
 
-         for (p = *((struct elf_i386_dyn_relocs **)
-                    &elf_section_data (s)->local_dynrel);
+         for (p = ((struct elf_i386_dyn_relocs *)
+                    elf_section_data (s)->local_dynrel);
               p != NULL;
               p = p->next)
            {

diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index 4c7a49e3a7591a9e6c9420473fd4bda608e8e426..0520906b22735fa64bc68315428d75181a1decdd 100644 (file)
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -946,6 +946,7 @@ elf64_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
                }
              else
                {
+                 void **vpp;
                  /* Track dynamic relocs needed for local syms too.
                     We really need local syms available to do this
                     easily.  Oh well.  */
@@ -956,8 +957,10 @@ elf64_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
                  if (s == NULL)
                    return FALSE;
 
-                 head = ((struct elf64_x86_64_dyn_relocs **)
-                         &elf_section_data (s)->local_dynrel);
+                 /* Beware of type punned pointers vs strict aliasing
+                    rules.  */
+                 vpp = &(elf_section_data (s)->local_dynrel);
+                 head = (struct elf64_x86_64_dyn_relocs **)vpp;
                }
 
              p = *head;
@@ -1586,8 +1589,8 @@ elf64_x86_64_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
        {
          struct elf64_x86_64_dyn_relocs *p;
 
-         for (p = *((struct elf64_x86_64_dyn_relocs **)
-                    &elf_section_data (s)->local_dynrel);
+         for (p = (struct elf64_x86_64_dyn_relocs *)
+                   (elf_section_data (s)->local_dynrel);
               p != NULL;
               p = p->next)
            {