Fix whitespace damage in AVR32 part of ldso.

1 files changed, 120 insertions, 120 deletions

diff --git a/ldso/ldso/avr32/elfinterp.c b/ldso/ldso/avr32/elfinterp.c
index e236e4825..813179e64 100644
--- a/ldso/ldso/avr32/elfinterp.c
+++ b/ldso/ldso/avr32/elfinterp.c
@@ -29,165 +29,165 @@
 
 unsigned long _dl_linux_resolver(unsigned long got_offset, unsigned long *got)
 {
-       /*
-        * AVR32 currently does not do lazy relocation.
-        */
+	/*
+	 * AVR32 currently does not do lazy relocation.
+	 */
 #if 0
-       struct elf_resolve *tpnt = (struct elf_resolve *)got[1];
-       Elf32_Sym *sym;
-       unsigned long local_gotno;
-       unsigned long gotsym;
-       unsigned long new_addr;
-       char *strtab, *symname;
-       unsigned long *entry;
-       unsigned long sym_index = got_offset / 4;
-
-       local_gotno = tpnt->dynamic_info[DT_AVR32_LOCAL_GOTNO];
-       gotsym = tpnt->dynamic_info[DT_AVR32_GOTSYM];
-
-       sym = ((Elf32_Sym *)(tpnt->dynamic_info[DT_SYMTAB] + tpnt->loadaddr))
-               + sym_index;
-       strtab = (char *)(tpnt->dynamic_info[DT_STRTAB] + tpnt->loadaddr);
-       symname = strtab + sym->st_name;
-
-       new_addr = (unsigned long) _dl_find_hash(strtab + sym->st_name,
-                                                tpnt->symbol_scope, tpnt,
-                                                resolver);
-
-       entry = (unsigned long *)(got + local_gotno + sym_index - gotsym);
-       *entry = new_addr;
-
-       return new_addr;
+	struct elf_resolve *tpnt = (struct elf_resolve *)got[1];
+	Elf32_Sym *sym;
+	unsigned long local_gotno;
+	unsigned long gotsym;
+	unsigned long new_addr;
+	char *strtab, *symname;
+	unsigned long *entry;
+	unsigned long sym_index = got_offset / 4;
+
+	local_gotno = tpnt->dynamic_info[DT_AVR32_LOCAL_GOTNO];
+	gotsym = tpnt->dynamic_info[DT_AVR32_GOTSYM];
+
+	sym = ((Elf32_Sym *)(tpnt->dynamic_info[DT_SYMTAB] + tpnt->loadaddr))
+		+ sym_index;
+	strtab = (char *)(tpnt->dynamic_info[DT_STRTAB] + tpnt->loadaddr);
+	symname = strtab + sym->st_name;
+
+	new_addr = (unsigned long) _dl_find_hash(strtab + sym->st_name,
+						 tpnt->symbol_scope, tpnt,
+						 resolver);
+
+	entry = (unsigned long *)(got + local_gotno + sym_index - gotsym);
+	*entry = new_addr;
+
+	return new_addr;
 #endif
-       return 0;
+	return 0;
 }
 
 static int
 _dl_parse(struct elf_resolve *tpnt, struct dyn_elf *scope,
-         unsigned long rel_addr, unsigned long rel_size,
-         int (*reloc_func)(struct elf_resolve *tpnt, struct dyn_elf *scope,
-                           Elf32_Rela *rpnt, Elf32_Sym *symtab, char *strtab))
+	  unsigned long rel_addr, unsigned long rel_size,
+	  int (*reloc_func)(struct elf_resolve *tpnt, struct dyn_elf *scope,
+			    Elf32_Rela *rpnt, Elf32_Sym *symtab, char *strtab))
 {
-       Elf32_Sym *symtab;
-       Elf32_Rela *rpnt;
-       char *strtab;
-       int i;
+	Elf32_Sym *symtab;
+	Elf32_Rela *rpnt;
+	char *strtab;
+	int i;
 
-       rpnt = (Elf32_Rela *)rel_addr;
-       rel_size /= sizeof(Elf32_Rela);
-       symtab = (Elf32_Sym *)tpnt->dynamic_info[DT_SYMTAB];
-       strtab = (char *)tpnt->dynamic_info[DT_STRTAB];
+	rpnt = (Elf32_Rela *)rel_addr;
+	rel_size /= sizeof(Elf32_Rela);
+	symtab = (Elf32_Sym *)tpnt->dynamic_info[DT_SYMTAB];
+	strtab = (char *)tpnt->dynamic_info[DT_STRTAB];
 
-       for (i = 0; i < rel_size; i++, rpnt++) {
-               int symtab_index, res;
+	for (i = 0; i < rel_size; i++, rpnt++) {
+		int symtab_index, res;
 
-               symtab_index = ELF32_R_SYM(rpnt->r_info);
+		symtab_index = ELF32_R_SYM(rpnt->r_info);
 
-               debug_sym(symtab, strtab, symtab_index);
-               debug_reloc(symtab, strtab, rpnt);
+		debug_sym(symtab, strtab, symtab_index);
+		debug_reloc(symtab, strtab, rpnt);
 
-               res = reloc_func(tpnt, scope, rpnt, symtab, strtab);
+		res = reloc_func(tpnt, scope, rpnt, symtab, strtab);
 
-               if (res == 0)
-                       continue;
+		if (res == 0)
+			continue;
 
-               _dl_dprintf(2, "\n%s: ", _dl_progname);
+		_dl_dprintf(2, "\n%s: ", _dl_progname);
 
-               if (symtab_index)
-                       _dl_dprintf(2, "symbol '%s': ",
-                                   strtab + symtab[symtab_index].st_name);
+		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);
+		if (res < 0) {
+			int reloc_type = ELF32_R_TYPE(rpnt->r_info);
 #if defined(__SUPPORT_LD_DEBUG__)
-                       _dl_dprintf(2, "can't handle reloc type %s\n",
-                                   _dl_reltypes(reloc_type));
+			_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);
+			_dl_dprintf(2, "can't handle reloc type %x\n",
+				    reloc_type);
 #endif
-                       _dl_exit(-res);
-               } else {
-                       _dl_dprintf(2, "can't resolve symbol\n");
-                       return res;
-               }
-       }
-
-       return 0;
+			_dl_exit(-res);
+		} else {
+			_dl_dprintf(2, "can't resolve symbol\n");
+			return res;
+		}
+	}
+
+	return 0;
 }
 
 static int _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
