spacing

17 files changed, 89 insertions, 90 deletions

diff --git a/libexec/ld.so/alpha/ldasm.S b/libexec/ld.so/alpha/ldasm.S
index 91b25eadc57..e7f0c1b6df8 100644
--- a/libexec/ld.so/alpha/ldasm.S
+++ b/libexec/ld.so/alpha/ldasm.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldasm.S,v 1.15 2003/07/09 21:01:10 drahn Exp $ */
+/*	$OpenBSD: ldasm.S,v 1.16 2004/05/25 15:56:18 deraadt Exp $ */
 
 /*
  * Copyright (c) 2001 Niklas Hallqvist
@@ -291,7 +291,7 @@ END(_dl_getdirentries)
 /* _dl_sigprocmask does not support NULL new mask */
 LEAF_NOPROFILE(_dl_sigprocmask, 4)
 	mov	a2, a5
-	ldl     a1, 0(a1)               /* load the set from *set */
+	ldl	a1, 0(a1)		/* load the set from *set */
 	ldiq	v0, SYS_sigprocmask
 	call_pal PAL_OSF1_callsys
 	/* What about syscalls failing? */
diff --git a/libexec/ld.so/alpha/syscall.h b/libexec/ld.so/alpha/syscall.h
index 405344ab451..257cde79630 100644
--- a/libexec/ld.so/alpha/syscall.h
+++ b/libexec/ld.so/alpha/syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscall.h,v 1.13 2003/07/06 20:04:00 deraadt Exp $ */
+/*	$OpenBSD: syscall.h,v 1.14 2004/05/25 15:56:18 deraadt Exp $ */
 
 /*
  * Copyright (c) 2001 Niklas Hallqvist
@@ -57,7 +57,7 @@ int	_dl_sysctl(int *, u_int, void *, size_t *, void *, size_t);
 static inline off_t
 _dl_lseek(int fildes, off_t offset, int whence)
 {
-        return _dl__syscall((quad_t)SYS_lseek, fildes, 0, offset, whence);
+	return _dl__syscall((quad_t)SYS_lseek, fildes, 0, offset, whence);
 }
 
 #endif /*__DL_SYSCALL_H__*/
diff --git a/libexec/ld.so/amd64/ldasm.S b/libexec/ld.so/amd64/ldasm.S
index 15128e99706..048ea57ea9b 100644
--- a/libexec/ld.so/amd64/ldasm.S
+++ b/libexec/ld.so/amd64/ldasm.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldasm.S,v 1.3 2004/02/23 20:52:04 deraadt Exp $	*/
+/*	$OpenBSD: ldasm.S,v 1.4 2004/05/25 15:56:18 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2002,2004 Dale Rahn
@@ -68,7 +68,7 @@ _dl_start:
 
 #define	DL_SYSCALL(n) DL_SYSCALL2(n,n)
 #define	DL_SYSCALL2(n,c) \
-	.global	__CONCAT(_dl_,n) 		;\
+	.global	__CONCAT(_dl_,n)		;\
 	.type	__CONCAT(_dl_,n), @function	;\
 	.align	4				;\
 __CONCAT(_dl_,n):				;\
diff --git a/libexec/ld.so/arm/ldasm.S b/libexec/ld.so/arm/ldasm.S
index a04957f5ba9..5c577263eb1 100644
--- a/libexec/ld.so/arm/ldasm.S
+++ b/libexec/ld.so/arm/ldasm.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldasm.S,v 1.3 2004/02/09 21:09:31 drahn Exp $ */
+/*	$OpenBSD: ldasm.S,v 1.4 2004/05/25 15:56:18 deraadt Exp $ */
 
 /*
  * Copyright (c) 2004 Dale Rahn
@@ -68,7 +68,7 @@ ENTRY(_dl_bind_start)
 
 	sub	r1, ip, lr		/* r1 = 4 * (n + 1) */
 	sub	r1, r1, #4		/* r1 = 4 * n */
