From 0fa9c223ddc05a4b823bc7982dce8ba3b45d903f Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Wed, 22 Oct 2014 05:58:23 +0100 Subject: [PATCH] Remove duplicate const MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Building --enable-targets=all in C++ mode fails with: gdb/sparc-sol2-tdep.c:179:7: error: duplicate ‘const’ gdb/arm-tdep.c:13878:33: error: duplicate ‘const’ gdb/arm-tdep.c:13891:33: error: duplicate ‘const’ gdb/ChangeLog: 2015-02-27 Pedro Alves * arm-tdep.c (decode_insn) : Remove duplicate const. * sparc-sol2-tdep.c (sparc_sol2_static_transform_name): Remove duplicate const. --- gdb/ChangeLog | 7 +++++++ gdb/arm-tdep.c | 4 ++-- gdb/sparc-sol2-tdep.c | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 419ced4..3319194 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,12 @@ 2015-02-27 Pedro Alves + * arm-tdep.c (decode_insn) : + Remove duplicate const. + * sparc-sol2-tdep.c (sparc_sol2_static_transform_name): Remove + duplicate const. + +2015-02-27 Pedro Alves + * cp-valprint.c (vtbl_ptr_name): Use EXPORTED_CONST. * guile/guile.c (extension_language_guile): Use EXPORTED_CONST. * features/feature_to_c.sh: Tag the generated xml_builtin array diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index 4f9bb40..d7cd6e5 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -13811,7 +13811,7 @@ decode_insn (insn_decode_record *arm_record, record_type_t record_type, { /* (Starting from numerical 0); bits 25, 26, 27 decodes type of arm instruction. */ - static const sti_arm_hdl_fp_t const arm_handle_insn[8] = + static const sti_arm_hdl_fp_t arm_handle_insn[8] = { arm_record_data_proc_misc_ld_str, /* 000. */ arm_record_data_proc_imm, /* 001. */ @@ -13824,7 +13824,7 @@ decode_insn (insn_decode_record *arm_record, record_type_t record_type, }; /* (Starting from numerical 0); bits 13,14,15 decodes type of thumb instruction. */ - static const sti_arm_hdl_fp_t const thumb_handle_insn[8] = + static const sti_arm_hdl_fp_t thumb_handle_insn[8] = { \ thumb_record_shift_add_sub, /* 000. */ thumb_record_add_sub_cmp_mov, /* 001. */ diff --git a/gdb/sparc-sol2-tdep.c b/gdb/sparc-sol2-tdep.c index db297bd..1aabe76 100644 --- a/gdb/sparc-sol2-tdep.c +++ b/gdb/sparc-sol2-tdep.c @@ -223,7 +223,7 @@ static const struct frame_unwind sparc32_sol2_sigtramp_frame_unwind = /* Unglobalize NAME. */ -const const char * +const char * sparc_sol2_static_transform_name (const char *name) { /* The Sun compilers (Sun ONE Studio, Forte Developer, Sun WorkShop, -- 2.7.4