about summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-09-20 15:08:26 +0000
committerUlrich Drepper <drepper@redhat.com>2004-09-20 15:08:26 +0000
commit664e7d93f93d421225a115a433d0dbbc40444daa (patch)
tree4836bcb5fb8b2c910932840d7a0f1a79529ee033 /elf
parent54beacabbe34d033abcf9545c28f091ae06e944b (diff)
downloadglibc-664e7d93f93d421225a115a433d0dbbc40444daa.tar.gz
glibc-664e7d93f93d421225a115a433d0dbbc40444daa.tar.xz
glibc-664e7d93f93d421225a115a433d0dbbc40444daa.zip
Update.
2004-09-20  Ulrich Drepper  <drepper@redhat.com>

	* elf/dl-load.c: Define __stack_prot.
	* sysdeps/unix/sysv/linux/dl-execstack.c: Don't define
	__stack_prot here, just declare it.
Diffstat (limited to 'elf')
-rw-r--r--elf/dl-load.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 8a5aa21402..fad456f02c 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -34,6 +34,7 @@
 #include "dynamic-link.h"
 #include <abi-tag.h>
 #include <dl-osinfo.h>
+#include <stackinfo.h>
 
 #include <dl-dst.h>
 
@@ -102,7 +103,13 @@ ELF_PREFERRED_ADDRESS_DATA;
 #endif
 
 
-extern int __stack_prot attribute_relro attribute_hidden;
+int __stack_prot attribute_hidden attribute_relro
+#if _STACK_GROWS_DOWN
+     = PROT_READ|PROT_WRITE|PROT_GROWSDOWN;
+#elif _STACK_GROWS_UP
+     = PROT_READ|PROT_WRITE|PROT_GROWSUP;
+#endif
+
 
 /* Type for the buffer we put the ELF header and hopefully the program
    header.  This buffer does not really have to be too large.  In most