summaryrefslogtreecommitdiff
path: root/libexec/ld.so/arm
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2004-05-25 15:56:20 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2004-05-25 15:56:20 +0000
commitfe15f9f7efb7aadca1b0706c949f3c98a5c9d507 (patch)
treed0fe001e7fa408f1918ba45a408b360cefa6f354 /libexec/ld.so/arm
parent940d7463b98bd355f1d60a5edc0b0b9406e5d273 (diff)
spacing
Diffstat (limited to 'libexec/ld.so/arm')
-rw-r--r--libexec/ld.so/arm/ldasm.S10
-rw-r--r--libexec/ld.so/arm/rtld_machine.c56
-rw-r--r--libexec/ld.so/arm/syscall.h4
3 files changed, 35 insertions, 35 deletions
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__*/