From 5bb3703f01dd574faebbd3a69f4c64dbfee6a701 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 9 Nov 2012 08:29:34 +0000 Subject: [PATCH] Remove trailing redundant `;' bfd/ * aout-tic30.c (MY_final_link_callback): Remove trailing redundant `;'. * coff-h8500.c (extra_case): Likewise. (bfd_coff_reloc16_get_value): Likewise. * dwarf2.c (_bfd_dwarf2_cleanup_debug_info): Likewise. * elf.c (_bfd_elf_slurp_version_tables): Likewise. * elf32-frv.c (elf32_frv_relocate_section): Likewise. * elf32-v850.c (v850_elf_perform_relocation): Likewise. * opncls.c (bfd_calc_gnu_debuglink_crc32): Likewise. * plugin.c (add_symbols): Likewise. * reloc.c (bfd_check_overflow): Likewise. * vms-lib.c (_bfd_vms_lib_archive_p): Likewise. binutils/ * coffgrok.c (coff_grok): Remove trailing redundant `;'. * resrc.c (open_input_stream): Likewise. gas/ * config/atof-ieee.c (gen_to_words): Remove trailing redundant `;'. * config/atof-vax.c (flonum_gen2vax): Likewise. * config/tc-d10v.c (write_2_short): Likewise. * config/tc-i386-intel.c (i386_intel_simplify): Likewise. * config/tc-s390.c (tc_s390_force_relocation): Likewise. * config/tc-v850.c (md_parse_option): Likewise. * config/tc-xtensa.c (find_address_of_next_align_frag): Likewise. * dwarf2dbg.c (out_header): Likewise. * symbols.c (dollar_label_name): Likewise. (fb_label_name): Likewise. ld/ * testplug.c (record_add_file): Remove trailing redundant `;'. opcodes/ * aarch64-opc.h (gen_mask): Remove trailing redundant `;'. * ia64-gen.c (fetch_insn_class): Likewise. --- bfd/ChangeLog | 15 +++++++++++++++ bfd/aout-tic30.c | 2 +- bfd/coff-h8500.c | 4 ++-- bfd/dwarf2.c | 2 +- bfd/elf.c | 2 +- bfd/elf32-frv.c | 2 +- bfd/elf32-v850.c | 2 +- bfd/opncls.c | 2 +- bfd/plugin.c | 2 +- bfd/reloc.c | 2 +- bfd/vms-lib.c | 2 +- binutils/ChangeLog | 5 +++++ binutils/coffgrok.c | 2 +- binutils/resrc.c | 2 +- gas/ChangeLog | 14 ++++++++++++++ gas/config/atof-ieee.c | 2 +- gas/config/atof-vax.c | 2 +- gas/config/tc-d10v.c | 2 +- gas/config/tc-i386-intel.c | 2 +- gas/config/tc-s390.c | 2 +- gas/config/tc-v850.c | 2 +- gas/config/tc-xtensa.c | 2 +- gas/dwarf2dbg.c | 2 +- gas/symbols.c | 4 ++-- ld/ChangeLog | 4 ++++ ld/testplug.c | 2 +- opcodes/ChangeLog | 5 +++++ opcodes/aarch64-opc.h | 2 +- opcodes/ia64-gen.c | 2 +- 29 files changed, 69 insertions(+), 26 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 4d32f216bb..85e94b9b5b 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,18 @@ +2012-11-09 H.J. Lu + + * aout-tic30.c (MY_final_link_callback): Remove trailing + redundant `;'. + * coff-h8500.c (extra_case): Likewise. + (bfd_coff_reloc16_get_value): Likewise. + * dwarf2.c (_bfd_dwarf2_cleanup_debug_info): Likewise. + * elf.c (_bfd_elf_slurp_version_tables): Likewise. + * elf32-frv.c (elf32_frv_relocate_section): Likewise. + * elf32-v850.c (v850_elf_perform_relocation): Likewise. + * opncls.c (bfd_calc_gnu_debuglink_crc32): Likewise. + * plugin.c (add_symbols): Likewise. + * reloc.c (bfd_check_overflow): Likewise. + * vms-lib.c (_bfd_vms_lib_archive_p): Likewise. + 2012-11-08 Tom Tromey * elf.c (elfcore_grok_note) : New case; make diff --git a/bfd/aout-tic30.c b/bfd/aout-tic30.c index f3b0d36a3d..d8ce9be32b 100644 --- a/bfd/aout-tic30.c +++ b/bfd/aout-tic30.c @@ -701,7 +701,7 @@ MY_final_link_callback (bfd *abfd, *ptreloff = obj_datasec (abfd)->filepos + execp->a_data; *pdreloff = *ptreloff + execp->a_trsize; - *psymoff = *pdreloff + execp->a_drsize;; + *psymoff = *pdreloff + execp->a_drsize; } #endif diff --git a/bfd/coff-h8500.c b/bfd/coff-h8500.c index 1fae964924..9b64599921 100644 --- a/bfd/coff-h8500.c +++ b/bfd/coff-h8500.c @@ -222,7 +222,7 @@ extra_case (bfd *in_abfd, v = (v & 0x00ffffff) | (o & 0xff00000); bfd_put_32 (in_abfd, (bfd_vma) v, data + *dst_ptr -1); (*dst_ptr) += 3; - (*src_ptr) += 3;; + (*src_ptr) += 3; } break; case R_H8500_IMM32: @@ -230,7 +230,7 @@ extra_case (bfd *in_abfd, int v = bfd_coff_reloc16_get_value (reloc, link_info, input_section); bfd_put_32 (in_abfd, (bfd_vma) v, data + *dst_ptr); (*dst_ptr) += 4; - (*src_ptr) += 4;; + (*src_ptr) += 4; } break; diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c index b96b6abffd..1153c39296 100644 --- a/bfd/dwarf2.c +++ b/bfd/dwarf2.c @@ -3624,7 +3624,7 @@ _bfd_dwarf2_find_inliner_info (bfd *abfd ATTRIBUTE_UNUSED, void _bfd_dwarf2_cleanup_debug_info (bfd *abfd, void **pinfo) { - struct dwarf2_debug *stash = (struct dwarf2_debug *) *pinfo;; + struct dwarf2_debug *stash = (struct dwarf2_debug *) *pinfo; struct comp_unit *each; if (abfd == NULL || stash == NULL) diff --git a/bfd/elf.c b/bfd/elf.c index 4465f480af..f40e81bbd5 100644 --- a/bfd/elf.c +++ b/bfd/elf.c @@ -7362,7 +7362,7 @@ error_return_verdef: Elf_Internal_Verdef *iverdef; Elf_Internal_Verdaux *iverdaux; - iverdef = &elf_tdata (abfd)->verdef[freeidx - 1];; + iverdef = &elf_tdata (abfd)->verdef[freeidx - 1]; iverdef->vd_version = VER_DEF_CURRENT; iverdef->vd_flags = 0; diff --git a/bfd/elf32-frv.c b/bfd/elf32-frv.c index 148173308d..c2b74c640b 100644 --- a/bfd/elf32-frv.c +++ b/bfd/elf32-frv.c @@ -3363,7 +3363,7 @@ elf32_frv_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, with ldi @(grB, #gottlsoff12(symbol+offset), grC. Preserve the packing bit. */ insn = (insn & (unsigned long)0xfe03f000) - | (unsigned long)0x00c80000;; + | (unsigned long)0x00c80000; bfd_put_32 (input_bfd, insn, contents + rel->r_offset); r_type = R_FRV_GOTTLSOFF12; diff --git a/bfd/elf32-v850.c b/bfd/elf32-v850.c index 11fbbb4cbc..6cf275f279 100644 --- a/bfd/elf32-v850.c +++ b/bfd/elf32-v850.c @@ -624,7 +624,7 @@ v850_elf_perform_relocation (bfd *abfd, case R_V850_CALLT_15_16_OFFSET: insn = bfd_get_16 (abfd, address); - addend += insn & 0xfffe;; + addend += insn & 0xfffe; saddend = (bfd_signed_vma) addend; diff --git a/bfd/opncls.c b/bfd/opncls.c index 728b2b02a6..7bd2fdc3d1 100644 --- a/bfd/opncls.c +++ b/bfd/opncls.c @@ -1135,7 +1135,7 @@ bfd_calc_gnu_debuglink_crc32 (unsigned long crc, crc = ~crc & 0xffffffff; for (end = buf + len; buf < end; ++ buf) crc = crc32_table[(crc ^ *buf) & 0xff] ^ (crc >> 8); - return ~crc & 0xffffffff;; + return ~crc & 0xffffffff; } diff --git a/bfd/plugin.c b/bfd/plugin.c index 8d2c4b2014..1319203488 100644 --- a/bfd/plugin.c +++ b/bfd/plugin.c @@ -137,7 +137,7 @@ add_symbols (void * handle, { bfd *abfd = handle; struct plugin_data_struct *plugin_data = - bfd_alloc (abfd, sizeof (plugin_data_struct));; + bfd_alloc (abfd, sizeof (plugin_data_struct)); plugin_data->nsyms = nsyms; plugin_data->syms = syms; diff --git a/bfd/reloc.c b/bfd/reloc.c index f8540a73d9..e097887182 100644 --- a/bfd/reloc.c +++ b/bfd/reloc.c @@ -503,7 +503,7 @@ bfd_check_overflow (enum complain_overflow how, fieldmask = N_ONES (bitsize); signmask = ~fieldmask; addrmask = N_ONES (addrsize) | (fieldmask << rightshift); - a = (relocation & addrmask) >> rightshift;; + a = (relocation & addrmask) >> rightshift; switch (how) { diff --git a/bfd/vms-lib.c b/bfd/vms-lib.c index 8f15419fa3..8aa0e9a7f4 100644 --- a/bfd/vms-lib.c +++ b/bfd/vms-lib.c @@ -630,7 +630,7 @@ _bfd_vms_lib_archive_p (bfd *abfd, enum vms_lib_kind kind) err: bfd_release (abfd, tdata); - abfd->tdata.any = (void *)tdata_hold;; + abfd->tdata.any = (void *)tdata_hold; return NULL; } diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 393843b225..fb31b7322d 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2012-11-09 H.J. Lu + + * coffgrok.c (coff_grok): Remove trailing redundant `;'. + * resrc.c (open_input_stream): Likewise. + 2012-11-08 Alan Modra * po/POTFILES.in: Regenerate. diff --git a/binutils/coffgrok.c b/binutils/coffgrok.c index 97574e7d0c..746edc1fad 100644 --- a/binutils/coffgrok.c +++ b/binutils/coffgrok.c @@ -736,7 +736,7 @@ coff_grok (bfd *inabfd) if (symcount < 0) bfd_fatal (abfd->filename); rawsyms = obj_raw_syments (abfd); - rawcount = obj_raw_syment_count (abfd);; + rawcount = obj_raw_syment_count (abfd); tindex = (struct coff_symbol **) (xcalloc (sizeof (struct coff_symbol *), rawcount)); p = doit (); diff --git a/binutils/resrc.c b/binutils/resrc.c index 9d1abbc94e..bfc3bd4a44 100644 --- a/binutils/resrc.c +++ b/binutils/resrc.c @@ -323,7 +323,7 @@ open_input_stream (char *cmd) if (run_cmd (cmd, cpp_temp_file)) fatal (_("can't execute `%s': %s"), cmd, strerror (errno)); - cpp_pipe = fopen (cpp_temp_file, FOPEN_RT);; + cpp_pipe = fopen (cpp_temp_file, FOPEN_RT); if (cpp_pipe == NULL) fatal (_("can't open temporary file `%s': %s"), cpp_temp_file, strerror (errno)); diff --git a/gas/ChangeLog b/gas/ChangeLog index 69e161d4f9..9b162f5fa5 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,17 @@ +2012-11-09 H.J. Lu + + * config/atof-ieee.c (gen_to_words): Remove trailing redundant + `;'. + * config/atof-vax.c (flonum_gen2vax): Likewise. + * config/tc-d10v.c (write_2_short): Likewise. + * config/tc-i386-intel.c (i386_intel_simplify): Likewise. + * config/tc-s390.c (tc_s390_force_relocation): Likewise. + * config/tc-v850.c (md_parse_option): Likewise. + * config/tc-xtensa.c (find_address_of_next_align_frag): Likewise. + * dwarf2dbg.c (out_header): Likewise. + * symbols.c (dollar_label_name): Likewise. + (fb_label_name): Likewise. + 2012-11-08 Maciej W. Rozycki * config/tc-mips.c (mips_ip) <'u'>: Default to BFD_RELOC_LO16. diff --git a/gas/config/atof-ieee.c b/gas/config/atof-ieee.c index 4ceb0b9537..32e57076a4 100644 --- a/gas/config/atof-ieee.c +++ b/gas/config/atof-ieee.c @@ -419,7 +419,7 @@ gen_to_words (LITTLENUM_TYPE *words, int precision, long exponent_bits) - generic_floating_point_number.low); /* Seek (and forget) 1st significant bit. */ - for (exponent_skippage = 0; !next_bits (1); ++exponent_skippage);; + for (exponent_skippage = 0; !next_bits (1); ++exponent_skippage); exponent_1 = (generic_floating_point_number.exponent + generic_floating_point_number.leader + 1 diff --git a/gas/config/atof-vax.c b/gas/config/atof-vax.c index e012526861..6e81ffe3ab 100644 --- a/gas/config/atof-vax.c +++ b/gas/config/atof-vax.c @@ -295,7 +295,7 @@ flonum_gen2vax (int format_letter, /* One of 'd' 'f' 'g' 'h'. */ /* Seek (and forget) 1st significant bit. */ for (exponent_skippage = 0; !next_bits (1); - exponent_skippage++);; + exponent_skippage++); exponent_1 = f->exponent + f->leader + 1 - f->low; /* Radix LITTLENUM_RADIX, point just higher than f->leader. */ diff --git a/gas/config/tc-d10v.c b/gas/config/tc-d10v.c index 8ba4f30edc..983c2f80c4 100644 --- a/gas/config/tc-d10v.c +++ b/gas/config/tc-d10v.c @@ -1119,7 +1119,7 @@ write_2_short (struct d10v_opcode *opcode1, static unsigned long prev_insn; static struct d10v_opcode *prev_opcode = 0; static subsegT prev_subseg; -static segT prev_seg = 0;; +static segT prev_seg = 0; /* Find the symbol which has the same name as the register in exp. */ diff --git a/gas/config/tc-i386-intel.c b/gas/config/tc-i386-intel.c index 099cbfcd94..aefdc2a9c7 100644 --- a/gas/config/tc-i386-intel.c +++ b/gas/config/tc-i386-intel.c @@ -337,7 +337,7 @@ static int i386_intel_simplify (expressionS *e) if (!i386_intel_simplify_symbol (e->X_add_symbol) || !i386_intel_check(the_reg, intel_state.base, intel_state.index)) - return 0;; + return 0; } if (!intel_state.in_offset) ++intel_state.in_bracket; diff --git a/gas/config/tc-s390.c b/gas/config/tc-s390.c index 11e3c47415..28b526ce49 100644 --- a/gas/config/tc-s390.c +++ b/gas/config/tc-s390.c @@ -2111,7 +2111,7 @@ tc_s390_force_relocation (struct fix *fixp) case BFD_RELOC_390_GOTPLTENT: return 1; default: - break;; + break; } return generic_force_reloc (fixp); diff --git a/gas/config/tc-v850.c b/gas/config/tc-v850.c index 1340b4efa6..4c1428b9a3 100644 --- a/gas/config/tc-v850.c +++ b/gas/config/tc-v850.c @@ -1391,7 +1391,7 @@ md_parse_option (int c, char *arg) } else if (strcmp (arg, "extension") == 0) { - processor_mask |= PROCESSOR_OPTION_EXTENSION | PROCESSOR_OPTION_ALIAS;; + processor_mask |= PROCESSOR_OPTION_EXTENSION | PROCESSOR_OPTION_ALIAS; } else if (strcmp (arg, "no-bcond17") == 0) { diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c index 3624cc99d0..7075531050 100644 --- a/gas/config/tc-xtensa.c +++ b/gas/config/tc-xtensa.c @@ -8878,7 +8878,7 @@ find_address_of_next_align_frag (fragS **fragPP, (*widens)++; break; } - address += total_frag_text_expansion (fragP);; + address += total_frag_text_expansion (fragP); break; case RELAX_IMMED: diff --git a/gas/dwarf2dbg.c b/gas/dwarf2dbg.c index 2fa6d51cb0..76b5fe0fe7 100644 --- a/gas/dwarf2dbg.c +++ b/gas/dwarf2dbg.c @@ -1447,7 +1447,7 @@ out_header (asection *sec, expressionS *exp) symbolS *end_sym; subseg_set (sec, 0); - start_sym = symbol_temp_new_now ();; + start_sym = symbol_temp_new_now (); end_sym = symbol_temp_make (); /* Total length of the information. */ diff --git a/gas/symbols.c b/gas/symbols.c index 1f325c4be0..60b17936e2 100644 --- a/gas/symbols.c +++ b/gas/symbols.c @@ -1702,7 +1702,7 @@ dollar_label_name (register long n, /* we just saw "n$:" : n a number. */ *q = i % 10 + '0'; i /= 10; } - while ((*p++ = *--q) != '\0');; + while ((*p++ = *--q) != '\0'); /* The label, as a '\0' ended string, starts at symbol_name_build. */ return symbol_name_build; @@ -1873,7 +1873,7 @@ fb_label_name (long n, /* We just saw "n:", "nf" or "nb" : n a number. */ *q = i % 10 + '0'; i /= 10; } - while ((*p++ = *--q) != '\0');; + while ((*p++ = *--q) != '\0'); /* The label, as a '\0' ended string, starts at symbol_name_build. */ return (symbol_name_build); diff --git a/ld/ChangeLog b/ld/ChangeLog index e327bbc69a..fc5b81b3d5 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2012-11-09 H.J. Lu + + * testplug.c (record_add_file): Remove trailing redundant `;'. + 2012-11-05 Alan Modra * configure.in: Apply 2012-09-10 change to config.in here. diff --git a/ld/testplug.c b/ld/testplug.c index 3be1ed4142..9d6ec96741 100644 --- a/ld/testplug.c +++ b/ld/testplug.c @@ -168,7 +168,7 @@ record_add_file (const char *file, addfile_enum_t type) return LDPS_ERR; newfile->next = NULL; newfile->name = file; - newfile->type = type;; + newfile->type = type; /* Chain it on the end of the list. */ *addfiles_tail_chain_ptr = newfile; addfiles_tail_chain_ptr = &newfile->next; diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index e85662882e..9400f5c5f1 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2012-11-09 H.J. Lu + + * aarch64-opc.h (gen_mask): Remove trailing redundant `;'. + * ia64-gen.c (fetch_insn_class): Likewise. + 2012-11-08 Alan Modra * po/POTFILES.in: Regenerate. diff --git a/opcodes/aarch64-opc.h b/opcodes/aarch64-opc.h index d475fa497d..b46f7dafc7 100644 --- a/opcodes/aarch64-opc.h +++ b/opcodes/aarch64-opc.h @@ -212,7 +212,7 @@ reset_operand_qualifier (aarch64_inst *inst, int idx) static inline aarch64_insn gen_mask (int width) { - return ((aarch64_insn) 1 << width) - 1;; + return ((aarch64_insn) 1 << width) - 1; } /* LSB_REL is the relative location of the lsb in the sub field, starting from 0. */ diff --git a/opcodes/ia64-gen.c b/opcodes/ia64-gen.c index 042c0fd4c6..bcb4e25ad2 100644 --- a/opcodes/ia64-gen.c +++ b/opcodes/ia64-gen.c @@ -570,7 +570,7 @@ fetch_insn_class (const char *full_name, int create) ics[ind]->nsubs = 1; ics[ind]->subs = tmalloc(int); - ics[ind]->subs[0] = fetch_insn_class (subname, 1);; + ics[ind]->subs[0] = fetch_insn_class (subname, 1); } while (xsect) -- 2.34.1