-	mov     r1, r1, lsr #2		/* r1 = n */
+	mov	r1, r1, lsr #2		/* r1 = n */
 
 	ldr	r0, [lr, #-4]
 	bl	_dl_bind
@@ -94,7 +94,7 @@ __CONCAT(_dl_,n):					;\
 	.align		4
 DL_SYSCALL(close)
 
-	
+
 	.global		_dl_exit
 	.type		_dl_exit%function
 _dl_exit:
@@ -115,7 +115,7 @@ DL_SYSCALL(fcntl)
 DL_SYSCALL2(sysctl,__sysctl)
 
 DL_SYSCALL(getdirentries)
-	
+
 	.global		_dl_sigprocmask
 	.type		_dl_sigprocmask%function
 _dl_sigprocmask:
@@ -129,7 +129,7 @@ _dl_sigprocmask:
 	strne	r0, [r2]
 	mov	r0, #0
 	mov	pc, lr
-	
+
 .L_cerr:
 	mov	r0, #0
 	sub	r0, r0, #1
diff --git a/libexec/ld.so/arm/rtld_machine.c b/libexec/ld.so/arm/rtld_machine.c
index 020dbab60a5..32a34956c1b 100644
--- a/libexec/ld.so/arm/rtld_machine.c
+++ b/libexec/ld.so/arm/rtld_machine.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtld_machine.c,v 1.3 2004/02/09 21:09:31 drahn Exp $ */
+/*	$OpenBSD: rtld_machine.c,v 1.4 2004/05/25 15:56:18 deraadt Exp $ */
 
 /*
  * Copyright (c) 2004 Dale Rahn
@@ -63,37 +63,37 @@ static int reloc_target_flags[] = {
 	_RF_S|_RF_B|_RF_A|	_RF_E,			/*  9 SBREL32 */
 	_RF_S|_RF_P|_RF_A|	_RF_E,			/* 10 T_PC22 */
 	_RF_S|_RF_P|_RF_A|	_RF_E,			/* 11 T_PC8 */
-	_RF_E,			 			/* 12 Reserved */
+	_RF_E,						/* 12 Reserved */
 	_RF_S|_RF_A|		_RF_E,			/* 13 SWI24 */
 	_RF_S|_RF_A|		_RF_E,			/* 14 T_SWI8 */
-	_RF_E,			 			/* 15 OBSL */
-	_RF_E,			 			/* 16 OBSL */
-	_RF_E,			 			/* 17 UNUSED */
-	_RF_E,			 			/* 18 UNUSED */
-	_RF_E,			 			/* 19 UNUSED */
+	_RF_E,						/* 15 OBSL */
+	_RF_E,						/* 16 OBSL */
+	_RF_E,						/* 17 UNUSED */
+	_RF_E,						/* 18 UNUSED */
+	_RF_E,						/* 19 UNUSED */
 	_RF_S|			_RF_SZ(32) | _RF_RS(0),	/* 20 COPY */
 	_RF_S|_RF_A|		_RF_SZ(32) | _RF_RS(0),	/* 21 GLOB_DAT */
 	_RF_S|			_RF_SZ(32) | _RF_RS(0),	/* 22 JUMP_SLOT */
 	      _RF_A|	_RF_B|	_RF_SZ(32) | _RF_RS(0),	/* 23 RELATIVE */
-	_RF_E,			 			/* 24 GOTOFF */
-	_RF_E,			 			/* 25 GOTPC */
-	_RF_E,			 			/* 26 GOT32 */
-	_RF_E,			 			/* 27 PLT32 */
-	_RF_E,			 			/* 28 UNUSED */
-	_RF_E,			 			/* 29 UNUSED */
-	_RF_E,			 			/* 30 UNUSED */
-	_RF_E,			 			/* 31 UNUSED */
-	_RF_E,			 			/* 32 A_PCR 0 */
-	_RF_E,			 			/* 33 A_PCR 8 */
-	_RF_E,			 			/* 34 A_PCR 16 */
-	_RF_E,			 			/* 35 B_PCR 0 */
-	_RF_E,			 			/* 36 B_PCR 12 */
-	_RF_E,			 			/* 37 B_PCR 20 */
-	_RF_E,			 			/* 38 RELAB32 */
-	_RF_E,			 			/* 39 ROSGREL32 */
-	_RF_E,			 			/* 40 V4BX */
-	_RF_E,			 			/* 41 STKCHK */
-	_RF_E			 			/* 42 TSTKCHK */
+	_RF_E,						/* 24 GOTOFF */
+	_RF_E,						/* 25 GOTPC */
+	_RF_E,						/* 26 GOT32 */
+	_RF_E,						/* 27 PLT32 */
+	_RF_E,						/* 28 UNUSED */
+	_RF_E,						/* 29 UNUSED */
+	_RF_E,						/* 30 UNUSED */
+	_RF_E,						/* 31 UNUSED */
+	_RF_E,						/* 32 A_PCR 0 */
+	_RF_E,						/* 33 A_PCR 8 */
+	_RF_E,						/* 34 A_PCR 16 */
+	_RF_E,						/* 35 B_PCR 0 */
+	_RF_E,						/* 36 B_PCR 12 */
+	_RF_E,						/* 37 B_PCR 20 */
+	_RF_E,						/* 38 RELAB32 */
+	_RF_E,						/* 39 ROSGREL32 */
+	_RF_E,						/* 40 V4BX */
+	_RF_E,						/* 41 STKCHK */
+	_RF_E						/* 42 TSTKCHK */
 };
 
 #define RELOC_RESOLVE_SYMBOL(t)		((reloc_target_flags[t] & _RF_S) != 0)
