diff options
author | Dale Rahn <drahn@cvs.openbsd.org> | 2004-02-10 14:12:23 +0000 |
---|---|---|
committer | Dale Rahn <drahn@cvs.openbsd.org> | 2004-02-10 14:12:23 +0000 |
commit | 0d217aeca904ed1ec9eb5bb2a96c53cd84a47c7c (patch) | |
tree | ec952d6e0e9fc3bdc06cc00de459c552643fddb7 /libexec/ld.so/loader.c | |
parent | 4ec507a87a5443cffa1c6aa8cd6aae1e7ee9584e (diff) |
Check for RTLD_TEXT_PLT define instead of an architecture specific check.
Diffstat (limited to 'libexec/ld.so/loader.c')
-rw-r--r-- | libexec/ld.so/loader.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libexec/ld.so/loader.c b/libexec/ld.so/loader.c index f5b70df104d..1b886448504 100644 --- a/libexec/ld.so/loader.c +++ b/libexec/ld.so/loader.c @@ -1,4 +1,4 @@ -/* $OpenBSD: loader.c,v 1.71 2004/02/07 06:00:48 drahn Exp $ */ +/* $OpenBSD: loader.c,v 1.72 2004/02/10 14:12:22 drahn Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -205,7 +205,7 @@ _dl_boot(const char **argv, char **envp, const long loff, long *dl_data) { extern char *__got_start; extern char *__got_end; -#if !defined(__i386__) && !defined(__arm__) +#ifndef RTLD_TEXT_PLT extern char *__plt_start; extern char *__plt_end; #endif @@ -215,7 +215,7 @@ _dl_boot(const char **argv, char **envp, const long loff, long *dl_data) ELF_TRUNC((long)&__got_start, _dl_pagesz), GOT_PERMS); -#if !defined(__i386__) && !defined(__arm__) +#ifndef RTLD_TEXT_PLT /* only for DATA_PLT or BSS_PLT */ _dl_mprotect((void *)ELF_TRUNC((long)&__plt_start, _dl_pagesz), ELF_ROUND((long)&__plt_end,_dl_pagesz) - |