Module Name: src
Committed By: joerg
Date: Thu Jun 15 23:10:12 UTC 2017
Modified Files:
src/libexec/ld.elf_so/arch/sparc64: mdreloc.c
Log Message:
Fix indentation.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/libexec/ld.elf_so/arch/sparc64/mdreloc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/arch/sparc64/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/sparc64/mdreloc.c:1.59 src/libexec/ld.elf_so/arch/sparc64/mdreloc.c:1.60
--- src/libexec/ld.elf_so/arch/sparc64/mdreloc.c:1.59 Mon Aug 29 16:00:10 2016
+++ src/libexec/ld.elf_so/arch/sparc64/mdreloc.c Thu Jun 15 23:10:12 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: mdreloc.c,v 1.59 2016/08/29 16:00:10 martin Exp $ */
+/* $NetBSD: mdreloc.c,v 1.60 2017/06/15 23:10:12 joerg Exp $ */
/*-
* Copyright (c) 2000 Eduardo Horvath.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.59 2016/08/29 16:00:10 martin Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.60 2017/06/15 23:10:12 joerg Exp $");
#endif /* not lint */
#include <errno.h>
@@ -352,57 +352,55 @@ _rtld_relocate_nonplt_objects(Obj_Entry
*/
if (RELOC_TLS(type)) {
switch (type) {
- case R_TYPE(TLS_DTPMOD64):
- def = _rtld_find_symdef(symnum, obj,
- &defobj, false);
- if (def == NULL)
- return -1;
-
- *where = (Elf64_Addr)defobj->tlsindex;
-
- rdbg(("TLS_DTPMOD64 %s in %s --> %p",
- obj->strtab +
- obj->symtab[symnum].st_name,
- obj->path, (void *)*where));
-
- break;
-
- case R_TYPE(TLS_DTPOFF64):
- def = _rtld_find_symdef(symnum, obj,
- &defobj, false);
- if (def == NULL)
- return -1;
-
- *where = (Elf64_Addr)(def->st_value
- + rela->r_addend);
-
- rdbg(("DTPOFF64 %s in %s --> %p",
- obj->strtab +
- obj->symtab[symnum].st_name,
- obj->path, (void *)*where));
-
- break;
-
- case R_TYPE(TLS_TPOFF64):
- def = _rtld_find_symdef(symnum, obj,
- &defobj, false);
- if (def == NULL)
- return -1;
-
- if (!defobj->tls_done &&
- _rtld_tls_offset_allocate(obj))
- return -1;
-
- *where = (Elf64_Addr)(def->st_value -
- defobj->tlsoffset +
- rela->r_addend);
-
- rdbg(("TLS_TPOFF64 %s in %s --> %p",
- obj->strtab +
- obj->symtab[symnum].st_name,
- obj->path, (void *)*where));
+ case R_TYPE(TLS_DTPMOD64):
+ def = _rtld_find_symdef(symnum, obj,
+ &defobj, false);
+ if (def == NULL)
+ return -1;
+
+ *where = (Elf64_Addr)defobj->tlsindex;
+
+ rdbg(("TLS_DTPMOD64 %s in %s --> %p",
+ obj->strtab +
+ obj->symtab[symnum].st_name,
+ obj->path, (void *)*where));
+
+ break;
+
+ case R_TYPE(TLS_DTPOFF64):
+ def = _rtld_find_symdef(symnum, obj,
+ &defobj, false);
+ if (def == NULL)
+ return -1;
+
+ *where = (Elf64_Addr)(def->st_value
+ + rela->r_addend);
+
+ rdbg(("DTPOFF64 %s in %s --> %p",
+ obj->strtab +
+ obj->symtab[symnum].st_name,
+ obj->path, (void *)*where));
+
+ break;
+
+ case R_TYPE(TLS_TPOFF64):
+ def = _rtld_find_symdef(symnum, obj,
+ &defobj, false);
+ if (def == NULL)
+ return -1;
+
+ if (!defobj->tls_done &&
+ _rtld_tls_offset_allocate(obj))
+ return -1;
+
+ *where = (Elf64_Addr)(def->st_value -
+ defobj->tlsoffset + rela->r_addend);
+
+ rdbg(("TLS_TPOFF64 %s in %s --> %p",
+ obj->strtab + obj->symtab[symnum].st_name,
+ obj->path, (void *)*where));
- break;
+ break;
}
continue;
}
