* elf.c (special_sections): Move const qualifier.

	(special_sections_b..special_sections_t): Likewise.
	* elf32-arm.c (elf32_arm_symbian_get_sec_type_attr): Remove duplicate
	const.
	(elf32_arm_symbian_special_sections): Move const qualifier.
	* elf32-m32r.c: Similarly.
	* elf32-m68hc11.c: Similarly.
	* elf32-m68hc12.c: Similarly.
	* elf32-mcore.c: Similarly.
	* elf32-ppc.c: Similarly.
	* elf32-sh64.c: Similarly.
	* elf32-v850.c: Similarly.
	* elf32-xtensa.c: Similarly.
	* elf64-alpha.c: Similarly.
	* elf64-hppa.c: Similarly.
	* elf64-ppc.c: Similarly.
	* elf64-sh64.c: Similarly.
	* elfxx-ia64.c: Similarly.
	* elfxx-mips.c: Similarly.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 91d214f..b736ff1 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,25 @@
+2005-07-05  Alan Modra  <amodra@bigpond.net.au>
+
+       * elf.c (special_sections): Move const qualifier.
+       (special_sections_b..special_sections_t): Likewise.
+       * elf32-arm.c (elf32_arm_symbian_get_sec_type_attr): Remove duplicate
+       const.
+       (elf32_arm_symbian_special_sections): Move const qualifier.
+       * elf32-m32r.c: Similarly.
+       * elf32-m68hc11.c: Similarly.
+       * elf32-m68hc12.c: Similarly.
+       * elf32-mcore.c: Similarly.
+       * elf32-ppc.c: Similarly.
+       * elf32-sh64.c: Similarly.
+       * elf32-v850.c: Similarly.
+       * elf32-xtensa.c: Similarly.
+       * elf64-alpha.c: Similarly.
+       * elf64-hppa.c: Similarly.
+       * elf64-ppc.c: Similarly.
+       * elf64-sh64.c: Similarly.
+       * elfxx-ia64.c: Similarly.
+       * elfxx-mips.c: Similarly.
+
 2005-07-04  Kazuhiro Inaoka  <inaoka.kazuhiro@renesas.com>
 
        * elf32-m32r.c (m32r_elf_size_dynamic_sections): Use

diff --git a/bfd/elf.c b/bfd/elf.c
index 0f9b6c2..f141325 100644 (file)
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -2164,19 +2164,19 @@ bfd_section_from_elf_index (bfd *abfd, unsigned int index)
   return elf_elfsections (abfd)[index]->bfd_section;
 }
 
-static struct bfd_elf_special_section const special_sections_b[] =
+static const struct bfd_elf_special_section special_sections_b[] =
 {
   { ".bss",            4, -2, SHT_NOBITS,   SHF_ALLOC + SHF_WRITE },
   { NULL,              0,  0, 0,            0 }
 };
 
-static struct bfd_elf_special_section const special_sections_c[] =
+static const struct bfd_elf_special_section special_sections_c[] =
 {
   { ".comment",        8,  0, SHT_PROGBITS, 0 },
   { NULL,              0,  0, 0,            0 }
 };
 
