Module Name: src
Committed By: riastradh
Date: Sat Aug 3 21:59:59 UTC 2024
Modified Files:
src/libexec/ld.elf_so: debug.h headers.c map_object.c
src/libexec/ld.elf_so/arch/alpha: alpha_reloc.c
src/libexec/ld.elf_so/arch/arm: mdreloc.c
src/libexec/ld.elf_so/arch/i386: mdreloc.c
src/libexec/ld.elf_so/arch/mips: mips_reloc.c rtld_start.S
src/libexec/ld.elf_so/arch/or1k: mdreloc.c
src/libexec/ld.elf_so/arch/powerpc: ppc_reloc.c
src/libexec/ld.elf_so/arch/sparc: mdreloc.c
src/libexec/ld.elf_so/arch/sparc64: mdreloc.c rtld_start.S
src/libexec/ld.elf_so/arch/vax: rtld_start.S
src/libexec/ld.elf_so/arch/x86_64: mdreloc.c
Log Message:
ld.elf_so(1): Nix trailing whitespace.
No functional change intended.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/libexec/ld.elf_so/debug.h
cvs rdiff -u -r1.71 -r1.72 src/libexec/ld.elf_so/headers.c
cvs rdiff -u -r1.68 -r1.69 src/libexec/ld.elf_so/map_object.c
cvs rdiff -u -r1.44 -r1.45 src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c
cvs rdiff -u -r1.47 -r1.48 src/libexec/ld.elf_so/arch/arm/mdreloc.c
cvs rdiff -u -r1.43 -r1.44 src/libexec/ld.elf_so/arch/i386/mdreloc.c
cvs rdiff -u -r1.75 -r1.76 src/libexec/ld.elf_so/arch/mips/mips_reloc.c
cvs rdiff -u -r1.10 -r1.11 src/libexec/ld.elf_so/arch/mips/rtld_start.S
cvs rdiff -u -r1.4 -r1.5 src/libexec/ld.elf_so/arch/or1k/mdreloc.c
cvs rdiff -u -r1.64 -r1.65 src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c
cvs rdiff -u -r1.59 -r1.60 src/libexec/ld.elf_so/arch/sparc/mdreloc.c
cvs rdiff -u -r1.71 -r1.72 src/libexec/ld.elf_so/arch/sparc64/mdreloc.c
cvs rdiff -u -r1.17 -r1.18 src/libexec/ld.elf_so/arch/sparc64/rtld_start.S
cvs rdiff -u -r1.24 -r1.25 src/libexec/ld.elf_so/arch/vax/rtld_start.S
cvs rdiff -u -r1.48 -r1.49 src/libexec/ld.elf_so/arch/x86_64/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/debug.h
diff -u src/libexec/ld.elf_so/debug.h:1.7 src/libexec/ld.elf_so/debug.h:1.8
--- src/libexec/ld.elf_so/debug.h:1.7 Sat Aug 3 13:17:05 2013
+++ src/libexec/ld.elf_so/debug.h Sat Aug 3 21:59:57 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: debug.h,v 1.7 2013/08/03 13:17:05 skrll Exp $ */
+/* $NetBSD: debug.h,v 1.8 2024/08/03 21:59:57 riastradh Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -55,7 +55,7 @@ extern int debug;
# define rdbg(a) ((void) 0)
#endif
-#if ELFSIZE == 64
+#if ELFSIZE == 64
#define PRImemsz PRIu64
#else
#define PRImemsz PRIu32
Index: src/libexec/ld.elf_so/headers.c
diff -u src/libexec/ld.elf_so/headers.c:1.71 src/libexec/ld.elf_so/headers.c:1.72
--- src/libexec/ld.elf_so/headers.c:1.71 Wed Jan 4 01:37:24 2023
+++ src/libexec/ld.elf_so/headers.c Sat Aug 3 21:59:57 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: headers.c,v 1.71 2023/01/04 01:37:24 christos Exp $ */
+/* $NetBSD: headers.c,v 1.72 2024/08/03 21:59:57 riastradh Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: headers.c,v 1.71 2023/01/04 01:37:24 christos Exp $");
+__RCSID("$NetBSD: headers.c,v 1.72 2024/08/03 21:59:57 riastradh Exp $");
#endif /* not lint */
#include <err.h>
@@ -435,10 +435,10 @@ _rtld_digest_dynamic(const char *execnam
#ifdef RTLD_LOADER
#if defined(__HAVE_FUNCTION_DESCRIPTORS)
- if (init != 0)
+ if (init != 0)
obj->init = (void (*)(void))
_rtld_function_descriptor_alloc(obj, NULL, init);
- if (fini != 0)
+ if (fini != 0)
obj->fini = (void (*)(void))
_rtld_function_descriptor_alloc(obj, NULL, fini);
#else
Index: src/libexec/ld.elf_so/map_object.c
diff -u src/libexec/ld.elf_so/map_object.c:1.68 src/libexec/ld.elf_so/map_object.c:1.69
--- src/libexec/ld.elf_so/map_object.c:1.68 Fri Aug 2 11:45:52 2024
+++ src/libexec/ld.elf_so/map_object.c Sat Aug 3 21:59:57 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: map_object.c,v 1.68 2024/08/02 11:45:52 skrll Exp $ */
+/* $NetBSD: map_object.c,v 1.69 2024/08/03 21:59:57 riastradh Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: map_object.c,v 1.68 2024/08/02 11:45:52 skrll Exp $");
+__RCSID("$NetBSD: map_object.c,v 1.69 2024/08/03 21:59:57 riastradh Exp $");
#endif /* not lint */
#include <errno.h>
@@ -359,7 +359,7 @@ _rtld_map_object(const char *path, int f
data_prot = convert_prot(segs[i]->p_flags);
data_flags = convert_flags(segs[i]->p_flags) | MAP_FIXED;
if (data_vlimit != data_vaddr &&
- mmap(data_addr, data_vlimit - data_vaddr, data_prot,
+ mmap(data_addr, data_vlimit - data_vaddr, data_prot,
data_flags, fd, data_offset) == MAP_FAILED) {
_rtld_error("%s: mmap of data failed: %s", path,
xstrerror(errno));
Index: src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c
diff -u src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c:1.44 src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c:1.45
--- src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c:1.44 Sun Jun 4 01:24:57 2023
+++ src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c Sat Aug 3 21:59:58 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: alpha_reloc.c,v 1.44 2023/06/04 01:24:57 joerg Exp $ */
+/* $NetBSD: alpha_reloc.c,v 1.45 2024/08/03 21:59:58 riastradh Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,18 +36,18 @@
*/
/*
- * Copyright 1996, 1997, 1998, 1999 John D. Polstra.
+ * Copyright 1996, 1997, 1998, 1999 John D. Polstra.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
- * are met:
+ * are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -62,7 +62,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: alpha_reloc.c,v 1.44 2023/06/04 01:24:57 joerg Exp $");
+__RCSID("$NetBSD: alpha_reloc.c,v 1.45 2024/08/03 21:59:58 riastradh Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -371,7 +371,7 @@ _rtld_relocate_plt_object(const Obj_Entr
Elf_Addr new_value;
const Elf_Sym *def;
const Obj_Entry *defobj;
- Elf_Addr stubaddr;
+ Elf_Addr stubaddr;
unsigned long info = rela->r_info;
assert(ELF_R_TYPE(info) == R_TYPE(JMP_SLOT));
@@ -549,7 +549,7 @@ out:
caddr_t
_rtld_bind(const Obj_Entry *obj, Elf_Addr reloff)
{
- const Elf_Rela *rela =
+ const Elf_Rela *rela =
(const Elf_Rela *)((const uint8_t *)obj->pltrela + reloff);
Elf_Addr result = 0; /* XXX gcc */
int err;
Index: src/libexec/ld.elf_so/arch/arm/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/arm/mdreloc.c:1.47 src/libexec/ld.elf_so/arch/arm/mdreloc.c:1.48
--- src/libexec/ld.elf_so/arch/arm/mdreloc.c:1.47 Mon Jul 22 23:10:35 2024
+++ src/libexec/ld.elf_so/arch/arm/mdreloc.c Sat Aug 3 21:59:58 2024
@@ -1,8 +1,8 @@
-/* $NetBSD: mdreloc.c,v 1.47 2024/07/22 23:10:35 riastradh Exp $ */
+/* $NetBSD: mdreloc.c,v 1.48 2024/08/03 21:59:58 riastradh Exp $ */
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.47 2024/07/22 23:10:35 riastradh Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.48 2024/08/03 21:59:58 riastradh Exp $");
#endif /* not lint */
/*
@@ -350,7 +350,7 @@ _rtld_relocate_plt_objects(const Obj_Ent
{
const Elf_Rel *rel;
int err = 0;
-
+
for (rel = obj->pltrel; rel < obj->pltrellim; rel++) {
err = _rtld_relocate_plt_object(obj, rel, NULL);
if (err)
Index: src/libexec/ld.elf_so/arch/i386/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/i386/mdreloc.c:1.43 src/libexec/ld.elf_so/arch/i386/mdreloc.c:1.44
--- src/libexec/ld.elf_so/arch/i386/mdreloc.c:1.43 Sun Jun 4 20:02:29 2023
+++ src/libexec/ld.elf_so/arch/i386/mdreloc.c Sat Aug 3 21:59:58 2024
@@ -1,8 +1,8 @@
-/* $NetBSD: mdreloc.c,v 1.43 2023/06/04 20:02:29 martin Exp $ */
+/* $NetBSD: mdreloc.c,v 1.44 2024/08/03 21:59:58 riastradh Exp $ */
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.43 2023/06/04 20:02:29 martin Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.44 2024/08/03 21:59:58 riastradh Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -257,7 +257,7 @@ _rtld_relocate_plt_object(const Obj_Entr
}
rdbg(("bind now/fixup in %s --> old=%p new=%p",
- defobj->strtab + def->st_name, (void *)*where,
+ defobj->strtab + def->st_name, (void *)*where,
(void *)target));
if (*where != target)
*where = target;
@@ -290,7 +290,7 @@ _rtld_relocate_plt_objects(const Obj_Ent
{
const Elf_Rel *rel;
int err = 0;
-
+
for (rel = obj->pltrel; rel < obj->pltrellim; rel++) {
err = _rtld_relocate_plt_object(obj, rel, NULL);
if (err)
Index: src/libexec/ld.elf_so/arch/mips/mips_reloc.c
diff -u src/libexec/ld.elf_so/arch/mips/mips_reloc.c:1.75 src/libexec/ld.elf_so/arch/mips/mips_reloc.c:1.76
--- src/libexec/ld.elf_so/arch/mips/mips_reloc.c:1.75 Sun Jun 4 01:24:57 2023
+++ src/libexec/ld.elf_so/arch/mips/mips_reloc.c Sat Aug 3 21:59:58 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_reloc.c,v 1.75 2023/06/04 01:24:57 joerg Exp $ */
+/* $NetBSD: mips_reloc.c,v 1.76 2024/08/03 21:59:58 riastradh Exp $ */
/*
* Copyright 1997 Michael L. Hitch <mhi...@montana.edu>
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: mips_reloc.c,v 1.75 2023/06/04 01:24:57 joerg Exp $");
+__RCSID("$NetBSD: mips_reloc.c,v 1.76 2024/08/03 21:59:58 riastradh Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -327,7 +327,7 @@ _rtld_relocate_nonplt_objects(Obj_Entry
case R_TYPE(TLS_DTPREL64):
case R_TYPE(TLS_TPREL64):
#else
- case R_TYPE(TLS_DTPMOD32):
+ case R_TYPE(TLS_DTPMOD32):
case R_TYPE(TLS_DTPREL32):
case R_TYPE(TLS_TPREL32):
#endif
@@ -405,7 +405,7 @@ _rtld_relocate_nonplt_objects(Obj_Entry
#if ELFSIZE == 64
case R_TYPE(TLS_DTPMOD64):
#else
- case R_TYPE(TLS_DTPMOD32):
+ case R_TYPE(TLS_DTPMOD32):
#endif
{
Elf_Addr old = load_ptr(where, ELFSIZE / 8);
Index: src/libexec/ld.elf_so/arch/mips/rtld_start.S
diff -u src/libexec/ld.elf_so/arch/mips/rtld_start.S:1.10 src/libexec/ld.elf_so/arch/mips/rtld_start.S:1.11
--- src/libexec/ld.elf_so/arch/mips/rtld_start.S:1.10 Mon Dec 14 00:41:19 2009
+++ src/libexec/ld.elf_so/arch/mips/rtld_start.S Sat Aug 3 21:59:58 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld_start.S,v 1.10 2009/12/14 00:41:19 matt Exp $ */
+/* $NetBSD: rtld_start.S,v 1.11 2024/08/03 21:59:58 riastradh Exp $ */
/*
* Copyright 1997 Michael L. Hitch <mhi...@montana.edu>
@@ -120,7 +120,7 @@ _rtld_bind_start:
jal _C_LABEL(_rtld_bind)
nop
move sp, s0
- REG_L ra, XCALLFRAME_RA(sp)
+ REG_L ra, XCALLFRAME_RA(sp)
REG_L s0, XCALLFRAME_S0(sp)
REG_L a0, XCALLFRAME_A0(sp)
REG_L a1, XCALLFRAME_A1(sp)
Index: src/libexec/ld.elf_so/arch/or1k/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/or1k/mdreloc.c:1.4 src/libexec/ld.elf_so/arch/or1k/mdreloc.c:1.5
--- src/libexec/ld.elf_so/arch/or1k/mdreloc.c:1.4 Sun Jun 4 01:24:57 2023
+++ src/libexec/ld.elf_so/arch/or1k/mdreloc.c Sat Aug 3 21:59:58 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mdreloc.c,v 1.4 2023/06/04 01:24:57 joerg Exp $ */
+/* $NetBSD: mdreloc.c,v 1.5 2024/08/03 21:59:58 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.4 2023/06/04 01:24:57 joerg Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.5 2024/08/03 21:59:58 riastradh Exp $");
#endif /* not lint */
#include <stdarg.h>
@@ -247,7 +247,7 @@ _rtld_relocate_plt_object(const Obj_Entr
return 0;
value = (Elf_Addr)(defobj->relocbase + def->st_value);
- rdbg(("bind now/fixup in %s --> new=%p",
+ rdbg(("bind now/fixup in %s --> new=%p",
defobj->strtab + def->st_name, (void *)value));
/*
@@ -273,7 +273,7 @@ _rtld_bind(const Obj_Entry *obj, Elf_Wor
new_value = 0; /* XXX gcc */
_rtld_shared_enter();
- err = _rtld_relocate_plt_object(obj, rela, reloff, &new_value);
+ err = _rtld_relocate_plt_object(obj, rela, reloff, &new_value);
if (err)
_rtld_die();
_rtld_shared_exit();
@@ -286,7 +286,7 @@ _rtld_relocate_plt_objects(const Obj_Ent
{
const Elf_Rela *rela;
int reloff;
-
+
for (rela = obj->pltrela, reloff = 0; rela < obj->pltrelalim; rela++, reloff++) {
if (_rtld_relocate_plt_object(obj, rela, reloff, NULL) < 0)
return -1;
Index: src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c
diff -u src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c:1.64 src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c:1.65
--- src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c:1.64 Tue Jul 23 10:17:32 2024
+++ src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c Sat Aug 3 21:59:58 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ppc_reloc.c,v 1.64 2024/07/23 10:17:32 uwe Exp $ */
+/* $NetBSD: ppc_reloc.c,v 1.65 2024/08/03 21:59:58 riastradh Exp $ */
/*-
* Copyright (C) 1998 Tsubai Masanari
@@ -43,7 +43,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ppc_reloc.c,v 1.64 2024/07/23 10:17:32 uwe Exp $");
+__RCSID("$NetBSD: ppc_reloc.c,v 1.65 2024/08/03 21:59:58 riastradh Exp $");
#endif /* not lint */
#include <stdarg.h>
@@ -455,7 +455,7 @@ _rtld_relocate_plt_object(const Obj_Entr
} else {
value = (Elf_Addr)(defobj->relocbase + def->st_value);
}
- rdbg(("bind now/fixup in %s --> new=%p",
+ rdbg(("bind now/fixup in %s --> new=%p",
defobj->strtab + def->st_name, (void *)value));
#ifdef _LP64
@@ -486,14 +486,14 @@ _rtld_relocate_plt_object(const Obj_Entr
} else {
Elf_Addr *pltcall, *jmptab;
int N = obj->pltrelalim - obj->pltrela;
-
+
/* Entries beyond 8192 take twice as much space. */
if (N > 8192)
N += N-8192;
pltcall = obj->pltgot;
jmptab = pltcall + 18 + N * 2;
-
+
jmptab[reloff] = value;
if (reloff < 32768) {
@@ -538,7 +538,7 @@ _rtld_bind(const Obj_Entry *obj, Elf_Wor
new_value = 0; /* XXX gcc */
_rtld_shared_enter();
- err = _rtld_relocate_plt_object(obj, rela, reloff, &new_value);
+ err = _rtld_relocate_plt_object(obj, rela, reloff, &new_value);
if (err)
_rtld_die();
_rtld_shared_exit();
@@ -555,7 +555,7 @@ _rtld_relocate_plt_objects(const Obj_Ent
{
const Elf_Rela *rela;
int reloff;
-
+
for (rela = obj->pltrela, reloff = 0; rela < obj->pltrelalim; rela++, reloff++) {
if (_rtld_relocate_plt_object(obj, rela, reloff, NULL) < 0)
return -1;
Index: src/libexec/ld.elf_so/arch/sparc/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/sparc/mdreloc.c:1.59 src/libexec/ld.elf_so/arch/sparc/mdreloc.c:1.60
--- src/libexec/ld.elf_so/arch/sparc/mdreloc.c:1.59 Tue Jul 23 09:55:19 2024
+++ src/libexec/ld.elf_so/arch/sparc/mdreloc.c Sat Aug 3 21:59:58 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mdreloc.c,v 1.59 2024/07/23 09:55:19 uwe Exp $ */
+/* $NetBSD: mdreloc.c,v 1.60 2024/08/03 21:59:58 riastradh Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.59 2024/07/23 09:55:19 uwe Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.60 2024/08/03 21:59:58 riastradh Exp $");
#endif /* not lint */
#include <machine/elf_support.h>
@@ -118,15 +118,15 @@ static const char *reloc_names[] = {
"PLT32",
"HIPLT22", "LOPLT10", "LOPLT10", "PCPLT22", "PCPLT32",
"10", "11", "64", "OLO10", "HH22",
- "HM10", "LM22", "PC_HH22", "PC_HM10", "PC_LM22",
+ "HM10", "LM22", "PC_HH22", "PC_HM10", "PC_LM22",
"WDISP16", "WDISP19", "GLOB_JMP", "7", "5", "6",
- "DISP64", "PLT64", "HIX22", "LOX10", "H44", "M44",
+ "DISP64", "PLT64", "HIX22", "LOX10", "H44", "M44",
"L44", "REGISTER", "UA64", "UA16",
"TLS_GD_HI22", "TLS_GD_LO10", "TLS_GD_ADD", "TLS_GD_CALL",
"TLS_LDM_HI22", "TLS_LDM_LO10", "TLS_LDM_ADD", "TLS_LDM_CALL",
- "TLS_LDO_HIX22", "TLS_LDO_LOX10", "TLS_LDO_ADD", "TLS_IE_HI22",
- "TLS_IE_LO10", "TLS_IE_LD", "TLS_IE_LDX", "TLS_IE_ADD", "TLS_LE_HIX22",
- "TLS_LE_LOX10", "TLS_DTPMOD32", "TLS_DTPMOD64", "TLS_DTPOFF32",
+ "TLS_LDO_HIX22", "TLS_LDO_LOX10", "TLS_LDO_ADD", "TLS_IE_HI22",
+ "TLS_IE_LO10", "TLS_IE_LD", "TLS_IE_LDX", "TLS_IE_ADD", "TLS_LE_HIX22",
+ "TLS_LE_LOX10", "TLS_DTPMOD32", "TLS_DTPMOD64", "TLS_DTPOFF32",
"TLS_DTPOFF64", "TLS_TPOFF32", "TLS_TPOFF64",
};
#endif
@@ -149,7 +149,7 @@ static const int reloc_target_bitmask[]
_BM(22), _BM(22), /* HI22, _22 */
_BM(13), _BM(10), /* RELOC_13, _LO10 */
_BM(10), _BM(13), _BM(22), /* GOT10, GOT13, GOT22 */
- _BM(10), _BM(22), /* _PC10, _PC22 */
+ _BM(10), _BM(22), /* _PC10, _PC22 */
_BM(30), 0, /* _WPLT30, _COPY */
-1, -1, -1, /* _GLOB_DAT, JMP_SLOT, _RELATIVE */
_BM(32) /* _UA32 */
@@ -474,7 +474,7 @@ _rtld_relocate_plt_object(const Obj_Entr
} else {
value = (Elf_Addr)(defobj->relocbase + def->st_value);
}
- rdbg(("bind now/fixup in %s --> new=%p",
+ rdbg(("bind now/fixup in %s --> new=%p",
defobj->strtab + def->st_name, (void *)value));
sparc_write_branch(where + 1, (void *)value);
Index: src/libexec/ld.elf_so/arch/sparc64/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/sparc64/mdreloc.c:1.71 src/libexec/ld.elf_so/arch/sparc64/mdreloc.c:1.72
--- src/libexec/ld.elf_so/arch/sparc64/mdreloc.c:1.71 Tue Jul 23 09:55:19 2024
+++ src/libexec/ld.elf_so/arch/sparc64/mdreloc.c Sat Aug 3 21:59:58 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mdreloc.c,v 1.71 2024/07/23 09:55:19 uwe Exp $ */
+/* $NetBSD: mdreloc.c,v 1.72 2024/08/03 21:59:58 riastradh Exp $ */
/*-
* Copyright (c) 2000 Eduardo Horvath.
@@ -41,7 +41,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.71 2024/07/23 09:55:19 uwe Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.72 2024/08/03 21:59:58 riastradh Exp $");
#endif /* not lint */
#include <machine/elf_support.h>
@@ -148,15 +148,15 @@ static const char *reloc_names[] = {
"GLOB_DAT", "JMP_SLOT", "RELATIVE", "UA_32", "PLT32",
"HIPLT22", "LOPLT10", "LOPLT10", "PCPLT22", "PCPLT32",
"10", "11", "64", "OLO10", "HH22",
- "HM10", "LM22", "PC_HH22", "PC_HM10", "PC_LM22",
+ "HM10", "LM22", "PC_HH22", "PC_HM10", "PC_LM22",
"WDISP16", "WDISP19", "GLOB_JMP", "7", "5", "6",
- "DISP64", "PLT64", "HIX22", "LOX10", "H44", "M44",
+ "DISP64", "PLT64", "HIX22", "LOX10", "H44", "M44",
"L44", "REGISTER", "UA64", "UA16",
"TLS_GD_HI22", "TLS_GD_LO10", "TLS_GD_ADD", "TLS_GD_CALL",
"TLS_LDM_HI22", "TLS_LDM_LO10", "TLS_LDM_ADD", "TLS_LDM_CALL",
- "TLS_LDO_HIX22", "TLS_LDO_LOX10", "TLS_LDO_ADD", "TLS_IE_HI22",
- "TLS_IE_LO10", "TLS_IE_LD", "TLS_IE_LDX", "TLS_IE_ADD", "TLS_LE_HIX22",
- "TLS_LE_LOX10", "TLS_DTPMOD32", "TLS_DTPMOD64", "TLS_DTPOFF32",
+ "TLS_LDO_HIX22", "TLS_LDO_LOX10", "TLS_LDO_ADD", "TLS_IE_HI22",
+ "TLS_IE_LO10", "TLS_IE_LD", "TLS_IE_LDX", "TLS_IE_ADD", "TLS_LE_HIX22",
+ "TLS_LE_LOX10", "TLS_DTPMOD32", "TLS_DTPMOD64", "TLS_DTPOFF32",
"TLS_DTPOFF64", "TLS_TPOFF32", "TLS_TPOFF64",
};
#endif
@@ -179,7 +179,7 @@ static const long reloc_target_bitmask[]
_BM(22), _BM(22), /* HI22, _22 */
_BM(13), _BM(10), /* RELOC_13, _LO10 */
_BM(10), _BM(13), _BM(22), /* GOT10, GOT13, GOT22 */
- _BM(10), _BM(22), /* _PC10, _PC22 */
+ _BM(10), _BM(22), /* _PC10, _PC22 */
_BM(30), 0, /* _WPLT30, _COPY */
-1, _BM(32), -1, /* _GLOB_DAT, JMP_SLOT, _RELATIVE */
_BM(32), _BM(32), /* _UA32, PLT32 */
@@ -270,7 +270,7 @@ _rtld_setup_pltgot(const Obj_Entry *obj)
_rtld_install_plt(&entry[0], (Elf_Addr) &_rtld_bind_start_0);
_rtld_install_plt(&entry[8], (Elf_Addr) &_rtld_bind_start_1);
- /*
+ /*
* Install the object reference in first slot
* of entry 2.
*/
@@ -544,7 +544,7 @@ _rtld_bind(const Obj_Entry *obj, Elf_Wor
* specifications say that they should have relocation entries,
* but the 32-bit SPARC binutils do not generate them, and now
* the 64-bit SPARC binutils have stopped generating them too.
- *
+ *
* So, to provide binary compatibility, we will check the first
* entry, if it is reserved it should not be of the type
* JMP_SLOT or JMP_REL. If it is either of those, then
@@ -634,7 +634,7 @@ _rtld_relocate_plt_object(const Obj_Entr
} else {
value = (Elf_Addr)(defobj->relocbase + def->st_value);
}
- rdbg(("bind now/fixup in %s at %p --> new=%p",
+ rdbg(("bind now/fixup in %s at %p --> new=%p",
defobj->strtab + def->st_name, (void*)where, (void *)value));
_rtld_write_plt(where, value, rela, obj);
Index: src/libexec/ld.elf_so/arch/sparc64/rtld_start.S
diff -u src/libexec/ld.elf_so/arch/sparc64/rtld_start.S:1.17 src/libexec/ld.elf_so/arch/sparc64/rtld_start.S:1.18
--- src/libexec/ld.elf_so/arch/sparc64/rtld_start.S:1.17 Mon Apr 28 20:23:04 2008
+++ src/libexec/ld.elf_so/arch/sparc64/rtld_start.S Sat Aug 3 21:59:58 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld_start.S,v 1.17 2008/04/28 20:23:04 martin Exp $ */
+/* $NetBSD: rtld_start.S,v 1.18 2024/08/03 21:59:58 riastradh Exp $ */
/*-
* Copyright (c) 2000 Eduardo Horvath.
@@ -42,7 +42,7 @@
* _rtld() expects the stack pointer to point to two longwords for argument
* return followed by argc, etc. We need to create a pointer to
* &argc + 16 and pass that in. The return args will be in those locations.
- *
+ *
* NB: We are violating the ELF spec by passing a pointer to the ps strings in
* %g1 instead of a termination routine.
*/
@@ -52,7 +52,7 @@
/* Offset of ARGC from bottom of stack */
#define ARGC 176
-
+
.section ".text"
.align 4
.global _rtld_start
@@ -101,7 +101,7 @@ _rtld_start:
*
* The first two entries of PLT2 contain the xword object pointer.
*
- * These routines are called with two longword arguments,
+ * These routines are called with two longword arguments,
* x and y. To calculate the address of the entry,
* _rtld_bind_start_1(y, x) does:
*
@@ -139,7 +139,7 @@ _rtld_bind_start_0: # (y, x)
add %l2, %l1, %l2
sllx %l2, 10, %l2
sub %l0, %l2, %l2 /* And i%5120 */
-
+
/* Let the division churn for a bit. */
sdivx %l2, 24, %l4 /* (i%5120)/24 */
@@ -150,23 +150,22 @@ _rtld_bind_start_0: # (y, x)
sethi %hi(32768), %l6
add %l3, %l4, %l5 /* %l5 = (i/5120)*160 + (i%5120)/24; */
-
+
call _rtld_bind /* Call _rtld_bind(obj, offset) */
add %l5, %l6, %o1 /* %o1 = 32768 + ... */
jmp %o0 /* return value == function address */
restore /* Dump our stack frame */
-
+
.section ".text"
.align 4
.global _rtld_bind_start_1
.type _rtld_bind_start_1,@function
_rtld_bind_start_1: # (y, x)
ldx [%o0 + (2*4)], %o0 /* Load object pointer from PLT2 */
-
+
call _rtld_bind /* Call _rtld_bind(obj, offset) */
srax %o1, 15, %o1 /* %o1 is the index to our PLT slot */
jmp %o0 /* return value == function address */
restore /* Dump our stack frame */
-
Index: src/libexec/ld.elf_so/arch/vax/rtld_start.S
diff -u src/libexec/ld.elf_so/arch/vax/rtld_start.S:1.24 src/libexec/ld.elf_so/arch/vax/rtld_start.S:1.25
--- src/libexec/ld.elf_so/arch/vax/rtld_start.S:1.24 Sun Aug 17 16:57:37 2014
+++ src/libexec/ld.elf_so/arch/vax/rtld_start.S Sat Aug 3 21:59:59 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld_start.S,v 1.24 2014/08/17 16:57:37 matt Exp $ */
+/* $NetBSD: rtld_start.S,v 1.25 2024/08/03 21:59:59 riastradh Exp $ */
/*
* Copyright 1996 Matt Thomas <m...@3am-software.com>
@@ -158,7 +158,7 @@ ALTENTRY(_rtld_bind_start)
extzv $16,$12,%r2,%r1 /* get save mask back */
jbr 22b /* now build the new callframe */
-30:
+30:
calls $0,_C_LABEL(_rtld_die)
#else
/*
Index: src/libexec/ld.elf_so/arch/x86_64/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/x86_64/mdreloc.c:1.48 src/libexec/ld.elf_so/arch/x86_64/mdreloc.c:1.49
--- src/libexec/ld.elf_so/arch/x86_64/mdreloc.c:1.48 Sun Jun 4 01:24:58 2023
+++ src/libexec/ld.elf_so/arch/x86_64/mdreloc.c Sat Aug 3 21:59:59 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mdreloc.c,v 1.48 2023/06/04 01:24:58 joerg Exp $ */
+/* $NetBSD: mdreloc.c,v 1.49 2024/08/03 21:59:59 riastradh Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -68,7 +68,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.48 2023/06/04 01:24:58 joerg Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.49 2024/08/03 21:59:59 riastradh Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -336,7 +336,7 @@ _rtld_relocate_plt_object(const Obj_Entr
rela->r_addend);
}
- rdbg(("bind now/fixup in %s --> old=%p new=%p",
+ rdbg(("bind now/fixup in %s --> old=%p new=%p",
defobj->strtab + def->st_name, (void *)*where, (void *)new_value));
if (*where != new_value)
*where = new_value;
