From d1d9eaf478b7d3a11a599c120498b79fe5629a61 Mon Sep 17 00:00:00 2001 From: Ondřej Bílka Date: Tue, 26 Nov 2013 12:29:20 +0100 Subject: Use __glibc_reserved instead __unused. --- nptl/ChangeLog | 4 ++++ nptl/sysdeps/i386/tls.h | 2 +- nptl/sysdeps/x86_64/tls.h | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'nptl') diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 779843d17f..9f4063016f 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,7 @@ +2013-11-26 Ondřej Bílka + * sysdeps/i386/tls.h: Use __glibc_reserved instead __unused. + * sysdeps/x86_64/tls.h: Likewise. + 2013-11-25 Paul Pluzhnikov [BZ #11214] diff --git a/nptl/sysdeps/i386/tls.h b/nptl/sysdeps/i386/tls.h index 3d18b1de73..9a56e21d52 100644 --- a/nptl/sysdeps/i386/tls.h +++ b/nptl/sysdeps/i386/tls.h @@ -56,7 +56,7 @@ typedef struct #ifndef __ASSUME_PRIVATE_FUTEX int private_futex; #else - int __unused1; + int __glibc_reserved1; #endif /* Reservation of some values for the TM ABI. */ void *__private_tm[4]; diff --git a/nptl/sysdeps/x86_64/tls.h b/nptl/sysdeps/x86_64/tls.h index 61df1af2b0..d6350fdf4a 100644 --- a/nptl/sysdeps/x86_64/tls.h +++ b/nptl/sysdeps/x86_64/tls.h @@ -65,14 +65,14 @@ typedef struct # ifndef __ASSUME_PRIVATE_FUTEX int private_futex; # else - int __unused1; + int __glibc_reserved1; # endif int rtld_must_xmm_save; /* Reservation of some values for the TM ABI. */ void *__private_tm[4]; /* GCC split stack support. */ void *__private_ss; - long int __unused2; + long int __glibc_reserved2; /* Have space for the post-AVX register size. */ __128bits rtld_savespace_sse[8][4] __attribute__ ((aligned (32))); -- cgit 1.4.1