Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/libexec/ld.elf_so/arch Fix indentation.



details:   https://anonhg.NetBSD.org/src/rev/9b2098ffd6d8
branches:  trunk
changeset: 354420:9b2098ffd6d8
user:      joerg <joerg%NetBSD.org@localhost>
date:      Thu Jun 15 23:08:46 2017 +0000

description:
Fix indentation.

diffstat:

 libexec/ld.elf_so/arch/sparc/mdreloc.c   |  83 +++++++++++++++----------------
 libexec/ld.elf_so/arch/sparc64/mdreloc.c |  80 +++++++++++++++---------------
 2 files changed, 80 insertions(+), 83 deletions(-)

diffs (228 lines):

diff -r 61db5dcd99d5 -r 9b2098ffd6d8 libexec/ld.elf_so/arch/sparc/mdreloc.c
--- a/libexec/ld.elf_so/arch/sparc/mdreloc.c    Thu Jun 15 22:08:07 2017 +0000
+++ b/libexec/ld.elf_so/arch/sparc/mdreloc.c    Thu Jun 15 23:08:46 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mdreloc.c,v 1.48 2014/08/25 20:40:52 joerg Exp $       */
+/*     $NetBSD: mdreloc.c,v 1.49 2017/06/15 23:08:46 joerg Exp $       */
 
 /*-
  * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.48 2014/08/25 20:40:52 joerg Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.49 2017/06/15 23:08:46 joerg Exp $");
 #endif /* not lint */
 
 #include <errno.h>
@@ -238,57 +238,56 @@
                 */
                if (RELOC_TLS(type)) {
                        switch (type) {
-                               case R_TYPE(TLS_DTPMOD32):
-                                       def = _rtld_find_symdef(symnum, obj,
-                                           &defobj, false);
-                                       if (def == NULL)
-                                               return -1;
+                       case R_TYPE(TLS_DTPMOD32):
+                               def = _rtld_find_symdef(symnum, obj,
+                                   &defobj, false);
+                               if (def == NULL)
+                                       return -1;
 
-                                       *where = (Elf_Addr)defobj->tlsindex;
+                               *where = (Elf_Addr)defobj->tlsindex;
 
-                                       rdbg(("TLS_DTPMOD32 %s in %s --> %p",
-                                           obj->strtab +
-                                           obj->symtab[symnum].st_name,
-                                           obj->path, (void *)*where));
+                               rdbg(("TLS_DTPMOD32 %s in %s --> %p",
+                                   obj->strtab +
+                                   obj->symtab[symnum].st_name,
+                                   obj->path, (void *)*where));
 
-                                       break;
+                               break;
 
-                               case R_TYPE(TLS_DTPOFF32):
-                                       def = _rtld_find_symdef(symnum, obj,
-                                           &defobj, false);
-                                       if (def == NULL)
-                                               return -1;
+                       case R_TYPE(TLS_DTPOFF32):
+                               def = _rtld_find_symdef(symnum, obj,
+                                   &defobj, false);
+                               if (def == NULL)
+                                       return -1;
 
-                                       *where = (Elf_Addr)(def->st_value
-                                           + rela->r_addend);
+                               *where = (Elf_Addr)(def->st_value
+                                   + rela->r_addend);
 
-                                       rdbg(("TLS_DTPOFF32 %s in %s --> %p",
-                                           obj->strtab +
-                                               obj->symtab[symnum].st_name,
-                                           obj->path, (void *)*where));
+                               rdbg(("TLS_DTPOFF32 %s in %s --> %p",
+                                   obj->strtab +
+                                       obj->symtab[symnum].st_name,
+                                   obj->path, (void *)*where));
 
-                                       break;
+                               break;
 
-                               case R_TYPE(TLS_TPOFF32):
-                                       def = _rtld_find_symdef(symnum, obj,
-                                           &defobj, false);
-                                       if (def == NULL)
-                                               return -1;
+                       case R_TYPE(TLS_TPOFF32):
+                               def = _rtld_find_symdef(symnum, obj,
+                                   &defobj, false);
+                               if (def == NULL)
+                                       return -1;
 
-                                       if (!defobj->tls_done &&
-                                               _rtld_tls_offset_allocate(obj))
-                                                    return -1;
+                               if (!defobj->tls_done &&
+                                       _rtld_tls_offset_allocate(obj))
+                                            return -1;
+
+                               *where = (Elf_Addr)(def->st_value -
+                                   defobj->tlsoffset + rela->r_addend);
 
-                                       *where = (Elf_Addr)(def->st_value -
-                                                   defobj->tlsoffset +
-                                                   rela->r_addend);
+                               rdbg(("TLS_TPOFF32 %s in %s --> %p",
+                                   obj->strtab +
+                                   obj->symtab[symnum].st_name,
+                                   obj->path, (void *)*where));
 
-                                       rdbg(("TLS_TPOFF32 %s in %s --> %p",
-                                           obj->strtab +
-                                           obj->symtab[symnum].st_name,
-                                           obj->path, (void *)*where));
-
-                                       break;
+                               break;
                        }
                        continue;
                }