-                       Elf32_Rela *rpnt, Elf32_Sym *symtab, char *strtab)
+			Elf32_Rela *rpnt, Elf32_Sym *symtab, char *strtab)
 {
-       int reloc_type;
-       int symtab_index;
-       char *symname;
-       unsigned long *reloc_addr;
-       unsigned long symbol_addr;
+	int reloc_type;
+	int symtab_index;
+	char *symname;
+	unsigned long *reloc_addr;
+	unsigned long symbol_addr;
 #if defined(__SUPPORT_LD_DEBUG__)
-       unsigned long old_val;
+	unsigned long old_val;
 #endif
 
-       reloc_addr = (unsigned long *)(tpnt->loadaddr + rpnt->r_offset);
-       reloc_type = ELF32_R_TYPE(rpnt->r_info);
-       symtab_index = ELF32_R_SYM(rpnt->r_info);
-       symbol_addr = 0;
-       symname = strtab + symtab[symtab_index].st_name;
-
-       if (symtab_index) {
-               symbol_addr = (unsigned long)
-                       _dl_find_hash(strtab + symtab[symtab_index].st_name,
-                                     tpnt->symbol_scope, tpnt,
-                                     elf_machine_type_class(reloc_type));
-
-               /* Allow undefined references to weak symbols */
-               if (!symbol_addr &&
-                   ELF32_ST_BIND(symtab[symtab_index].st_info) != STB_WEAK) {
-                       _dl_dprintf(2, "%s: can't resolve symbol '%s'\n",
-                                   _dl_progname, symname);
-                       return 0;
-               }
-       }
+	reloc_addr = (unsigned long *)(tpnt->loadaddr + rpnt->r_offset);
+	reloc_type = ELF32_R_TYPE(rpnt->r_info);
+	symtab_index = ELF32_R_SYM(rpnt->r_info);
+	symbol_addr = 0;
+	symname = strtab + symtab[symtab_index].st_name;
+
+	if (symtab_index) {
+		symbol_addr = (unsigned long)
+			_dl_find_hash(strtab + symtab[symtab_index].st_name,
+				      tpnt->symbol_scope, tpnt,
+				      elf_machine_type_class(reloc_type));
+
+		/* Allow undefined references to weak symbols */
+		if (!symbol_addr &&
+		    ELF32_ST_BIND(symtab[symtab_index].st_info) != STB_WEAK) {
+			_dl_dprintf(2, "%s: can't resolve symbol '%s'\n",
+				    _dl_progname, symname);
+			return 0;
+		}
+	}
 
 #if defined(__SUPPORT_LD_DEBUG__)
-       old_val = *reloc_addr;
+	old_val = *reloc_addr;
 #endif
-       switch (reloc_type) {
-       case R_AVR32_NONE:
-               break;
-       case R_AVR32_GLOB_DAT:
-       case R_AVR32_JMP_SLOT:
-               *reloc_addr = symbol_addr + rpnt->r_addend;
-               break;
-       case R_AVR32_RELATIVE:
-               *reloc_addr = (unsigned long)tpnt->loadaddr
-                       + rpnt->r_addend;
-               break;
-       default:
-               return -1;
-       }
+	switch (reloc_type) {
+	case R_AVR32_NONE:
+		break;
+	case R_AVR32_GLOB_DAT:
+	case R_AVR32_JMP_SLOT:
+		*reloc_addr = symbol_addr + rpnt->r_addend;
+		break;
+	case R_AVR32_RELATIVE:
+		*reloc_addr = (unsigned long)tpnt->loadaddr
+			+ rpnt->r_addend;
+		break;
+	default:
+		return -1;
+	}
 
 #if defined(__SUPPORT_LD_DEBUG__)
-       if (_dl_debug_reloc && _dl_debug_detail)
-               _dl_dprintf(_dl_debug_file, "\tpatched: %x ==> %x @ %x\n",
-                           old_val, *reloc_addr);
+	if (_dl_debug_reloc && _dl_debug_detail)
+		_dl_dprintf(_dl_debug_file, "\tpatched: %x ==> %x @ %x\n",
+			    old_val, *reloc_addr);
 #endif
 
-       return 0;
+	return 0;
 }
 
 void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt,
-                                          unsigned long rel_addr,
-                                          unsigned long rel_size)
+					   unsigned long rel_addr,
+					   unsigned long rel_size)
 {
-       /* TODO: Might want to support this in order to get faster
-        * startup times... */
+	/* TODO: Might want to support this in order to get faster
+	 * startup times... */
 }
 
 int _dl_parse_relocation_information(struct dyn_elf *rpnt,
-                                    unsigned long rel_addr,
-                                    unsigned long rel_size)
+				     unsigned long rel_addr,
+				     unsigned long rel_size)
 {
-       return _dl_parse(rpnt->dyn, rpnt->dyn->symbol_scope, rel_addr, rel_size,
-                        _dl_do_reloc);
+	return _dl_parse(rpnt->dyn, rpnt->dyn->symbol_scope, rel_addr, rel_size,
+			 _dl_do_reloc);
 }