1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-28 00:21:52 +03:00
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.
This commit is contained in:
Ulrich Drepper
2004-09-20 15:08:26 +00:00
parent 54beacabbe
commit 664e7d93f9
3 changed files with 15 additions and 7 deletions

View File

@ -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> 2004-09-20 Jakub Jelinek <jakub@redhat.com>
* configure.in (libc_cv_z_relro): Only set to yes if linker script * configure.in (libc_cv_z_relro): Only set to yes if linker script

View File

@ -34,6 +34,7 @@
#include "dynamic-link.h" #include "dynamic-link.h"
#include <abi-tag.h> #include <abi-tag.h>
#include <dl-osinfo.h> #include <dl-osinfo.h>
#include <stackinfo.h>
#include <dl-dst.h> #include <dl-dst.h>
@ -102,7 +103,13 @@ ELF_PREFERRED_ADDRESS_DATA;
#endif #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 /* 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 header. This buffer does not really have to be too large. In most

View File

@ -28,12 +28,7 @@
#include "kernel-features.h" #include "kernel-features.h"
int __stack_prot attribute_hidden attribute_relro extern int __stack_prot attribute_relro attribute_hidden;
#if _STACK_GROWS_DOWN
= PROT_READ|PROT_WRITE|PROT_GROWSDOWN;
#elif _STACK_GROWS_UP
= PROT_READ|PROT_WRITE|PROT_GROWSUP;
#endif
int int