diff options
| author |   guenther <guenther@openbsd.org> | 2016-08-07 02:28:12 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2016-08-07 02:28:12 +0000 |
| commit | b2a9286204a6149a6fde9196fc5c671be7cc5365 (patch) | |
| tree | b0a2ab19231e4796c5edca7ceaa1bc867554e03c | |
| parent | Add XOR cookies for lr and sp. Stop saving/restoring r12 to/from the jmpbuf. (diff) | |
| download | wireguard-openbsd-b2a9286204a6149a6fde9196fc5c671be7cc5365.tar.xz wireguard-openbsd-b2a9286204a6149a6fde9196fc5c671be7cc5365.zip | |
Flip the #ifdef logic: amd64, i386, and mips64 were the only static PIE
archs using the #else case
| -rw-r--r-- | lib/csu/boot.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/csu/boot.h b/lib/csu/boot.h index 087911ad380..f892971133e 100644 --- a/lib/csu/boot.h +++ b/lib/csu/boot.h @@ -1,4 +1,4 @@ -/* $OpenBSD: boot.h,v 1.16 2016/07/05 00:44:41 guenther Exp $ */ +/* $OpenBSD: boot.h,v 1.17 2016/08/07 02:28:12 guenther Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -148,11 +148,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__) - dynp = dynamicp; -#else +#elif defined(__amd64__) || defined(__i386__) || defined(__mips64__) dynp = (Elf_Dyn *)((long)_DYNAMIC + loff); +#else + dynp = dynamicp; #endif _dl_memset(&dynld, 0, sizeof(dynld)); |