-static struct bfd_elf_special_section const special_sections_d[] =
+static const struct bfd_elf_special_section special_sections_d[] =
 {
   { ".data",           5, -2, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
   { ".data1",          6,  0, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
@@ -2191,14 +2191,14 @@ static struct bfd_elf_special_section const special_sections_d[] =
   { NULL,              0,  0, 0,            0 }
 };
 
-static struct bfd_elf_special_section const special_sections_f[] =
+static const struct bfd_elf_special_section special_sections_f[] =
 {
   { ".fini",           5,  0, SHT_PROGBITS, SHF_ALLOC + SHF_EXECINSTR },
   { ".fini_array",    11,  0, SHT_FINI_ARRAY, SHF_ALLOC + SHF_WRITE },
   { NULL,              0,  0, 0,            0 }
 };
 
-static struct bfd_elf_special_section const special_sections_g[] =
+static const struct bfd_elf_special_section special_sections_g[] =
 {
   { ".gnu.linkonce.b",15, -2, SHT_NOBITS,   SHF_ALLOC + SHF_WRITE },
   { ".got",            4,  0, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
@@ -2210,13 +2210,13 @@ static struct bfd_elf_special_section const special_sections_g[] =
   { NULL,              0,  0, 0,            0 }
 };
 
-static struct bfd_elf_special_section const special_sections_h[] =
+static const struct bfd_elf_special_section special_sections_h[] =
 {
   { ".hash",           5,  0, SHT_HASH,     SHF_ALLOC },
   { NULL,              0,  0, 0,            0 }
 };
 
-static struct bfd_elf_special_section const special_sections_i[] =
+static const struct bfd_elf_special_section special_sections_i[] =
 {
   { ".init",           5,  0, SHT_PROGBITS, SHF_ALLOC + SHF_EXECINSTR },
   { ".init_array",    11,  0, SHT_INIT_ARRAY, SHF_ALLOC + SHF_WRITE },
@@ -2224,27 +2224,27 @@ static struct bfd_elf_special_section const special_sections_i[] =
   { NULL,              0,  0, 0,            0 }
 };
 
-static struct bfd_elf_special_section const special_sections_l[] =
+static const struct bfd_elf_special_section special_sections_l[] =
 {
   { ".line",           5,  0, SHT_PROGBITS, 0 },
   { NULL,              0,  0, 0,            0 }
 };
 
-static struct bfd_elf_special_section const special_sections_n[] =
+static const struct bfd_elf_special_section special_sections_n[] =
 {
   { ".note.GNU-stack",15,  0, SHT_PROGBITS, 0 },
   { ".note",           5, -1, SHT_NOTE,     0 },
   { NULL,              0,  0, 0,            0 }
 };
 
-static struct bfd_elf_special_section const special_sections_p[] =
+static const struct bfd_elf_special_section special_sections_p[] =
 {
   { ".preinit_array", 14,  0, SHT_PREINIT_ARRAY, SHF_ALLOC + SHF_WRITE },
   { ".plt",            4,  0, SHT_PROGBITS, SHF_ALLOC + SHF_EXECINSTR },
   { NULL,              0,  0, 0,            0 }
 };
 
-static struct bfd_elf_special_section const special_sections_r[] =
+static const struct bfd_elf_special_section special_sections_r[] =
 {
   { ".rodata",         7, -2, SHT_PROGBITS, SHF_ALLOC },
   { ".rodata1",        8,  0, SHT_PROGBITS, SHF_ALLOC },
@@ -2253,7 +2253,7 @@ static struct bfd_elf_special_section const special_sections_r[] =
   { NULL,              0,  0, 0,            0 }
 };
 
-static struct bfd_elf_special_section const special_sections_s[] =
+static const struct bfd_elf_special_section special_sections_s[] =
 {
   { ".shstrtab",       9,  0, SHT_STRTAB,   0 },
   { ".strtab",         7,  0, SHT_STRTAB,   0 },
@@ -2262,7 +2262,7 @@ static struct bfd_elf_special_section const special_sections_s[] =
   { NULL,              0,  0, 0,            0 }
 };
 
-static struct bfd_elf_special_section const special_sections_t[] =
+static const struct bfd_elf_special_section special_sections_t[] =
 {
   { ".text",           5, -2, SHT_PROGBITS, SHF_ALLOC + SHF_EXECINSTR },
   { ".tbss",           5, -2, SHT_NOBITS,   SHF_ALLOC + SHF_WRITE + SHF_TLS },
@@ -2270,7 +2270,7 @@ static struct bfd_elf_special_section const special_sections_t[] =
   { NULL,              0,  0, 0,            0 }
 };
 
-static struct bfd_elf_special_section const *special_sections[] =
+static const struct bfd_elf_special_section *special_sections[] =
 {
   special_sections_b,          /* 'b' */
   special_sections_c,          /* 'b' */

diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index d140e67..e04029d 100644 (file)
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -6942,7 +6942,7 @@ elf32_arm_symbian_link_hash_table_create (bfd *abfd)
   return ret;
 }     
 
-static struct bfd_elf_special_section const
+static const struct bfd_elf_special_section
 elf32_arm_symbian_special_sections[] =
 {
   /* In a BPABI executable, the dynamic linking sections do not go in
@@ -6966,7 +6966,7 @@ elf32_arm_symbian_special_sections[] =
 static const struct bfd_elf_special_section *
 elf32_arm_symbian_get_sec_type_attr (bfd *abfd, asection *sec)
 {
-  const struct bfd_elf_special_section const *ssect;
+  const struct bfd_elf_special_section *ssect;
 
   /* See if this is one of the special sections.  */
   if (sec->name == NULL)

diff --git a/bfd/elf32-m32r.c b/bfd/elf32-m32r.c
index 6972ad3..d29a7d3 100644 (file)
--- a/bfd/elf32-m32r.c
+++ b/bfd/elf32-m32r.c
@@ -4013,7 +4013,7 @@ m32r_elf_check_relocs (bfd *abfd,
   return TRUE;
 }
 
-static struct bfd_elf_special_section const m32r_elf_special_sections[] =
+static const struct bfd_elf_special_section m32r_elf_special_sections[] =
 {
   { ".sbss",    5, -2, SHT_NOBITS,   SHF_ALLOC + SHF_WRITE },
   { ".sdata",   6, -2, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
@@ -4023,7 +4023,7 @@ static struct bfd_elf_special_section const m32r_elf_special_sections[] =
 static const struct bfd_elf_special_section *
 m32r_elf_get_sec_type_attr (bfd *abfd, asection *sec)
 {
-  const struct bfd_elf_special_section const *ssect;
+  const struct bfd_elf_special_section *ssect;
 
   /* See if this is one of the special sections.  */
   if (sec->name == NULL)

diff --git a/bfd/elf32-m68hc11.c b/bfd/elf32-m68hc11.c
index 0cdeef7..34cdd9c 100644 (file)
--- a/bfd/elf32-m68hc11.c
+++ b/bfd/elf32-m68hc11.c
@@ -1257,7 +1257,7 @@ m68hc11_elf_relax_delete_bytes (bfd *abfd, asection *sec,
      are located in .page0.
    - The .vectors is the section that represents the interrupt
      vectors.  */
-static struct bfd_elf_special_section const elf32_m68hc11_special_sections[] =
+static const struct bfd_elf_special_section elf32_m68hc11_special_sections[] =
 {
   { ".eeprom",   7, 0, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
   { ".page0",    6, 0, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
@@ -1269,7 +1269,7 @@ static struct bfd_elf_special_section const elf32_m68hc11_special_sections[] =
 static const struct bfd_elf_special_section *
 elf32_m68hc11_get_sec_type_attr (bfd *abfd, asection *sec)
 {
-  const struct bfd_elf_special_section const *ssect;
+  const struct bfd_elf_special_section *ssect;
 
   /* See if this is one of the special sections.  */
   if (sec->name == NULL)

diff --git a/bfd/elf32-m68hc12.c b/bfd/elf32-m68hc12.c
index 6a3a86e..34461b3 100644 (file)
--- a/bfd/elf32-m68hc12.c
+++ b/bfd/elf32-m68hc12.c
@@ -535,7 +535,7 @@ m68hc12_elf_set_mach_from_flags (bfd *abfd)
      Page0 accesses are faster on the M68HC12.
    - The .vectors is the section that represents the interrupt
      vectors.  */
-static struct bfd_elf_special_section const elf32_m68hc12_special_sections[] =
+static const struct bfd_elf_special_section elf32_m68hc12_special_sections[] =
 {
   { ".eeprom",   7, 0, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
   { ".page0",    6, 0, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
@@ -547,7 +547,7 @@ static struct bfd_elf_special_section const elf32_m68hc12_special_sections[] =
 static const struct bfd_elf_special_section *
 elf32_m68hc12_get_sec_type_attr (bfd *abfd, asection *sec)
 {
-  const struct bfd_elf_special_section const *ssect;
+  const struct bfd_elf_special_section *ssect;
 
   /* See if this is one of the special sections.  */
   if (sec->name == NULL)

diff --git a/bfd/elf32-mcore.c b/bfd/elf32-mcore.c
index cd2590d..0a48594 100644 (file)
--- a/bfd/elf32-mcore.c
+++ b/bfd/elf32-mcore.c
@@ -635,7 +635,7 @@ mcore_elf_check_relocs (bfd * abfd,
   return TRUE;
 }
 
-static struct bfd_elf_special_section const mcore_elf_special_sections[]=
+static const struct bfd_elf_special_section mcore_elf_special_sections[]=
 {
   { ".ctors",   6, -2, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
   { ".dtors",   6, -2, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
@@ -645,7 +645,7 @@ static struct bfd_elf_special_section const mcore_elf_special_sections[]=
 static const struct bfd_elf_special_section *
 mcore_elf_get_sec_type_attr (bfd *abfd, asection *sec)
 {
-  const struct bfd_elf_special_section const *ssect;
+  const struct bfd_elf_special_section *ssect;
 
   /* See if this is one of the special sections.  */
   if (sec->name == NULL)

diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c
index 1569fb0..071f448 100644 (file)
--- a/bfd/elf32-ppc.c
+++ b/bfd/elf32-ppc.c
@@ -1828,7 +1828,7 @@ ppc_elf_additional_program_headers (bfd *abfd)
    that the linker doesn't crater when trying to make more than
    2 sections.  */
 
-static struct bfd_elf_special_section const ppc_elf_special_sections[] =
+static const struct bfd_elf_special_section ppc_elf_special_sections[] =
 {
   { ".plt",              4,  0, SHT_NOBITS,   SHF_ALLOC + SHF_EXECINSTR },
   { ".sbss",             5, -2, SHT_NOBITS,   SHF_ALLOC + SHF_WRITE },
@@ -1849,7 +1849,7 @@ static struct bfd_elf_special_section ppc_alt_plt =
 static const struct bfd_elf_special_section *
 ppc_elf_get_sec_type_attr (bfd *abfd ATTRIBUTE_UNUSED, asection *sec)
 {
-  const struct bfd_elf_special_section const *ssect;
+  const struct bfd_elf_special_section *ssect;
 
   /* See if this is one of the special sections.  */
   if (sec->name == NULL)

diff --git a/bfd/elf32-sh64.c b/bfd/elf32-sh64.c
index d9b3f38..c140bf4 100644 (file)
--- a/bfd/elf32-sh64.c
+++ b/bfd/elf32-sh64.c
@@ -754,7 +754,7 @@ sh64_elf_merge_symbol_attribute (struct elf_link_hash_entry *h,
   return;
 }
 
-static struct bfd_elf_special_section const sh64_elf_special_sections[] =
+static const struct bfd_elf_special_section sh64_elf_special_sections[] =
 {
   { ".cranges", 8, 0, SHT_PROGBITS, 0 },
   { NULL,       0, 0, 0,            0 }
@@ -763,7 +763,7 @@ static struct bfd_elf_special_section const sh64_elf_special_sections[] =
 static const struct bfd_elf_special_section *
 sh64_elf_get_sec_type_attr (bfd *abfd, asection *sec)
 {
-  const struct bfd_elf_special_section const *ssect;
+  const struct bfd_elf_special_section *ssect;
 
   /* See if this is one of the special sections.  */
   if (sec->name == NULL)

diff --git a/bfd/elf32-v850.c b/bfd/elf32-v850.c
index 26f479c..ac7ac5e 100644 (file)
--- a/bfd/elf32-v850.c
+++ b/bfd/elf32-v850.c
@@ -3024,7 +3024,7 @@ v850_elf_relax_section (bfd *abfd,
   goto finish;
 }
 
-static struct bfd_elf_special_section const v850_elf_special_sections[] =
+static const struct bfd_elf_special_section v850_elf_special_sections[] =
 {
   { ".call_table_data", 16,  0, SHT_PROGBITS,     (SHF_ALLOC
                                                    + SHF_WRITE) },
@@ -3058,7 +3058,7 @@ static struct bfd_elf_special_section const v850_elf_special_sections[] =
 static const struct bfd_elf_special_section *
 v850_elf_get_sec_type_attr (bfd *abfd, asection *sec)
 {
-  const struct bfd_elf_special_section const *ssect;
+  const struct bfd_elf_special_section *ssect;
 
   /* See if this is one of the special sections.  */
   if (sec->name == NULL)

diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
index 69cc6ba..b18003c 100644 (file)
--- a/bfd/elf32-xtensa.c
+++ b/bfd/elf32-xtensa.c
@@ -9482,7 +9482,7 @@ xtensa_callback_required_dependence (bfd *abfd,
 /* The default literal sections should always be marked as "code" (i.e.,
    SHF_EXECINSTR).  This is particularly important for the Linux kernel
    module loader so that the literals are not placed after the text.  */
-static struct bfd_elf_special_section const elf_xtensa_special_sections[] =
+static const struct bfd_elf_special_section elf_xtensa_special_sections[] =
 {
   { ".fini.literal", 13, 0, SHT_PROGBITS, SHF_ALLOC + SHF_EXECINSTR },
   { ".init.literal", 13, 0, SHT_PROGBITS, SHF_ALLOC + SHF_EXECINSTR },
@@ -9493,7 +9493,7 @@ static struct bfd_elf_special_section const elf_xtensa_special_sections[] =
 static const struct bfd_elf_special_section *
 elf_xtensa_get_sec_type_attr (bfd *abfd, asection *sec)
 {
-  const struct bfd_elf_special_section const *ssect;
+  const struct bfd_elf_special_section *ssect;
 
   /* See if this is one of the special sections.  */
   if (sec->name == NULL)

diff --git a/bfd/elf64-alpha.c b/bfd/elf64-alpha.c
index 52f82d2..a04fe21 100644 (file)
--- a/bfd/elf64-alpha.c
+++ b/bfd/elf64-alpha.c
@@ -5162,7 +5162,7 @@ elf64_alpha_reloc_type_class (const Elf_Internal_Rela *rela)
     }
 }
 \f
-static struct bfd_elf_special_section const elf64_alpha_special_sections[] =
+static const struct bfd_elf_special_section elf64_alpha_special_sections[] =
 {
   { ".sbss",  5, -2, SHT_NOBITS,   SHF_ALLOC + SHF_WRITE + SHF_ALPHA_GPREL },
   { ".sdata", 6, -2, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE + SHF_ALPHA_GPREL },
@@ -5172,7 +5172,7 @@ static struct bfd_elf_special_section const elf64_alpha_special_sections[] =
 static const struct bfd_elf_special_section *
 elf64_alpha_get_sec_type_attr (bfd *abfd, asection *sec)
 {
-  const struct bfd_elf_special_section const *ssect;
+  const struct bfd_elf_special_section *ssect;
 
   /* See if this is one of the special sections.  */
   if (sec->name == NULL)

diff --git a/bfd/elf64-hppa.c b/bfd/elf64-hppa.c
index 267c623..88b0bfe 100644 (file)
--- a/bfd/elf64-hppa.c
+++ b/bfd/elf64-hppa.c
@@ -2671,7 +2671,7 @@ elf64_hppa_elf_get_symbol_type (elf_sym, type)
     return type;
 }
 
-static struct bfd_elf_special_section const elf64_hppa_special_sections[] =
+static const struct bfd_elf_special_section elf64_hppa_special_sections[] =
 {
   { ".fini",    5, 0, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
   { ".init",    5, 0, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
@@ -2681,7 +2681,7 @@ static struct bfd_elf_special_section const elf64_hppa_special_sections[] =
 static const struct bfd_elf_special_section *
 elf64_hppa_get_sec_type_attr (bfd *abfd, asection *sec)
 {
-  const struct bfd_elf_special_section const *ssect;
+  const struct bfd_elf_special_section *ssect;
 
   /* See if this is one of the special sections.  */
   if (sec->name == NULL)

diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
index 570754a..99bbe18 100644 (file)
--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
@@ -2508,7 +2508,7 @@ ppc64_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
 
 /* Add extra PPC sections.  */
 
-static struct bfd_elf_special_section const ppc64_elf_special_sections[]=
+static const struct bfd_elf_special_section ppc64_elf_special_sections[]=
 {
   { ".plt",     4,  0, SHT_NOBITS,   0 },
   { ".sbss",    5, -2, SHT_NOBITS,   SHF_ALLOC + SHF_WRITE },
@@ -2522,7 +2522,7 @@ static struct bfd_elf_special_section const ppc64_elf_special_sections[]=
 static const struct bfd_elf_special_section *
 ppc64_elf_get_sec_type_attr (bfd *abfd, asection *sec)
 {
-  const struct bfd_elf_special_section const *ssect;
+  const struct bfd_elf_special_section *ssect;
 
   /* See if this is one of the special sections.  */
   if (sec->name == NULL)

diff --git a/bfd/elf64-sh64.c b/bfd/elf64-sh64.c
index 16fbe5e..0bad229 100644 (file)
--- a/bfd/elf64-sh64.c
+++ b/bfd/elf64-sh64.c
@@ -4068,7 +4068,7 @@ sh64_elf64_merge_symbol_attribute (struct elf_link_hash_entry *h,
   return;
 }
 
-static struct bfd_elf_special_section const sh64_elf64_special_sections[]=
+static const struct bfd_elf_special_section sh64_elf64_special_sections[]=
 {
   { ".cranges", 8, 0, SHT_PROGBITS, 0 },
   { NULL,       0, 0, 0,            0 }
@@ -4077,7 +4077,7 @@ static struct bfd_elf_special_section const sh64_elf64_special_sections[]=
 static const struct bfd_elf_special_section *
 sh64_elf64_get_sec_type_attr (bfd *abfd, asection *sec)
 {
-  const struct bfd_elf_special_section const *ssect;
+  const struct bfd_elf_special_section *ssect;
 
   /* See if this is one of the special sections.  */
   if (sec->name == NULL)

diff --git a/bfd/elfxx-ia64.c b/bfd/elfxx-ia64.c
index d9f8762..ab59a1c 100644 (file)
--- a/bfd/elfxx-ia64.c
+++ b/bfd/elfxx-ia64.c
@@ -5050,7 +5050,7 @@ elfNN_ia64_reloc_type_class (rela)
     }
 }
 
-static struct bfd_elf_special_section const elfNN_ia64_special_sections[] =
+static const struct bfd_elf_special_section elfNN_ia64_special_sections[] =
 {
   { ".sbss",  5, -1, SHT_NOBITS,   SHF_ALLOC + SHF_WRITE + SHF_IA_64_SHORT },
   { ".sdata", 6, -1, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE + SHF_IA_64_SHORT },
@@ -5060,7 +5060,7 @@ static struct bfd_elf_special_section const elfNN_ia64_special_sections[] =
 static const struct bfd_elf_special_section *
 elfNN_ia64_get_sec_type_attr (bfd *abfd, asection *sec)
 {
-  const struct bfd_elf_special_section const *ssect;
+  const struct bfd_elf_special_section *ssect;
 
   /* See if this is one of the special sections.  */
   if (sec->name == NULL)

diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index dc75331..d96400d 100644 (file)
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -9969,7 +9969,7 @@ _bfd_mips_elf_print_private_bfd_data (bfd *abfd, void *ptr)
   return TRUE;
 }
 
-struct bfd_elf_special_section const _bfd_mips_elf_special_sections[] =
+const struct bfd_elf_special_section _bfd_mips_elf_special_sections[] =
 {
   { ".lit4",   5,  0, SHT_PROGBITS,   SHF_ALLOC + SHF_WRITE + SHF_MIPS_GPREL },
   { ".lit8",   5,  0, SHT_PROGBITS,   SHF_ALLOC + SHF_WRITE + SHF_MIPS_GPREL },
@@ -9983,7 +9983,7 @@ struct bfd_elf_special_section const _bfd_mips_elf_special_sections[] =
 const struct bfd_elf_special_section *
 _bfd_mips_elf_get_sec_type_attr (bfd *abfd, asection *sec)
 {
-  const struct bfd_elf_special_section const *ssect;
+  const struct bfd_elf_special_section *ssect;
 
   /* See if this is one of the special sections.  */
   if (sec->name == NULL)