From 7292b3ac749b5d10e527f57f8caf27113b55e3cb Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 31 Aug 2015 08:32:29 +0930 Subject: Make asection->id and asection->index unsigned These int vars are really unsigned, so make them so. * section.c (struct bfd_section): Make "id" and "index" unsigned. * coff-rs6000.c (_bfd_xcoff_sizeof_headers): Adjust local var to suit. * elf.c (elf_map_symbols): Likewise. * elf64-ppc.c (sym_exists_at): Make "id" param unsigned. (struct ppc_link_hash_table): Make "top_id" and "top_index" unsigned. (ppc64_elf_setup_section_lists): Ditto for local vars. * elf32-arm.c: Similarly to elf64-ppc.c. * elf32-avr.c: Likewise. * elf32-hppa.c: Likewise. * elf32-m68hc1x.c: Likewise. * elf32-metag.c: Likewise. * elf32-nios2.c: Likewise. * elfnn-aarch64.c: Likewise. * simple.c (struct saved_offsets): Make "section_count" unsigned. * bfd-in2.h: Regenerate. --- bfd/ChangeLog | 18 ++++++++++++++++++ bfd/bfd-in2.h | 4 ++-- bfd/coff-rs6000.c | 2 +- bfd/elf.c | 2 +- bfd/elf32-arm.c | 8 ++++---- bfd/elf32-avr.c | 4 ++-- bfd/elf32-hppa.c | 4 ++-- bfd/elf32-m68hc1x.c | 2 +- bfd/elf32-metag.c | 4 ++-- bfd/elf32-nios2.c | 4 ++-- bfd/elf64-ppc.c | 10 +++++----- bfd/elfnn-aarch64.c | 4 ++-- bfd/section.c | 6 +++--- bfd/simple.c | 2 +- 14 files changed, 46 insertions(+), 28 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 742d35e0182..8a2977701f4 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,21 @@ +2015-08-31 Alan Modra + + * section.c (struct bfd_section): Make "id" and "index" unsigned. + * coff-rs6000.c (_bfd_xcoff_sizeof_headers): Adjust local var to suit. + * elf.c (elf_map_symbols): Likewise. + * elf64-ppc.c (sym_exists_at): Make "id" param unsigned. + (struct ppc_link_hash_table): Make "top_id" and "top_index" unsigned. + (ppc64_elf_setup_section_lists): Ditto for local vars. + * elf32-arm.c: Similarly to elf64-ppc.c. + * elf32-avr.c: Likewise. + * elf32-hppa.c: Likewise. + * elf32-m68hc1x.c: Likewise. + * elf32-metag.c: Likewise. + * elf32-nios2.c: Likewise. + * elfnn-aarch64.c: Likewise. + * simple.c (struct saved_offsets): Make "section_count" unsigned. + * bfd-in2.h: Regenerate. + 2015-08-27 Alan Modra PR 18867 diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 82bf269948d..f73abf0ba92 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -1209,10 +1209,10 @@ typedef struct bfd_section const char *name; /* A unique sequence number. */ - int id; + unsigned int id; /* Which section in the bfd; 0..n-1 as sections are created in a bfd. */ - int index; + unsigned int index; /* The next section in the list belonging to the BFD, or NULL. */ struct bfd_section *next; diff --git a/bfd/coff-rs6000.c b/bfd/coff-rs6000.c index dd9ecb2397f..95430c3f888 100644 --- a/bfd/coff-rs6000.c +++ b/bfd/coff-rs6000.c @@ -2556,7 +2556,7 @@ _bfd_xcoff_sizeof_headers (bfd *abfd, }; struct nbr_reloc_lineno *n_rl; bfd *sub; - int max_index; + unsigned int max_index; asection *s; /* Although the number of sections is known, the maximum value of diff --git a/bfd/elf.c b/bfd/elf.c index 81cc1db5a2c..35c0f6cdf43 100644 --- a/bfd/elf.c +++ b/bfd/elf.c @@ -3664,7 +3664,7 @@ elf_map_symbols (bfd *abfd, unsigned int *pnum_locals) unsigned int num_globals = 0; unsigned int num_locals2 = 0; unsigned int num_globals2 = 0; - int max_index = 0; + unsigned int max_index = 0; unsigned int idx; asection *asect; asymbol **new_syms; diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c index 2e7d26dbc70..b65ae3995fa 100644 --- a/bfd/elf32-arm.c +++ b/bfd/elf32-arm.c @@ -3061,11 +3061,11 @@ struct elf32_arm_link_hash_table struct map_stub *stub_group; /* Number of elements in stub_group. */ - int top_id; + unsigned int top_id; /* Assorted information used by elf32_arm_size_stubs. */ unsigned int bfd_count; - int top_index; + unsigned int top_index; asection **input_list; }; @@ -4432,7 +4432,7 @@ elf32_arm_setup_section_lists (bfd *output_bfd, { bfd *input_bfd; unsigned int bfd_count; - int top_id, top_index; + unsigned int top_id, top_index; asection *section; asection **input_list, **list; bfd_size_type amt; @@ -11137,7 +11137,7 @@ elf32_arm_final_link (bfd *abfd, struct bfd_link_info *info) /* Process stub sections (eg BE8 encoding, ...). */ struct elf32_arm_link_hash_table *htab = elf32_arm_hash_table (info); - int i; + unsigned int i; for (i=0; itop_id; i++) { sec = htab->stub_group[i].stub_sec; diff --git a/bfd/elf32-avr.c b/bfd/elf32-avr.c index 86b9f8406bb..9aa5a68888a 100644 --- a/bfd/elf32-avr.c +++ b/bfd/elf32-avr.c @@ -89,7 +89,7 @@ struct elf32_avr_link_hash_table /* Assorted information used by elf32_avr_size_stubs. */ unsigned int bfd_count; - int top_index; + unsigned int top_index; asection ** input_list; Elf_Internal_Sym ** all_local_syms; @@ -3365,7 +3365,7 @@ elf32_avr_setup_section_lists (bfd *output_bfd, { bfd *input_bfd; unsigned int bfd_count; - int top_id, top_index; + unsigned int top_id, top_index; asection *section; asection **input_list, **list; bfd_size_type amt; diff --git a/bfd/elf32-hppa.c b/bfd/elf32-hppa.c index 41bf5c57c59..8b56ac4b7db 100644 --- a/bfd/elf32-hppa.c +++ b/bfd/elf32-hppa.c @@ -270,7 +270,7 @@ struct elf32_hppa_link_hash_table /* Assorted information used by elf32_hppa_size_stubs. */ unsigned int bfd_count; - int top_index; + unsigned int top_index; asection **input_list; Elf_Internal_Sym **all_local_syms; @@ -2495,7 +2495,7 @@ elf32_hppa_setup_section_lists (bfd *output_bfd, struct bfd_link_info *info) { bfd *input_bfd; unsigned int bfd_count; - int top_id, top_index; + unsigned int top_id, top_index; asection *section; asection **input_list, **list; bfd_size_type amt; diff --git a/bfd/elf32-m68hc1x.c b/bfd/elf32-m68hc1x.c index 8f02b12ee0d..7f52796c3ee 100644 --- a/bfd/elf32-m68hc1x.c +++ b/bfd/elf32-m68hc1x.c @@ -237,7 +237,7 @@ elf32_m68hc11_setup_section_lists (bfd *output_bfd, struct bfd_link_info *info) { bfd *input_bfd; unsigned int bfd_count; - int top_id, top_index; + unsigned int top_id, top_index; asection *section; asection **input_list, **list; bfd_size_type amt; diff --git a/bfd/elf32-metag.c b/bfd/elf32-metag.c index 9c54a7140ae..0fcafc4d9c3 100644 --- a/bfd/elf32-metag.c +++ b/bfd/elf32-metag.c @@ -838,7 +838,7 @@ struct elf_metag_link_hash_table /* Assorted information used by elf_metag_size_stubs. */ unsigned int bfd_count; - int top_index; + unsigned int top_index; asection **input_list; Elf_Internal_Sym **all_local_syms; @@ -3729,7 +3729,7 @@ elf_metag_setup_section_lists (bfd *output_bfd, struct bfd_link_info *info) { bfd *input_bfd; unsigned int bfd_count; - int top_id, top_index; + unsigned int top_id, top_index; asection *section; asection **input_list, **list; bfd_size_type amt; diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c index 6a72f71f070..91897265c83 100644 --- a/bfd/elf32-nios2.c +++ b/bfd/elf32-nios2.c @@ -1815,7 +1815,7 @@ struct elf32_nios2_link_hash_table /* Assorted information used by nios2_elf32_size_stubs. */ unsigned int bfd_count; - int top_index; + unsigned int top_index; asection **input_list; Elf_Internal_Sym **all_local_syms; @@ -2245,7 +2245,7 @@ nios2_elf32_setup_section_lists (bfd *output_bfd, struct bfd_link_info *info) { bfd *input_bfd; unsigned int bfd_count; - int top_id, top_index; + unsigned int top_id, top_index; asection *section; asection **input_list, **list; bfd_size_type amt; diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c index 3e8bd33db1e..4a232b764dd 100644 --- a/bfd/elf64-ppc.c +++ b/bfd/elf64-ppc.c @@ -3101,11 +3101,11 @@ compare_symbols (const void *ap, const void *bp) /* Search SYMS for a symbol of the given VALUE. */ static asymbol * -sym_exists_at (asymbol **syms, long lo, long hi, int id, bfd_vma value) +sym_exists_at (asymbol **syms, long lo, long hi, unsigned int id, bfd_vma value) { long mid; - if (id == -1) + if (id == (unsigned) -1) { while (lo < hi) { @@ -3942,10 +3942,10 @@ struct ppc_link_hash_table asection *toc_first_sec; /* Highest input section id. */ - int top_id; + unsigned int top_id; /* Highest output section index. */ - int top_index; + unsigned int top_index; /* Used when adding symbols. */ struct ppc_link_hash_entry *dot_syms; @@ -11163,7 +11163,7 @@ int ppc64_elf_setup_section_lists (struct bfd_link_info *info) { bfd *input_bfd; - int top_id, top_index, id; + unsigned int top_id, top_index, id; asection *section; asection **input_list; bfd_size_type amt; diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c index 9935308bee7..3c4392477c3 100644 --- a/bfd/elfnn-aarch64.c +++ b/bfd/elfnn-aarch64.c @@ -2260,7 +2260,7 @@ struct elf_aarch64_link_hash_table /* Assorted information used by elfNN_aarch64_size_stubs. */ unsigned int bfd_count; - int top_index; + unsigned int top_index; asection **input_list; /* The offset into splt of the PLT entry for the TLS descriptor @@ -2985,7 +2985,7 @@ elfNN_aarch64_setup_section_lists (bfd *output_bfd, { bfd *input_bfd; unsigned int bfd_count; - int top_id, top_index; + unsigned int top_id, top_index; asection *section; asection **input_list, **list; bfd_size_type amt; diff --git a/bfd/section.c b/bfd/section.c index aa652a41d79..fc6b7651c36 100644 --- a/bfd/section.c +++ b/bfd/section.c @@ -155,10 +155,10 @@ CODE_FRAGMENT . const char *name; . . {* A unique sequence number. *} -. int id; +. unsigned int id; . . {* Which section in the bfd; 0..n-1 as sections are created in a bfd. *} -. int index; +. unsigned int index; . . {* The next section in the list belonging to the BFD, or NULL. *} . struct bfd_section *next; @@ -826,7 +826,7 @@ _bfd_generic_new_section_hook (bfd *abfd, asection *newsect) static asection * bfd_section_init (bfd *abfd, asection *newsect) { - static int section_id = 0x10; /* id 0 to 3 used by STD_SECTION. */ + static unsigned int section_id = 0x10; /* id 0 to 3 used by STD_SECTION. */ newsect->id = section_id; newsect->index = abfd->section_count; diff --git a/bfd/simple.c b/bfd/simple.c index 134d6d5f06a..18b1ca6047d 100644 --- a/bfd/simple.c +++ b/bfd/simple.c @@ -102,7 +102,7 @@ struct saved_output_info struct saved_offsets { - int section_count; + unsigned int section_count; struct saved_output_info *sections; }; -- cgit v1.2.1