diff options
| author |   guenther <guenther@openbsd.org> | 2016-08-07 02:57:19 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2016-08-07 02:57:19 +0000 |
| commit | 51e8d0debbf4a091c66f58c8efadb75c1b8f4b23 (patch) | |
| tree | db8af2ca28d5791243bb2dda700aff378055110a | |
| parent | Teach mips64 to pass &_DYNAMIC to _dl_boot_bind(). (diff) | |
| download | wireguard-openbsd-51e8d0debbf4a091c66f58c8efadb75c1b8f4b23.tar.xz wireguard-openbsd-51e8d0debbf4a091c66f58c8efadb75c1b8f4b23.zip | |
Flip the #ifdef logic: amd64, arm, i386, and mips64 are the only archs
using the #else case
| -rw-r--r-- | libexec/ld.so/boot.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libexec/ld.so/boot.c b/libexec/ld.so/boot.c index 8271e386717..89c42ebfb13 100644 --- a/libexec/ld.so/boot.c +++ b/libexec/ld.so/boot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: boot.c,v 1.7 2016/07/15 09:25:47 guenther Exp $ */ +/* $OpenBSD: boot.c,v 1.8 2016/08/07 02:57:19 guenther Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -129,11 +129,10 @@ _dl_boot_bind(const long sp, long *dl_data, Elf_Dyn *dynamicp) #if defined(__alpha__) dynp = (Elf_Dyn *)((long)_DYNAMIC); -#elif defined(__sparc__) || defined(__sparc64__) || defined(__powerpc__) || \ - defined(__hppa__) || defined(__sh__) || defined(__m88k__) - dynp = dynamicp; -#else +#elif defined(__amd64__) || defined(__arm__) || defined(__i386__) || defined(__mips64__) dynp = (Elf_Dyn *)((long)_DYNAMIC + loff); +#else + dynp = dynamicp; #endif _dl_memset(&dynld, 0, sizeof(dynld)); |