diff options
| author |   pefo <pefo@openbsd.org> | 2004-08-11 17:11:45 +0000 |
|---|---|---|
| committer | pefo <pefo@openbsd.org> | 2004-08-11 17:11:45 +0000 |
| commit | d88a553e368a0f0740769539c0b6a4a672d7c74b (patch) | |
| tree | d160bf537992bc77c6517934c967706f1389e4f5 | |
| parent | Rename confusing variable for readability's sake. No actual code changes. (diff) | |
| download | wireguard-openbsd-d88a553e368a0f0740769539c0b6a4a672d7c74b.tar.xz wireguard-openbsd-d88a553e368a0f0740769539c0b6a4a672d7c74b.zip | |
mips->mips64
| -rw-r--r-- | libexec/ld.so/loader.c | 4 | ||||
| -rw-r--r-- | libexec/ld.so/mips64/Makefile.inc (renamed from libexec/ld.so/mips/Makefile.inc) | 2 | ||||
| -rw-r--r-- | libexec/ld.so/mips64/archdep.h (renamed from libexec/ld.so/mips/archdep.h) | 2 | ||||
| -rw-r--r-- | libexec/ld.so/mips64/ldasm.S (renamed from libexec/ld.so/mips/ldasm.S) | 2 | ||||
| -rw-r--r-- | libexec/ld.so/mips64/rtld_machine.c (renamed from libexec/ld.so/mips/rtld_machine.c) | 2 | ||||
| -rw-r--r-- | libexec/ld.so/mips64/syscall.h (renamed from libexec/ld.so/mips/syscall.h) | 2 |
6 files changed, 8 insertions, 6 deletions
diff --git a/libexec/ld.so/loader.c b/libexec/ld.so/loader.c index f7a5cb4d70f..f81a1130d4c 100644 --- a/libexec/ld.so/loader.c +++ b/libexec/ld.so/loader.c @@ -1,4 +1,4 @@ -/* $OpenBSD: loader.c,v 1.81 2004/05/27 21:59:07 mickey Exp $ */ +/* $OpenBSD: loader.c,v 1.82 2004/08/11 17:11:45 pefo Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -203,6 +203,7 @@ _dl_boot(const char **argv, char **envp, const long loff, long *dl_data) else _dl_pagesz = 4096; +#ifndef __mips__ /* * now that GOT and PLT has been relocated, and we know * page size, protect it from modification @@ -228,6 +229,7 @@ _dl_boot(const char **argv, char **envp, const long loff, long *dl_data) PROT_READ|PROT_EXEC); #endif } +#endif DL_DEB(("rtld loading: '%s'\n", _dl_progname)); diff --git a/libexec/ld.so/mips/Makefile.inc b/libexec/ld.so/mips64/Makefile.inc index 5b440950a9f..c708fc1496e 100644 --- a/libexec/ld.so/mips/Makefile.inc +++ b/libexec/ld.so/mips64/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.1 2002/10/23 12:38:29 pefo Exp $ +# $OpenBSD: Makefile.inc,v 1.1 2004/08/11 17:11:45 pefo Exp $ # CFLAGS += -fpic -msoft-float # ADDR=-Tdata 8000 diff --git a/libexec/ld.so/mips/archdep.h b/libexec/ld.so/mips64/archdep.h index 0e728a7524b..d1f13ee8228 100644 --- a/libexec/ld.so/mips/archdep.h +++ b/libexec/ld.so/mips64/archdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: archdep.h,v 1.8 2004/08/09 13:44:19 pefo Exp $ */ +/* $OpenBSD: archdep.h,v 1.1 2004/08/11 17:11:45 pefo Exp $ */ /* * Copyright (c) 1998-2002 Opsycon AB, Sweden. diff --git a/libexec/ld.so/mips/ldasm.S b/libexec/ld.so/mips64/ldasm.S index b5bb96ed2c3..a4d4c078ab1 100644 --- a/libexec/ld.so/mips/ldasm.S +++ b/libexec/ld.so/mips64/ldasm.S @@ -1,4 +1,4 @@ -/* $OpenBSD: ldasm.S,v 1.5 2003/06/09 16:10:04 deraadt Exp $ */ +/* $OpenBSD: ldasm.S,v 1.1 2004/08/11 17:11:45 pefo Exp $ */ /* * Copyright (c) 1998-2002 Opsycon AB, Sweden. diff --git a/libexec/ld.so/mips/rtld_machine.c b/libexec/ld.so/mips64/rtld_machine.c index 3ed2da7c971..7f347c23162 100644 --- a/libexec/ld.so/mips/rtld_machine.c +++ b/libexec/ld.so/mips64/rtld_machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtld_machine.c,v 1.16 2004/08/06 09:38:29 pefo Exp $ */ +/* $OpenBSD: rtld_machine.c,v 1.1 2004/08/11 17:11:45 pefo Exp $ */ /* * Copyright (c) 1998-2004 Opsycon AB, Sweden. diff --git a/libexec/ld.so/mips/syscall.h b/libexec/ld.so/mips64/syscall.h index 26f9e7a49f4..17a8c981747 100644 --- a/libexec/ld.so/mips/syscall.h +++ b/libexec/ld.so/mips64/syscall.h @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.h,v 1.13 2004/08/06 09:40:44 pefo Exp $ */ +/* $OpenBSD: syscall.h,v 1.1 2004/08/11 17:11:45 pefo Exp $ */ /* * Copyright (c) 1998-2002 Opsycon AB, Sweden. |