diff options
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/cache.c | 6 | ||||
| -rw-r--r-- | elf/dl-load.c | 16 | ||||
| -rw-r--r-- | elf/get-dynamic-info.h | 4 | ||||
| -rw-r--r-- | elf/readelflib.c | 8 | ||||
| -rw-r--r-- | elf/rtld.c | 4 | ||||
| -rw-r--r-- | elf/sprof.c | 4 |
6 files changed, 21 insertions, 21 deletions
diff --git a/elf/cache.c b/elf/cache.c index b8e9e6ccc3..b8934898b6 100644 --- a/elf/cache.c +++ b/elf/cache.c @@ -712,9 +712,9 @@ load_aux_cache (const char *aux_cache_name) if (aux_cache == MAP_FAILED || aux_cache_size < sizeof (struct aux_cache_file) || memcmp (aux_cache->magic, AUX_CACHEMAGIC, sizeof AUX_CACHEMAGIC - 1) - || aux_cache_size != (sizeof(struct aux_cache_file) + - aux_cache->nlibs * sizeof(struct aux_cache_file_entry) + - aux_cache->len_strings)) + || aux_cache_size != (sizeof(struct aux_cache_file) + + aux_cache->nlibs * sizeof(struct aux_cache_file_entry) + + aux_cache->len_strings)) { close (fd); init_aux_cache (); diff --git a/elf/dl-load.c b/elf/dl-load.c index f972524421..0e759cf8ca 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1581,15 +1581,15 @@ open_verify (const char *name, int fd, const Elf32_Word *magp = (const void *) ehdr->e_ident; if (*magp != #if BYTE_ORDER == LITTLE_ENDIAN - ((ELFMAG0 << (EI_MAG0 * 8)) | - (ELFMAG1 << (EI_MAG1 * 8)) | - (ELFMAG2 << (EI_MAG2 * 8)) | - (ELFMAG3 << (EI_MAG3 * 8))) + ((ELFMAG0 << (EI_MAG0 * 8)) + | (ELFMAG1 << (EI_MAG1 * 8)) + | (ELFMAG2 << (EI_MAG2 * 8)) + | (ELFMAG3 << (EI_MAG3 * 8))) #else - ((ELFMAG0 << (EI_MAG3 * 8)) | - (ELFMAG1 << (EI_MAG2 * 8)) | - (ELFMAG2 << (EI_MAG1 * 8)) | - (ELFMAG3 << (EI_MAG0 * 8))) + ((ELFMAG0 << (EI_MAG3 * 8)) + | (ELFMAG1 << (EI_MAG2 * 8)) + | (ELFMAG2 << (EI_MAG1 * 8)) + | (ELFMAG3 << (EI_MAG0 * 8))) #endif ) errstring = N_("invalid ELF header"); diff --git a/elf/get-dynamic-info.h b/elf/get-dynamic-info.h index 0e4cc735f3..75fbb88f78 100644 --- a/elf/get-dynamic-info.h +++ b/elf/get-dynamic-info.h @@ -49,8 +49,8 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp) { if ((d_tag_utype) dyn->d_tag < DT_NUM) info[dyn->d_tag] = dyn; - else if (dyn->d_tag >= DT_LOPROC && - dyn->d_tag < DT_LOPROC + DT_THISPROCNUM) + else if (dyn->d_tag >= DT_LOPROC + && dyn->d_tag < DT_LOPROC + DT_THISPROCNUM) { /* This does not violate the array bounds of l->l_info, but gcc 4.6 on sparc somehow does not see this. */ diff --git a/elf/readelflib.c b/elf/readelflib.c index 470b09d1aa..ca4dc6f11e 100644 --- a/elf/readelflib.c +++ b/elf/readelflib.c @@ -164,10 +164,10 @@ process_elf_file (const char *file_name, const char *lib, int *flag, if (size == 0) break; - *osversion = (abi_note [4] << 24) | - ((abi_note [5] & 0xff) << 16) | - ((abi_note [6] & 0xff) << 8) | - (abi_note [7] & 0xff); + *osversion = ((abi_note [4] << 24) + | ((abi_note [5] & 0xff) << 16) + | ((abi_note [6] & 0xff) << 8) + | (abi_note [7] & 0xff)); } break; diff --git a/elf/rtld.c b/elf/rtld.c index c1cc1b01f2..1b38c6b732 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -2110,8 +2110,8 @@ ERROR: '%s': cannot process note segment.\n", _dl_argv[0]); liblist = (ElfW(Lib) *) main_map->l_info[ADDRIDX (DT_GNU_LIBLIST)]->d_un.d_ptr; liblistend = (ElfW(Lib) *) - ((char *) liblist + - main_map->l_info[VALIDX (DT_GNU_LIBLISTSZ)]->d_un.d_val); + ((char *) liblist + + main_map->l_info[VALIDX (DT_GNU_LIBLISTSZ)]->d_un.d_val); r_list = main_map->l_searchlist.r_list; r_listend = r_list + main_map->l_searchlist.r_nlist; diff --git a/elf/sprof.c b/elf/sprof.c index 07829c27de..06d5ca2aff 100644 --- a/elf/sprof.c +++ b/elf/sprof.c @@ -1354,8 +1354,8 @@ generate_call_graph (struct profdata *profdata) ? sortsym[runp->idx]->ticks * tick_unit : 0.0), 0.0, /* FIXME: what's time for the children, recursive */ runp->count, sortsym[cnt]->calls, - (runp->idx != (size_t) -1l ? - sortsym[runp->idx]->name : "<UNKNOWN>")); + (runp->idx != (size_t) -1l + ? sortsym[runp->idx]->name : "<UNKNOWN>")); if (runp->idx != (size_t) -1l) printf (" [%Zd]", runp->idx); |