@@ -212,7 +212,7 @@ _dl_md_reloc(elf_object_t *object, int rel, int relsz)
 
 		type = ELF_R_TYPE(rels->r_info);
 
-		if (reloc_target_flags[type] & _RF_E) { 
+		if (reloc_target_flags[type] & _RF_E) {
 			_dl_printf(" bad relocation %d %d\n", i, type);
 			_dl_exit(1);
 		}
@@ -439,7 +439,7 @@ _dl_bind(elf_object_t *object, int relidx)
 
 	if (*addr != newval)
 		*addr = newval;
-		
+
 	/* put the GOT back to RO */
 	if (object->got_size != 0) {
 		_dl_mprotect((void*)object->got_start, object->got_size,
diff --git a/libexec/ld.so/arm/syscall.h b/libexec/ld.so/arm/syscall.h
index 882e393522a..b654f54dd84 100644
--- a/libexec/ld.so/arm/syscall.h
+++ b/libexec/ld.so/arm/syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscall.h,v 1.1 2004/02/07 06:00:49 drahn Exp $ */
+/*	$OpenBSD: syscall.h,v 1.2 2004/05/25 15:56:18 deraadt Exp $ */
 
 /*
  * Copyright (c) 2001 Niklas Hallqvist
@@ -57,7 +57,7 @@ int	_dl_sysctl(int *, u_int, void *, size_t *, void *, size_t);
 static inline off_t
 _dl_lseek(int fildes, off_t offset, int whence)
 {
-        return _dl__syscall((quad_t)SYS_lseek, fildes, 0, offset, whence);
+	return _dl__syscall((quad_t)SYS_lseek, fildes, 0, offset, whence);
 }
 
 #endif /*__DL_SYSCALL_H__*/
diff --git a/libexec/ld.so/dlfcn.c b/libexec/ld.so/dlfcn.c
index 1dd00d338af..fd1a9e3a671 100644
--- a/libexec/ld.so/dlfcn.c
+++ b/libexec/ld.so/dlfcn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dlfcn.c,v 1.34 2004/05/22 19:42:52 drahn Exp $ */
+/*	$OpenBSD: dlfcn.c,v 1.35 2004/05/25 15:56:18 deraadt Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -276,6 +276,8 @@ dlerror(void)
 void
 _dl_show_objects(void)
 {
+	extern int _dl_symcachestat_hits;
+	extern int _dl_symcachestat_lookups;
 	elf_object_t *object;
 	char *objtypename;
 	int outputfd;
@@ -318,15 +320,12 @@ _dl_show_objects(void)
 		    objtypename, object->refcount, object->load_name);
 		object = object->next;
 	}
-	{
-		extern int _dl_symcachestat_hits;
-		extern int _dl_symcachestat_lookups;
-		if (_dl_symcachestat_lookups != 0)
-			DL_DEB(("symcache lookups %d hits %d ratio %d% hits\n",
-			    _dl_symcachestat_lookups, _dl_symcachestat_hits,
-			    (_dl_symcachestat_hits * 100) /
-			    _dl_symcachestat_lookups));
-	}
+
+	if (_dl_symcachestat_lookups != 0)
+		DL_DEB(("symcache lookups %d hits %d ratio %d% hits\n",
+		    _dl_symcachestat_lookups, _dl_symcachestat_hits,
+		    (_dl_symcachestat_hits * 100) /
+		    _dl_symcachestat_lookups));
 }
 
 static void
diff --git a/libexec/ld.so/i386/ldasm.S b/libexec/ld.so/i386/ldasm.S
index 2bc1bccaa91..7d218134502 100644
--- a/libexec/ld.so/i386/ldasm.S
+++ b/libexec/ld.so/i386/ldasm.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldasm.S,v 1.7 2003/07/09 21:01:10 drahn Exp $ */
+/*	$OpenBSD: ldasm.S,v 1.8 2004/05/25 15:56:18 deraadt Exp $ */
 
 /*
  * Copyright (c) 2002 Dale Rahn
@@ -28,7 +28,7 @@
  */
 
 
-#define DL_DATA_SIZE      (16*4)
+#define DL_DATA_SIZE	(16*4)
 #include <sys/syscall.h>
 #include <machine/asm.h>
 
diff --git a/libexec/ld.so/i386/rtld_machine.c b/libexec/ld.so/i386/rtld_machine.c
index 743678d09ae..4d6f80023a0 100644
--- a/libexec/ld.so/i386/rtld_machine.c
+++ b/libexec/ld.so/i386/rtld_machine.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtld_machine.c,v 1.13 2003/09/04 19:37:07 drahn Exp $ */
+/*	$OpenBSD: rtld_machine.c,v 1.14 2004/05/25 15:56:18 deraadt Exp $ */
 
 /*
  * Copyright (c) 2002 Dale Rahn
@@ -333,9 +333,9 @@ struct jmpslot {
 	u_short opcode;
 	u_short addr[2];
 	u_short reloc_index;
-#define JMPSLOT_RELOC_MASK              0xffff
+#define JMPSLOT_RELOC_MASK	0xffff
 };
-#define JUMP    0xe990          /* NOP + JMP opcode */
+#define JUMP			0xe990	/* NOP + JMP opcode */
 #endif
 
 void
@@ -371,7 +371,7 @@ _dl_bind(elf_object_t *object, int index)
 	    SYM_SEARCH_ALL|SYM_WARNNOTFOUND|SYM_PLT, sym->st_size, object);
 	if (this == NULL) {
 		_dl_printf("lazy binding failed!\n");
-		*((int *)0) = 0;        /* XXX */
+		*((int *)0) = 0;	/* XXX */
 	}
 
 	/* if GOT is protected, allow the write */
@@ -397,7 +397,7 @@ _dl_bind(elf_object_t *object, int index)
 void
 _dl_md_reloc_got(elf_object_t *object, int lazy)
 {
-	extern void _dl_bind_start(void);       /* XXX */
+	extern void _dl_bind_start(void);	/* XXX */
 	Elf_Addr *pltgot = (Elf_Addr *)object->Dyn.info[DT_PLTGOT];
 	int i, num;
 	Elf_Rel *rel;
diff --git a/libexec/ld.so/i386/syscall.h b/libexec/ld.so/i386/syscall.h
index 09e2f1f5839..f047970172c 100644
--- a/libexec/ld.so/i386/syscall.h
+++ b/libexec/ld.so/i386/syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscall.h,v 1.5 2003/07/06 20:04:00 deraadt Exp $ */
+/*	$OpenBSD: syscall.h,v 1.6 2004/05/25 15:56:18 deraadt Exp $ */
 
 /*
  * Copyright (c) 2001 Niklas Hallqvist
@@ -57,7 +57,7 @@ int	_dl_sysctl(int *, u_int, void *, size_t *, void *, size_t);
 static inline off_t
 _dl_lseek(int fildes, off_t offset, int whence)
 {
-        return _dl__syscall((quad_t)SYS_lseek, fildes, 0, offset, whence);
+	return _dl__syscall((quad_t)SYS_lseek, fildes, 0, offset, whence);
 }
 
 #endif /*__DL_SYSCALL_H__*/
diff --git a/libexec/ld.so/loader.c b/libexec/ld.so/loader.c
index d1f11657260..a7b50098fe6 100644
--- a/libexec/ld.so/loader.c
+++ b/libexec/ld.so/loader.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: loader.c,v 1.75 2004/05/24 20:24:54 mickey Exp $ */
+/*	$OpenBSD: loader.c,v 1.76 2004/05/25 15:56:18 deraadt Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -646,7 +646,7 @@ _dl_rtld(elf_object_t *object)
 	_dl_md_reloc_got(object, !(_dl_bindnow || object->dyn.bind_now));
 
 	if (_dl_symcache != NULL) {
-		if (sz != 0) 
+		if (sz != 0)
 			_dl_munmap( _dl_symcache, sz);
 		_dl_symcache = NULL;
 	}
@@ -716,9 +716,9 @@ _dl_unsetenv(const char *var, char **env)
 	}
 }
 
-/* 
+/*
  * _dl_fixup_user_env()
- * 
+ *
  * Set the user environment so that programs can use the environment
  * while running constructors. Specifically, MALLOC_OPTIONS= for malloc()
  */
diff --git a/libexec/ld.so/resolve.c b/libexec/ld.so/resolve.c
index f08b07707c8..610e43dacc8 100644
--- a/libexec/ld.so/resolve.c
+++ b/libexec/ld.so/resolve.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: resolve.c,v 1.21 2003/09/04 19:33:48 drahn Exp $ */
+/*	$OpenBSD: resolve.c,v 1.22 2004/05/25 15:56:18 deraadt Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -253,7 +253,7 @@ _dl_find_symbol(const char *name, elf_object_t *startlook,
 			found = 1;
 			goto found;
 		}
-		    
+
 retry_nonglobal_dlo:
 	for (object = startlook; object;
 	    object = ((flags & SYM_SEARCH_SELF) ? 0 : object->next)) {
@@ -261,7 +261,7 @@ retry_nonglobal_dlo:
 		if ((lastchance == 0) &&
 		    ((object->obj_flags & RTLD_GLOBAL) == 0) &&
 		    (object->obj_type == OBJTYPE_DLO) &&
-		    (object != req_obj)) 
+		    (object != req_obj))
 			continue;
 
 		if (find_symbol_obj(object, name, h, flags, ref, &weak_sym,
diff --git a/libexec/ld.so/sparc/ldasm.S b/libexec/ld.so/sparc/ldasm.S
index bbe50228e43..41304417ab3 100644
--- a/libexec/ld.so/sparc/ldasm.S
+++ b/libexec/ld.so/sparc/ldasm.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldasm.S,v 1.13 2003/07/09 21:01:10 drahn Exp $	*/
+/*	$OpenBSD: ldasm.S,v 1.14 2004/05/25 15:56:18 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -263,7 +263,7 @@ _dl_fstat:
 	add %o7, 8, %g2				! just return on success
 	t ST_SYSCALL				! off to wonderland
 	retl
-	 sub %g0, %o0, %o0                      ! error: result = -errno
+	 sub %g0, %o0, %o0			! error: result = -errno
 
 
 	.section ".text"
@@ -275,7 +275,7 @@ _dl_fcntl:
 	add %o7, 8, %g2				! just return on success
 	t ST_SYSCALL				! off to wonderland
 	retl
-	 sub %g0, %o0, %o0                      ! error: result = -errno
+	 sub %g0, %o0, %o0			! error: result = -errno
 
 
 	.section ".text"
@@ -287,7 +287,7 @@ _dl_getdirentries:
 	add %o7, 8, %g2					! just return on success
 	t ST_SYSCALL					! off to wonderland
 	retl
-	 sub %g0, %o0, %o0                      ! error: result = -errno
+	 sub %g0, %o0, %o0				! error: result = -errno
 
 
 	.section ".text"
@@ -299,7 +299,7 @@ _dl_sysctl:
 	add %o7, 8, %g2					! just return on success
 	t ST_SYSCALL					! off to wonderland
 	retl
-	 sub %g0, %o0, %o0                      ! error: result = -errno
+	 sub %g0, %o0, %o0				! error: result = -errno
 
 
 	/* _dl_sigprocmask does not support NULL new mask */
diff --git a/libexec/ld.so/sparc/rtld_machine.c b/libexec/ld.so/sparc/rtld_machine.c
index 69331213591..3b70e8e2f49 100644
--- a/libexec/ld.so/sparc/rtld_machine.c
+++ b/libexec/ld.so/sparc/rtld_machine.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtld_machine.c,v 1.20 2003/09/04 19:37:08 drahn Exp $ */
+/*	$OpenBSD: rtld_machine.c,v 1.21 2004/05/25 15:56:18 deraadt Exp $ */
 
 /*
  * Copyright (c) 1999 Dale Rahn
@@ -392,9 +392,9 @@ _dl_md_reloc_got(elf_object_t *object, int lazy)
 		 * The second entry holds the object identification.
 		 * Note: each PLT entry is three words long.
 		 */
-#define SAVE    0x9de3bfc0      /* i.e. `save %sp,-64,%sp' */
-#define CALL    0x40000000
-#define NOP     0x01000000
+#define SAVE	0x9de3bfc0	/* i.e. `save %sp,-64,%sp' */
+#define CALL	0x40000000
+#define NOP	0x01000000
 		pltgot[0] = SAVE;
 		pltgot[1] = CALL |
 		    ((Elf_Addr)&_dl_bind_start - (Elf_Addr)&pltgot[1]) >> 2;
@@ -494,7 +494,7 @@ _dl_mul_fixup()
 	size_t len;
 
 
-        mib[0] = CTL_MACHDEP;
+	mib[0] = CTL_MACHDEP;
 	mib[1] = CPU_V8MUL;
 	len = sizeof(v8mul);
 	_dl_sysctl(mib, 2, &v8mul, &len, NULL, 0);
diff --git a/libexec/ld.so/sparc/syscall.h b/libexec/ld.so/sparc/syscall.h
index 520203bc847..92ebc12d3d3 100644
--- a/libexec/ld.so/sparc/syscall.h
+++ b/libexec/ld.so/sparc/syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscall.h,v 1.6 2003/07/06 20:04:00 deraadt Exp $ */
+/*	$OpenBSD: syscall.h,v 1.7 2004/05/25 15:56:18 deraadt Exp $ */
 
 /*
  * Copyright (c) 2001 Niklas Hallqvist
@@ -57,7 +57,7 @@ int	_dl_sysctl(int *, u_int, void *, size_t *, void *, size_t);
 static inline off_t
 _dl_lseek(int fildes, off_t offset, int whence)
 {
-        return _dl__syscall((quad_t)SYS_lseek, fildes, 0, offset, whence);
+	return _dl__syscall((quad_t)SYS_lseek, fildes, 0, offset, whence);
 }
 
 #endif /*__DL_SYSCALL_H__*/
diff --git a/libexec/ld.so/sparc64/ldasm.S b/libexec/ld.so/sparc64/ldasm.S
index 416c72ad451..dcf8186fa96 100644
--- a/libexec/ld.so/sparc64/ldasm.S
+++ b/libexec/ld.so/sparc64/ldasm.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldasm.S,v 1.22 2004/01/10 22:47:54 pvalchev Exp $	*/
+/*	$OpenBSD: ldasm.S,v 1.23 2004/05/25 15:56:19 deraadt Exp $	*/
 /*	$NetBSD: rtld_start.S,v 1.5 2001/08/14 22:17:48 eeh Exp $	*/
 
 /*
@@ -113,7 +113,7 @@ _ENTRY(_dl_start)
 	sll	%o2, 2, %o2		! extract PC offset
 	sra	%o2, 0, %o2		! sign-extend
 
-	add	%o2, %o7, %o2           ! real &_DYNAMIC
+	add	%o2, %o7, %o2		! real &_DYNAMIC
 
 	call	_dl_boot_bind		! _dl_boot_bind(sp,dl_data,dynamicp)
 	 mov	%l3, %o1
@@ -280,21 +280,21 @@ _ENTRY(_dl_fstat)
 	add %o7, 8, %g2				! just return on success
 	t ST_SYSCALL				! off to wonderland
 	retl
-	 sub %g0, %o0, %o0                      ! error: result = -errno
+	 sub %g0, %o0, %o0			! error: result = -errno
 
 _ENTRY(_dl_fcntl)
 	mov  SYS_fcntl | SYSCALL_G2RFLAG, %g1	! call sys_fcntl
 	add %o7, 8, %g2				! just return on success
 	t ST_SYSCALL				! off to wonderland
 	retl
-	 sub %g0, %o0, %o0                      ! error: result = -errno
+	 sub %g0, %o0, %o0			! error: result = -errno
 
 _ENTRY(_dl_getdirentries)
 	mov  SYS_getdirentries | SYSCALL_G2RFLAG, %g1	! call sys_getdirentries
 	add %o7, 8, %g2					! just return on success
 	t ST_SYSCALL					! off to wonderland
 	retl
-	 sub %g0, %o0, %o0                      ! error: result = -errno
+	 sub %g0, %o0, %o0				! error: result = -errno
 
 	/* _dl_sigprocmask does not support NULL new mask */
 _ENTRY(_dl_sigprocmask)
@@ -314,4 +314,4 @@ _ENTRY(_dl_sysctl)
 	add %o7, 8, %g2					! just return on success
 	t ST_SYSCALL					! off to wonderland
 	retl
-	 sub %g0, %o0, %o0                      ! error: result = -errno
+	 sub %g0, %o0, %o0				! error: result = -errno
diff --git a/libexec/ld.so/sparc64/rtld_machine.c b/libexec/ld.so/sparc64/rtld_machine.c
index e2d6e6a183a..debd7b2b4a7 100644
--- a/libexec/ld.so/sparc64/rtld_machine.c
+++ b/libexec/ld.so/sparc64/rtld_machine.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtld_machine.c,v 1.31 2003/09/04 19:37:08 drahn Exp $ */
+/*	$OpenBSD: rtld_machine.c,v 1.32 2004/05/25 15:56:19 deraadt Exp $ */
 
 /*
  * Copyright (c) 1999 Dale Rahn
@@ -574,12 +574,12 @@ _dl_reloc_plt(Elf_Word *where, Elf_Addr value, Elf_RelA *rela)
 		 *	nop
 		 *
 		 */
-		where[6] = JMP     | LOVAL(value);
+		where[6] = JMP | LOVAL(value);
 		where[5] = ORG5;
-		where[4] = SLLX    | 12;
-		where[3] = OR      | LOVAL((value) >> 32);
+		where[4] = SLLX | 12;
+		where[3] = OR | LOVAL((value) >> 32);
 		where[2] = SETHIG5 | HIVAL(value, 10);
-		where[1] = SETHI   | HIVAL(value, 42);
+		where[1] = SETHI | HIVAL(value, 42);
 		__asm __volatile("iflush %0+24" : : "r" (where));
 		__asm __volatile("iflush %0+20" : : "r" (where));
 		__asm __volatile("iflush %0+16" : : "r" (where));