From: Adhemerval Zanella Date: Thu, 11 May 2017 13:46:03 +0000 (-0300) Subject: Remove wrong definitions from pthread header refactor X-Git-Tag: glibc-2.26~523 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a19a9189678e8719c8423648417b0f44a83fd2c;p=thirdparty%2Fglibc.git Remove wrong definitions from pthread header refactor This patch removes wrong struct definition from eab380d (Move shared pthread definitions to common headers) on ARM and hppa. Checked on arm-linux-gnueabihf. * sysdeps/arm/nptl/bits/pthreadtypes-arch.h (__pthread_rwlock_arch_t): Remove __data definition. * sysdeps/hppa/nptl/bits/pthreadtypes-arch.h (__pthread_rwlock_arch_t): Likewise. --- diff --git a/ChangeLog b/ChangeLog index 1adcdf139d5..95611f3a1fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2017-05-11 Adhemerval Zanella + + * sysdeps/arm/nptl/bits/pthreadtypes-arch.h + (__pthread_rwlock_arch_t): Remove __data definition. + * sysdeps/hppa/nptl/bits/pthreadtypes-arch.h + (__pthread_rwlock_arch_t): Likewise. + 2017-05-11 Florian Weimer * resolv/inet_pton.c: Reformat in GNU style. Remove diff --git a/sysdeps/arm/nptl/bits/pthreadtypes-arch.h b/sysdeps/arm/nptl/bits/pthreadtypes-arch.h index 8333acb4ec1..3f9eca4645e 100644 --- a/sysdeps/arm/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/arm/nptl/bits/pthreadtypes-arch.h @@ -62,7 +62,7 @@ struct __pthread_rwlock_arch_t unsigned char __pad2; #endif int __cur_writer; -} __data; +}; #define __PTHREAD_RWLOCK_ELISION_EXTRA 0 diff --git a/sysdeps/hppa/nptl/bits/pthreadtypes-arch.h b/sysdeps/hppa/nptl/bits/pthreadtypes-arch.h index 131e30e93d2..7befe5de6d5 100644 --- a/sysdeps/hppa/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/hppa/nptl/bits/pthreadtypes-arch.h @@ -82,7 +82,7 @@ struct __pthread_rwlock_arch_t int __reserved2; int __reserved3; int __reserved4; -} __data; +}; #define __PTHREAD_RWLOCK_ELISION_EXTRA 0