From: Pedro Alves Date: Wed, 22 Oct 2014 04:58:23 +0000 (+0100) Subject: Remove duplicate const X-Git-Tag: users/hjl/linux/release/2.25.51.0.2~2^2~36^2~24 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0fa9c223ddc05a4b823bc7982dce8ba3b45d903f;p=thirdparty%2Fbinutils-gdb.git Remove duplicate const 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. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 419ced49f9b..3319194348c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +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. diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index 4f9bb40bd46..d7cd6e5af8f 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 db297bdb580..1aabe763423 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,