From 664e7d93f93d421225a115a433d0dbbc40444daa Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 20 Sep 2004 15:08:26 +0000
Subject: 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.
---
 elf/dl-load.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'elf')

diff --git a/elf/dl-load.c b/elf/dl-load.c
index 8a5aa21..fad456f 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
-- 
cgit v1.1