From 1f020b178664857b0e107778d04fb971a58e6230 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 23 Jul 2008 11:23:36 +0000 Subject: - trim any trailing whitespace --- ldso/ldso/bfin/dl-inlines.h | 16 ++++++++-------- ldso/ldso/bfin/dl-startup.h | 2 +- ldso/ldso/bfin/dl-sysdep.h | 2 +- ldso/ldso/bfin/elfinterp.c | 12 ++++++------ ldso/ldso/frv/dl-inlines.h | 14 +++++++------- ldso/ldso/frv/dl-sysdep.h | 4 ++-- ldso/ldso/frv/elfinterp.c | 12 ++++++------ ldso/ldso/m68k/dl-sysdep.h | 2 +- ldso/ldso/powerpc/dl-sysdep.h | 2 +- ldso/ldso/powerpc/elfinterp.c | 4 ++-- ldso/ldso/sparc/dl-sysdep.h | 8 ++++---- ldso/ldso/xtensa/dl-startup.h | 2 +- 12 files changed, 40 insertions(+), 40 deletions(-) (limited to 'ldso') diff --git a/ldso/ldso/bfin/dl-inlines.h b/ldso/ldso/bfin/dl-inlines.h index 76ce32dea..f8b8f85f1 100644 --- a/ldso/ldso/bfin/dl-inlines.h +++ b/ldso/ldso/bfin/dl-inlines.h @@ -200,7 +200,7 @@ struct funcdesc_ht /* Current number of elements. */ size_t n_elements; -}; +}; inline static int hash_pointer (const void *p) @@ -219,11 +219,11 @@ htab_create (void) ht->entries = _dl_malloc (sizeof (struct funcdesc_ht_value *) * ht->size); if (! ht->entries) return NULL; - + ht->n_elements = 0; _dl_memset (ht->entries, 0, sizeof (struct funcdesc_ht_value *) * ht->size); - + return ht; } @@ -361,14 +361,14 @@ htab_find_slot (struct funcdesc_ht *htab, void *ptr, int insert) goto empty_entry; else if ((*entry)->entry_point == ptr) return entry; - + hash2 = 1 + hash % (size - 2); for (;;) { index += hash2; if (index >= size) index -= size; - + entry = &htab->entries[index]; if (!*entry) goto empty_entry; @@ -427,7 +427,7 @@ _dl_lookup_address (void const *address) if ((Elf32_Addr)address & 7) /* It's not a function descriptor. */ return address; - + fd = (struct funcdesc_value const *)address; for (rpnt = _dl_loaded_modules; rpnt; rpnt = rpnt->next) @@ -448,7 +448,7 @@ _dl_lookup_address (void const *address) else address = fd; } - + return address; } @@ -531,7 +531,7 @@ __dl_map_segment (Elf32_Ehdr *epnt, (tryaddr = 0, size = (ppnt->p_vaddr & ADDR_ALIGN) + ppnt->p_filesz, LXFLAGS(ppnt->p_flags), - flags | MAP_EXECUTABLE | MAP_DENYWRITE, + flags | MAP_EXECUTABLE | MAP_DENYWRITE, infile, ppnt->p_offset & OFFS_ALIGN); if (_dl_mmap_check_error(status) || (tryaddr && tryaddr != status)) diff --git a/ldso/ldso/bfin/dl-startup.h b/ldso/ldso/bfin/dl-startup.h index 5b596fd01..a1e150e27 100644 --- a/ldso/ldso/bfin/dl-startup.h +++ b/ldso/ldso/bfin/dl-startup.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU Lesser General Public License along with uClibc; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - + /* Any assembly language/system dependent hacks needed to setup * boot1.c so it will work as expected and cope with whatever platform * specific wierdness is needed for this architecture. diff --git a/ldso/ldso/bfin/dl-sysdep.h b/ldso/ldso/bfin/dl-sysdep.h index 735183585..52df4c91f 100644 --- a/ldso/ldso/bfin/dl-sysdep.h +++ b/ldso/ldso/bfin/dl-sysdep.h @@ -171,7 +171,7 @@ do \ } \ \ } \ -while (0) +while (0) /* We want want to apply all relocations in the interpreter during bootstrap. Because of this, we have to skip the interpreter diff --git a/ldso/ldso/bfin/elfinterp.c b/ldso/ldso/bfin/elfinterp.c index d003e2e71..ac24337a1 100644 --- a/ldso/ldso/bfin/elfinterp.c +++ b/ldso/ldso/bfin/elfinterp.c @@ -63,7 +63,7 @@ _dl_linux_resolver (struct elf_resolve *tpnt, int reloc_entry) symname= strtab + symtab[symtab_index].st_name; if (reloc_type != R_BFIN_FUNCDESC_VALUE) { - _dl_dprintf(2, "%s: Incorrect relocation type in jump relocations\n", + _dl_dprintf(2, "%s: Incorrect relocation type in jump relocations\n", _dl_progname); _dl_exit(1); } @@ -89,7 +89,7 @@ _dl_linux_resolver (struct elf_resolve *tpnt, int reloc_entry) if (_dl_debug_bindings) { _dl_dprintf(_dl_debug_file, "\nresolve function: %s", symname); if (_dl_debug_detail) - _dl_dprintf(_dl_debug_file, + _dl_dprintf(_dl_debug_file, "\n\tpatched (%x,%x) ==> (%x,%x) @ %x\n", got_entry->entry_point, got_entry->got_value, funcval.entry_point, funcval.got_value, @@ -126,7 +126,7 @@ _dl_parse(struct elf_resolve *tpnt, struct dyn_elf *scope, for (i = 0; i < rel_size; i++, rpnt++) { int res; - + symtab_index = ELF_R_SYM(rpnt->r_info); debug_sym(symtab,strtab,symtab_index); debug_reloc(symtab,strtab,rpnt); @@ -136,17 +136,17 @@ _dl_parse(struct elf_resolve *tpnt, struct dyn_elf *scope, if (res==0) continue; _dl_dprintf(2, "\n%s: ",_dl_progname); - + if (symtab_index) _dl_dprintf(2, "symbol '%s': ", strtab + symtab[symtab_index].st_name); - + if (res <0) { int reloc_type = ELF_R_TYPE(rpnt->r_info); #if defined (__SUPPORT_LD_DEBUG__) _dl_dprintf(2, "can't handle reloc type %s\n ", _dl_reltypes(reloc_type)); #else _dl_dprintf(2, "can't handle reloc type %x\n", reloc_type); -#endif +#endif _dl_exit(-res); } else if (res >0) { _dl_dprintf(2, "can't resolve symbol\n"); diff --git a/ldso/ldso/frv/dl-inlines.h b/ldso/ldso/frv/dl-inlines.h index 00ff263ea..0d469dd88 100644 --- a/ldso/ldso/frv/dl-inlines.h +++ b/ldso/ldso/frv/dl-inlines.h @@ -184,7 +184,7 @@ struct funcdesc_ht /* Current number of elements. */ size_t n_elements; -}; +}; inline static int hash_pointer (const void *p) @@ -203,11 +203,11 @@ htab_create (void) ht->entries = _dl_malloc (sizeof (struct funcdesc_ht_value *) * ht->size); if (! ht->entries) return NULL; - + ht->n_elements = 0; _dl_memset (ht->entries, 0, sizeof (struct funcdesc_ht_value *) * ht->size); - + return ht; } @@ -345,14 +345,14 @@ htab_find_slot (struct funcdesc_ht *htab, void *ptr, int insert) goto empty_entry; else if ((*entry)->entry_point == ptr) return entry; - + hash2 = 1 + hash % (size - 2); for (;;) { index += hash2; if (index >= size) index -= size; - + entry = &htab->entries[index]; if (!*entry) goto empty_entry; @@ -411,7 +411,7 @@ _dl_lookup_address (void const *address) if ((Elf32_Addr)address & 7) /* It's not a function descriptor. */ return address; - + fd = (struct funcdesc_value const *)address; for (rpnt = _dl_loaded_modules; rpnt; rpnt = rpnt->next) @@ -432,7 +432,7 @@ _dl_lookup_address (void const *address) else address = fd; } - + return address; } diff --git a/ldso/ldso/frv/dl-sysdep.h b/ldso/ldso/frv/dl-sysdep.h index f72d54a4d..32d86ed2c 100644 --- a/ldso/ldso/frv/dl-sysdep.h +++ b/ldso/ldso/frv/dl-sysdep.h @@ -152,7 +152,7 @@ do \ _dl_close(infile); \ } \ } \ -while (0) +while (0) /* We want want to apply all relocations in the interpreter during bootstrap. Because of this, we have to skip the interpreter @@ -179,7 +179,7 @@ while (0) #define DL_GET_READY_TO_RUN_EXTRA_ARGS \ , dl_boot_progmap - + #ifdef __USE_GNU diff --git a/ldso/ldso/frv/elfinterp.c b/ldso/ldso/frv/elfinterp.c index d8714c58e..df41f97bf 100644 --- a/ldso/ldso/frv/elfinterp.c +++ b/ldso/ldso/frv/elfinterp.c @@ -52,7 +52,7 @@ _dl_linux_resolver (struct elf_resolve *tpnt, int reloc_entry) symname= strtab + symtab[symtab_index].st_name; if (reloc_type != R_FRV_FUNCDESC_VALUE) { - _dl_dprintf(2, "%s: Incorrect relocation type in jump relocations\n", + _dl_dprintf(2, "%s: Incorrect relocation type in jump relocations\n", _dl_progname); _dl_exit(1); } @@ -82,7 +82,7 @@ _dl_linux_resolver (struct elf_resolve *tpnt, int reloc_entry) { _dl_dprintf(_dl_debug_file, "\nresolve function: %s", symname); if (_dl_debug_detail) - _dl_dprintf(_dl_debug_file, + _dl_dprintf(_dl_debug_file, "\n\tpatched (%x,%x) ==> (%x,%x) @ %x\n", got_entry->entry_point, got_entry->got_value, funcval.entry_point, funcval.got_value, @@ -120,7 +120,7 @@ _dl_parse(struct elf_resolve *tpnt, struct dyn_elf *scope, for (i = 0; i < rel_size; i++, rpnt++) { int res; - + symtab_index = ELF32_R_SYM(rpnt->r_info); debug_sym(symtab,strtab,symtab_index); debug_reloc(symtab,strtab,rpnt); @@ -130,10 +130,10 @@ _dl_parse(struct elf_resolve *tpnt, struct dyn_elf *scope, if (res==0) continue; _dl_dprintf(2, "\n%s: ",_dl_progname); - + if (symtab_index) _dl_dprintf(2, "symbol '%s': ", strtab + symtab[symtab_index].st_name); - + if (res <0) { int reloc_type = ELF32_R_TYPE(rpnt->r_info); @@ -141,7 +141,7 @@ _dl_parse(struct elf_resolve *tpnt, struct dyn_elf *scope, _dl_dprintf(2, "can't handle reloc type %s\n ", _dl_reltypes(reloc_type)); #else _dl_dprintf(2, "can't handle reloc type %x\n", reloc_type); -#endif +#endif _dl_exit(-res); } else if (res >0) diff --git a/ldso/ldso/m68k/dl-sysdep.h b/ldso/ldso/m68k/dl-sysdep.h index bb36dcc28..13e9e6015 100644 --- a/ldso/ldso/m68k/dl-sysdep.h +++ b/ldso/ldso/m68k/dl-sysdep.h @@ -1,7 +1,7 @@ /* vi: set sw=4 ts=4: */ /* * Various assmbly language/system dependent hacks that are required - * so that we can minimize the amount of platform specific code. + * so that we can minimize the amount of platform specific code. * Copyright (C) 2005 by Erik Andersen */ diff --git a/ldso/ldso/powerpc/dl-sysdep.h b/ldso/ldso/powerpc/dl-sysdep.h index 48a8bfb69..d5282485d 100644 --- a/ldso/ldso/powerpc/dl-sysdep.h +++ b/ldso/ldso/powerpc/dl-sysdep.h @@ -170,7 +170,7 @@ elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr, { Elf32_Rela * rpnt = (void *)rel_addr; --rpnt; - do { /* PowerPC handles pre increment/decrement better */ + do { /* PowerPC handles pre increment/decrement better */ Elf32_Addr *const reloc_addr = (void *) (load_off + (++rpnt)->r_offset); *reloc_addr = load_off + rpnt->r_addend; diff --git a/ldso/ldso/powerpc/elfinterp.c b/ldso/ldso/powerpc/elfinterp.c index 7fa626fb4..eeb325092 100644 --- a/ldso/ldso/powerpc/elfinterp.c +++ b/ldso/ldso/powerpc/elfinterp.c @@ -202,7 +202,7 @@ _dl_do_reloc (struct elf_resolve *tpnt,struct dyn_elf *scope, #endif reloc_addr = (Elf32_Addr *)(intptr_t) (tpnt->loadaddr + (unsigned long) rpnt->r_offset); reloc_type = ELF32_R_TYPE(rpnt->r_info); - symbol_addr = tpnt->loadaddr; /* For R_PPC_RELATIVE */ + symbol_addr = tpnt->loadaddr; /* For R_PPC_RELATIVE */ symtab_index = ELF32_R_SYM(rpnt->r_info); symname = strtab + symtab[symtab_index].st_name; if (symtab_index) { @@ -386,7 +386,7 @@ _dl_parse(struct elf_resolve *tpnt, struct dyn_elf *scope, symtab = (Elf32_Sym *)(intptr_t)tpnt->dynamic_info[DT_SYMTAB]; strtab = (char *)tpnt->dynamic_info[DT_STRTAB]; - + for (i = 0; i < rel_size; i++, rpnt++) { int res; diff --git a/ldso/ldso/sparc/dl-sysdep.h b/ldso/ldso/sparc/dl-sysdep.h index 7707cfcb9..4c5013cd8 100644 --- a/ldso/ldso/sparc/dl-sysdep.h +++ b/ldso/ldso/sparc/dl-sysdep.h @@ -131,9 +131,9 @@ static __inline__ Elf32_Addr elf_machine_dynamic (void) { register Elf32_Addr *got __asm__ ("%l7"); - + LOAD_PIC_REG (got); - + return *got; } @@ -142,14 +142,14 @@ static __inline__ Elf32_Addr elf_machine_load_address (void) { register Elf32_Addr *pc __asm__ ("%o7"), *got __asm ("%l7"); - + __asm__ ("sethi %%hi(_GLOBAL_OFFSET_TABLE_-4), %1\n\t" "call 1f\n\t" " add %1, %%lo(_GLOBAL_OFFSET_TABLE_+4), %1\n\t" "call _DYNAMIC\n\t" "call _GLOBAL_OFFSET_TABLE_\n" "1:\tadd %1, %0, %1\n\t" : "=r" (pc), "=r" (got)); - + /* got is now l_addr + _GLOBAL_OFFSET_TABLE_ *got is _DYNAMIC pc[2]*4 is l_addr + _DYNAMIC - (long)pc - 8 diff --git a/ldso/ldso/xtensa/dl-startup.h b/ldso/ldso/xtensa/dl-startup.h index 2fd012846..8ae962408 100644 --- a/ldso/ldso/xtensa/dl-startup.h +++ b/ldso/ldso/xtensa/dl-startup.h @@ -5,7 +5,7 @@ * Copyright (C) 2007 Tensilica Inc. * * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. - * Parts taken from glibc/sysdeps/xtensa/dl-machine.h. + * Parts taken from glibc/sysdeps/xtensa/dl-machine.h. */ __asm__ ( -- cgit v1.2.3