diff -r 61db5dcd99d5 -r 9b2098ffd6d8 libexec/ld.elf_so/arch/sparc64/mdreloc.c
--- a/libexec/ld.elf_so/arch/sparc64/mdreloc.c  Thu Jun 15 22:08:07 2017 +0000
+++ b/libexec/ld.elf_so/arch/sparc64/mdreloc.c  Thu Jun 15 23:08:46 2017 +0000
@@ -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 @@
                 */
                if (RELOC_TLS(type)) {
                        switch (type) {
-                               case R_TYPE(TLS_DTPMOD64):
-                                       def = _rtld_find_symdef(symnum, obj,
-                                           &defobj, false);
-                                       if (def == NULL)
-                                               return -1;
+                       case R_TYPE(TLS_DTPMOD64):
+                               def = _rtld_find_symdef(symnum, obj,
+                                   &defobj, false);
+                               if (def == NULL)
+                                       return -1;
 
-                                       *where = (Elf64_Addr)defobj->tlsindex;
+                               *where = (Elf64_Addr)defobj->tlsindex;
 
-                                       rdbg(("TLS_DTPMOD64 %s in %s --> %p",
-                                           obj->strtab +
-                                           obj->symtab[symnum].st_name,
-                                           obj->path, (void *)*where));
+                               rdbg(("TLS_DTPMOD64 %s in %s --> %p",
+                                   obj->strtab +
+                                   obj->symtab[symnum].st_name,
+                                   obj->path, (void *)*where));
 
-                                       break;
+                               break;
 
-                               case R_TYPE(TLS_DTPOFF64):
-                                       def = _rtld_find_symdef(symnum, obj,
-                                           &defobj, false);
-                                       if (def == NULL)
-                                               return -1;
+                       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);
+                               *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));
+                               rdbg(("DTPOFF64 %s in %s --> %p",
+                                   obj->strtab +
+                                       obj->symtab[symnum].st_name,
+                                   obj->path, (void *)*where));
 
-                                       break;
+                               break;
 
-                               case R_TYPE(TLS_TPOFF64):
-                                       def = _rtld_find_symdef(symnum, obj,
-                                           &defobj, false);
-                                       if (def == NULL)
-                                               return -1;
+                       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;
+                               if (!defobj->tls_done &&
+                                       _rtld_tls_offset_allocate(obj))
+                                            return -1;
 
-                                       *where = (Elf64_Addr)(def->st_value -
-                                                   defobj->tlsoffset +
-                                                   rela->r_addend);
+                               *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));
+                               rdbg(("TLS_TPOFF64 %s in %s --> %p",
+                                   obj->strtab + obj->symtab[symnum].st_name,
+                                   obj->path, (void *)*where));
 
-                                       break;
+                               break;
                        }
                        continue;
                }



Home | Main Index | Thread Index | Old Index