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.

diff --git a/ChangeLog b/ChangeLog
index dbd376d..b3538e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
 2004-09-20  Jakub Jelinek  <jakub@redhat.com>
 
        * configure.in (libc_cv_z_relro): Only set to yes if linker script

diff --git a/elf/dl-load.c b/elf/dl-load.c
index 8a5aa21..fad456f 100644 (file)
--- 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

diff --git a/sysdeps/unix/sysv/linux/dl-execstack.c b/sysdeps/unix/sysv/linux/dl-execstack.c
index c2b964b..97ff5d0 100644 (file)
--- a/sysdeps/unix/sysv/linux/dl-execstack.c
+++ b/sysdeps/unix/sysv/linux/dl-execstack.c
@@ -28,12 +28,7 @@
 #include "kernel-features.h"
 
 
-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
+extern int __stack_prot attribute_relro attribute_hidden;
 
 
 int