diff options
| author | Rafael Ávila de Espíndola <rafael@espindo.la> | 2018-11-26 11:35:26 -0200 |
|---|---|---|
| committer | Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com> | 2018-11-26 11:37:19 -0200 |
| commit | 8ae74eadb60eb36424e4605939cef5fc966724be (patch) | |
| tree | a2ae2026fd43c2136a0d1554a573744ced8be659 | |
| parent | 1e8bdc3a2b3e8d6e26efd14d44ae71d21d8366fe (diff) | |
| download | glibc-8ae74eadb60eb36424e4605939cef5fc966724be.tar glibc-8ae74eadb60eb36424e4605939cef5fc966724be.tar.gz glibc-8ae74eadb60eb36424e4605939cef5fc966724be.tar.bz2 glibc-8ae74eadb60eb36424e4605939cef5fc966724be.zip | |
Enable VDSO on powerpc statically linked programs (bug 19767)
[BZ #19767]
* sysdeps/unix/sysv/linux/powerpc/init-first.c: Remove #ifdef SHARED.
* sysdeps/unix/sysv/linux/powerpc/libc-vdso.h: Remove #ifdef
SHARED. Include sysdep.h.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h: Define
ALWAYS_USE_VSYSCALL.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h: Define
ALWAYS_USE_VSYSCALL.
Reviewed-by: Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com>
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/init-first.c | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/libc-vdso.h | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h | 3 |
5 files changed, 21 insertions, 9 deletions
@@ -1,3 +1,14 @@ +2018-11-26 Rafael Ávila de Espíndola <rafael@espindo.la> + + [BZ #19767] + * sysdeps/unix/sysv/linux/powerpc/init-first.c: Remove #ifdef SHARED. + * sysdeps/unix/sysv/linux/powerpc/libc-vdso.h: Remove #ifdef + SHARED. Include sysdep.h. + * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h: Define + ALWAYS_USE_VSYSCALL. + * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h: Define + ALWAYS_USE_VSYSCALL. + 2018-11-23 Rafael Ávila de Espíndola <rafael@espindo.la> [BZ #19767] diff --git a/sysdeps/unix/sysv/linux/powerpc/init-first.c b/sysdeps/unix/sysv/linux/powerpc/init-first.c index 0a4becbed6..c8a28008db 100644 --- a/sysdeps/unix/sysv/linux/powerpc/init-first.c +++ b/sysdeps/unix/sysv/linux/powerpc/init-first.c @@ -16,9 +16,8 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifdef SHARED -# include <dl-vdso.h> -# include <libc-vdso.h> +#include <dl-vdso.h> +#include <libc-vdso.h> int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *) attribute_hidden; @@ -79,7 +78,6 @@ _libc_vdso_platform_setup (void) #endif } -# define VDSO_SETUP _libc_vdso_platform_setup -#endif +#define VDSO_SETUP _libc_vdso_platform_setup #include <csu/init-first.c> diff --git a/sysdeps/unix/sysv/linux/powerpc/libc-vdso.h b/sysdeps/unix/sysv/linux/powerpc/libc-vdso.h index 5fe817d6cb..6f55944a51 100644 --- a/sysdeps/unix/sysv/linux/powerpc/libc-vdso.h +++ b/sysdeps/unix/sysv/linux/powerpc/libc-vdso.h @@ -20,8 +20,7 @@ #ifndef _LIBC_VDSO_H #define _LIBC_VDSO_H -#ifdef SHARED - +#include <sysdep.h> #include <sysdep-vdso.h> extern int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *) @@ -69,6 +68,4 @@ extern void *VDSO_SYMBOL(sigtramp_rt32); #define VDSO_IFUNC_RET(value) ((void *) (value)) #endif -#endif - #endif /* _LIBC_VDSO_H */ diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h index ec5c5250f8..6fe0a9951f 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h @@ -18,6 +18,9 @@ #ifndef _LINUX_POWERPC_SYSDEP_H #define _LINUX_POWERPC_SYSDEP_H 1 +/* Always enable vsyscalls on powerpc32 */ +#define ALWAYS_USE_VSYSCALL 1 + #include <sysdeps/unix/sysv/linux/sysdep.h> #include <sysdeps/unix/powerpc/sysdep.h> #include <tls.h> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h index 1f17f7bd5f..4d4015a03d 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h @@ -20,6 +20,9 @@ #ifndef _LINUX_POWERPC_SYSDEP_H #define _LINUX_POWERPC_SYSDEP_H 1 +/* Always enable vsyscalls on powerpc64 */ +#define ALWAYS_USE_VSYSCALL 1 + #include <sysdeps/unix/sysv/linux/sysdep.h> #include <sysdeps/unix/powerpc/sysdep.h> #include <tls.h> |