diff options
| author | Florian Weimer <fweimer@redhat.com> | 2017-08-13 21:11:38 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2017-08-13 21:11:38 +0200 |
| commit | e1d2ae8d217e50551802f3906099c8adc9f0811e (patch) | |
| tree | 25b4656da90b19e7ea2edfb3b9e4a9f0e0b0280a /sysdeps | |
| parent | c4ce038287c907495d589104e497991185d43c89 (diff) | |
| download | glibc-e1d2ae8d217e50551802f3906099c8adc9f0811e.zip glibc-e1d2ae8d217e50551802f3906099c8adc9f0811e.tar.gz glibc-e1d2ae8d217e50551802f3906099c8adc9f0811e.tar.bz2 | |
NPTL: Remove internal_function from stack marking functions
These are called across DSO boundaries and therefore should use
the ABI calling convention.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 4 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/dl-execstack.c | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/dl-execstack.c | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 1c0b9cb..55bb5e9 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -377,7 +377,7 @@ struct rtld_global /* If loading a shared object requires that we make the stack executable when it was not, we do it by calling this function. It returns an errno code or zero on success. */ - EXTERN int (*_dl_make_stack_executable_hook) (void **) internal_function; + EXTERN int (*_dl_make_stack_executable_hook) (void **); /* Prevailing state of the stack, PF_X indicating it's executable. */ EXTERN ElfW(Word) _dl_stack_flags; @@ -632,7 +632,7 @@ extern size_t _dl_phnum; /* This is the initial value of GL(dl_make_stack_executable_hook). A threads library can change it. */ -extern int _dl_make_stack_executable (void **stack_endp) internal_function; +extern int _dl_make_stack_executable (void **stack_endp); rtld_hidden_proto (_dl_make_stack_executable) /* Variable pointing to the end of the stack (or close to it). This value diff --git a/sysdeps/mach/hurd/dl-execstack.c b/sysdeps/mach/hurd/dl-execstack.c index 1168df9..51f0b9c 100644 --- a/sysdeps/mach/hurd/dl-execstack.c +++ b/sysdeps/mach/hurd/dl-execstack.c @@ -26,7 +26,6 @@ extern struct hurd_startup_data *_dl_hurd_data attribute_hidden; so as to mprotect it. */ int -internal_function _dl_make_stack_executable (void **stack_endp) { /* Challenge the caller. */ diff --git a/sysdeps/unix/sysv/linux/dl-execstack.c b/sysdeps/unix/sysv/linux/dl-execstack.c index 3c4de1c..4fe8152 100644 --- a/sysdeps/unix/sysv/linux/dl-execstack.c +++ b/sysdeps/unix/sysv/linux/dl-execstack.c @@ -30,7 +30,6 @@ extern int __stack_prot attribute_relro attribute_hidden; int -internal_function _dl_make_stack_executable (void **stack_endp) { /* This gives us the highest/lowest page that needs to be changed. */ |