From e4d45e3772b44ea15f5bc88defacea9c9c06c90e Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 19 Jun 2006 22:15:42 +0000 Subject: eat extraneous ; and insert some whitespace where it belongs --- ldso/ldso/mips/dl-debug.h | 26 +++++++++++++------------- ldso/ldso/mips/dl-sysdep.h | 4 ++-- ldso/ldso/mips/elfinterp.c | 12 ++++++------ 3 files changed, 21 insertions(+), 21 deletions(-) (limited to 'ldso/ldso/mips') diff --git a/ldso/ldso/mips/dl-debug.h b/ldso/ldso/mips/dl-debug.h index f2a3865e3..07a2addfa 100644 --- a/ldso/ldso/mips/dl-debug.h +++ b/ldso/ldso/mips/dl-debug.h @@ -29,17 +29,17 @@ static const char *_dl_reltypes_tab[] = { - [0] "R_MIPS_NONE", "R_MIPS_16", "R_MIPS_32", - [3] "R_MIPS_REL32", "R_MIPS_26", "R_MIPS_HI16", - [6] "R_MIPS_LO16", "R_MIPS_GPREL16", "R_MIPS_LITERAL", - [9] "R_MIPS_GOT16", "R_MIPS_PC16", "R_MIPS_CALL16", - [12] "R_MIPS_GPREL32", - [16] "R_MIPS_SHIFT5", "R_MIPS_SHIFT6", "R_MIPS_64", - [19] "R_MIPS_GOT_DISP", "R_MIPS_GOT_PAGE", "R_MIPS_GOT_OFST", - [22] "R_MIPS_GOT_HI16", "R_MIPS_GOT_LO16", "R_MIPS_SUB", - [25] "R_MIPS_INSERT_A", "R_MIPS_INSERT_B", "R_MIPS_DELETE", - [28] "R_MIPS_HIGHER", "R_MIPS_HIGHEST", "R_MIPS_CALL_HI16", - [31] "R_MIPS_CALL_LO16", "R_MIPS_SCN_DISP", "R_MIPS_REL16", - [34] "R_MIPS_ADD_IMMEDIATE", "R_MIPS_PJUMP", "R_MIPS_RELGOT", - [37] "R_MIPS_JALR", + [0] "R_MIPS_NONE", "R_MIPS_16", "R_MIPS_32", + [3] "R_MIPS_REL32", "R_MIPS_26", "R_MIPS_HI16", + [6] "R_MIPS_LO16", "R_MIPS_GPREL16", "R_MIPS_LITERAL", + [9] "R_MIPS_GOT16", "R_MIPS_PC16", "R_MIPS_CALL16", + [12] "R_MIPS_GPREL32", + [16] "R_MIPS_SHIFT5", "R_MIPS_SHIFT6", "R_MIPS_64", + [19] "R_MIPS_GOT_DISP", "R_MIPS_GOT_PAGE", "R_MIPS_GOT_OFST", + [22] "R_MIPS_GOT_HI16", "R_MIPS_GOT_LO16", "R_MIPS_SUB", + [25] "R_MIPS_INSERT_A", "R_MIPS_INSERT_B", "R_MIPS_DELETE", + [28] "R_MIPS_HIGHER", "R_MIPS_HIGHEST", "R_MIPS_CALL_HI16", + [31] "R_MIPS_CALL_LO16", "R_MIPS_SCN_DISP", "R_MIPS_REL16", + [34] "R_MIPS_ADD_IMMEDIATE", "R_MIPS_PJUMP", "R_MIPS_RELGOT", + [37] "R_MIPS_JALR", }; diff --git a/ldso/ldso/mips/dl-sysdep.h b/ldso/ldso/mips/dl-sysdep.h index 77edcd921..5f4dfadc3 100644 --- a/ldso/ldso/mips/dl-sysdep.h +++ b/ldso/ldso/mips/dl-sysdep.h @@ -19,9 +19,9 @@ do { \ if (dpnt->d_tag == DT_MIPS_GOTSYM) \ dynamic[DT_MIPS_GOTSYM_IDX] = dpnt->d_un.d_val; \ -else if(dpnt->d_tag == DT_MIPS_LOCAL_GOTNO) \ +else if (dpnt->d_tag == DT_MIPS_LOCAL_GOTNO) \ dynamic[DT_MIPS_LOCAL_GOTNO_IDX] = dpnt->d_un.d_val; \ -else if(dpnt->d_tag == DT_MIPS_SYMTABNO) \ +else if (dpnt->d_tag == DT_MIPS_SYMTABNO) \ dynamic[DT_MIPS_SYMTABNO_IDX] = dpnt->d_un.d_val; \ else if (dpnt->d_tag == DT_MIPS_RLD_MAP) \ *(Elf32_Addr *)(dpnt->d_un.d_ptr) = (Elf32_Addr) debug_addr; \ diff --git a/ldso/ldso/mips/elfinterp.c b/ldso/ldso/mips/elfinterp.c index 966e16437..d7aae353d 100644 --- a/ldso/ldso/mips/elfinterp.c +++ b/ldso/ldso/mips/elfinterp.c @@ -70,7 +70,7 @@ unsigned long __dl_runtime_resolve(unsigned long sym_index, if (_dl_debug_bindings) { _dl_dprintf(_dl_debug_file, "\nresolve function: %s", symname); - if(_dl_debug_detail) _dl_dprintf(_dl_debug_file, + if (_dl_debug_detail) _dl_dprintf(_dl_debug_file, "\n\tpatched %x ==> %x @ %x\n", *got_addr, new_addr, got_addr); } if (!_dl_debug_nofixups) { @@ -160,11 +160,11 @@ int _dl_parse_relocation_information(struct dyn_elf *xpnt, #endif _dl_exit(1); } - }; + } - }; + } #if defined (__SUPPORT_LD_DEBUG__) - if(_dl_debug_reloc && _dl_debug_detail && reloc_addr) + if (_dl_debug_reloc && _dl_debug_detail && reloc_addr) _dl_dprintf(_dl_debug_file, "\tpatched: %x ==> %x @ %x\n", old_val, *reloc_addr, reloc_addr); #endif @@ -193,12 +193,12 @@ void _dl_perform_mips_global_got_relocations(struct elf_resolve *tpnt, int lazy) i = tpnt->dynamic_info[DT_MIPS_SYMTABNO_IDX] - tpnt->dynamic_info[DT_MIPS_GOTSYM_IDX]; #if defined (__SUPPORT_LD_DEBUG__) - if(_dl_debug_reloc) + if (_dl_debug_reloc) _dl_dprintf(2, "_dl_perform_mips_global_got_relocations for '%s'\n", tpnt->libname); #endif tmp_lazy = lazy && !tpnt->dynamic_info[DT_BIND_NOW]; /* Relocate the global GOT entries for the object */ - while(i--) { + while (i--) { if (sym->st_shndx == SHN_UNDEF) { if (ELF32_ST_TYPE(sym->st_info) == STT_FUNC && sym->st_value && tmp_lazy) { *got_entry = sym->st_value + (unsigned long) tpnt->loadaddr; -- cgit v1.2.3