mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-13 14:50:17 +00:00
a81c1156c1
This patch adds two new internal defines to set the internal
pthread_mutex_t layout required by the supported ABIS:
1. __PTHREAD_MUTEX_NUSERS_AFTER_KIND which control whether to define
__nusers fields before or after __kind. The preferred value for
is 0 for new ports and it sets __nusers before __kind.
2. __PTHREAD_MUTEX_USE_UNION which control whether internal __spins and
__list members will be place inside an union for linuxthreads
compatibility. The preferred value is 0 for ports and it sets
to not use an union to define both fields.
It fixes the wrong offsets value for __kind value on x86_64-linux-gnu-x32.
Checked with a make check run-built-tests=no on all afected ABIs.
[BZ #22298]
* nptl/allocatestack.c (allocate_stack): Check if
__PTHREAD_MUTEX_HAVE_PREV is non-zero, instead if
__PTHREAD_MUTEX_HAVE_PREV is defined.
* nptl/descr.h (pthread): Likewise.
* nptl/nptl-init.c (__pthread_initialize_minimal_internal):
Likewise.
* nptl/pthread_create.c (START_THREAD_DEFN): Likewise.
* sysdeps/nptl/fork.c (__libc_fork): Likewise.
* sysdeps/nptl/pthread.h (PTHREAD_MUTEX_INITIALIZER): Likewise.
* sysdeps/nptl/bits/thread-shared-types.h
(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION): New
defines.
(__pthread_internal_list): Check __PTHREAD_MUTEX_USE_UNION instead
of __WORDSIZE for internal layout.
(__pthread_mutex_s): Check __PTHREAD_MUTEX_NUSERS_AFTER_KIND instead
of __WORDSIZE for internal __nusers layout and __PTHREAD_MUTEX_USE_UNION
instead of __WORDSIZE whether to use an union for __spins and __list
fields.
(__PTHREAD_MUTEX_HAVE_PREV): Define also for __PTHREAD_MUTEX_USE_UNION
case.
* sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h
(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION): New
defines.
* sysdeps/alpha/nptl/bits/pthreadtypes-arch.h
(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION):
Likewise.
* sysdeps/arm/nptl/bits/pthreadtypes-arch.h
(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION):
Likewise.
* sysdeps/hppa/nptl/bits/pthreadtypes-arch.h
(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION):
Likewise.
* sysdeps/ia64/nptl/bits/pthreadtypes-arch.h
(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION):
Likewise.
* sysdeps/m68k/nptl/bits/pthreadtypes-arch.h
(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION):
Likewise.
* sysdeps/microblaze/nptl/bits/pthreadtypes-arch.h
(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION):
Likewise.
* sysdeps/mips/nptl/bits/pthreadtypes-arch.h
(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION):
Likewise.
* sysdeps/nios2/nptl/bits/pthreadtypes-arch.h
(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION):
Likewise.
* sysdeps/powerpc/nptl/bits/pthreadtypes-arch.h
(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION):
Likewise.
* sysdeps/s390/nptl/bits/pthreadtypes-arch.h
(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION):
Likewise.
* sysdeps/sh/nptl/bits/pthreadtypes-arch.h
(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION):
Likewise.
* sysdeps/sparc/nptl/bits/pthreadtypes-arch.h
(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION):
Likewise.
* sysdeps/tile/nptl/bits/pthreadtypes-arch.h
(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION):
Likewise.
* sysdeps/x86/nptl/bits/pthreadtypes-arch.h
(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION):
Likewise.
Signed-off-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
(cherry picked from commit
|
||
|---|---|---|
| .. | ||
| armv6 | ||
| armv6t2 | ||
| armv7 | ||
| bits | ||
| include/bits | ||
| nptl | ||
| sys | ||
| __longjmp.S | ||
| abi-note.S | ||
| add_n.S | ||
| addmul_1.S | ||
| aeabi_assert.c | ||
| aeabi_atexit.c | ||
| aeabi_errno_addr.c | ||
| aeabi_lcsts.c | ||
| aeabi_localeconv.c | ||
| aeabi_math.c | ||
| aeabi_mb_cur_max.c | ||
| aeabi_memclr.c | ||
| aeabi_memcpy.c | ||
| aeabi_memmove.c | ||
| aeabi_memset.c | ||
| aeabi_sighandlers.S | ||
| aeabi_unwind_cpp_pr1.c | ||
| arm-features.h | ||
| arm-mcount.S | ||
| arm-unwind-resume.S | ||
| atomic-machine.h | ||
| backtrace.c | ||
| bsd-_setjmp.S | ||
| bsd-setjmp.S | ||
| configure | ||
| configure.ac | ||
| crti.S | ||
| crtn.S | ||
| dl-irel.h | ||
| dl-lookupcfg.h | ||
| dl-machine.h | ||
| dl-sysdep.h | ||
| dl-tls.h | ||
| dl-tlsdesc.h | ||
| dl-tlsdesc.S | ||
| dl-trampoline.S | ||
| e_sqrt.c | ||
| e_sqrtf.c | ||
| fclrexcpt.c | ||
| fedisblxcpt.c | ||
| feenablxcpt.c | ||
| fegetenv.c | ||
| fegetexcept.c | ||
| fegetmode.c | ||
| fegetround.c | ||
| feholdexcpt.c | ||
| fenv_private.h | ||
| fesetenv.c | ||
| fesetexcept.c | ||
| fesetmode.c | ||
| fesetround.c | ||
| feupdateenv.c | ||
| fgetexcptflg.c | ||
| find_exidx.c | ||
| fix-fp-int-convert-overflow.h | ||
| fpu_control.h | ||
| fraiseexcpt.c | ||
| frame.h | ||
| framestate.c | ||
| fsetexcptflg.c | ||
| ftestexcept.c | ||
| gcc-compat.h | ||
| gccframe.h | ||
| get-rounding-mode.h | ||
| gmp-mparam.h | ||
| Implies | ||
| jmpbuf-unwind.h | ||
| ldsodefs.h | ||
| libc-aeabi_read_tp.S | ||
| libc-tls.c | ||
| libm-test-ulps | ||
| libm-test-ulps-name | ||
| linkmap.h | ||
| machine-gmon.h | ||
| Makefile | ||
| math_private.h | ||
| math-tests.h | ||
| memcpy.S | ||
| memmove.S | ||
| memset.S | ||
| memusage.h | ||
| nptl-aeabi_unwind_cpp_pr1.c | ||
| preconfigure | ||
| preconfigure.ac | ||
| pt-arm-unwind-resume.S | ||
| rt-aeabi_unwind_cpp_pr1.c | ||
| rt-arm-unwind-resume.S | ||
| rtld-global-offsets.sym | ||
| s_fma.c | ||
| s_fmaf.c | ||
| setfpucw.c | ||
| setjmp.S | ||
| sfp-machine.h | ||
| sotruss-lib.c | ||
| stackinfo.h | ||
| start.S | ||
| static-stubs.c | ||
| strlen.S | ||
| sub_n.S | ||
| submul_1.S | ||
| sysdep.h | ||
| test-fpucw.c | ||
| tls-macros.h | ||
| tlsdesc.c | ||
| tlsdesc.sym | ||
| tst-armtlsdescextlazy.c | ||
| tst-armtlsdescextlazymod.c | ||
| tst-armtlsdescextnow.c | ||
| tst-armtlsdescextnowmod.c | ||
| tst-armtlsdescloc.c | ||
| tst-armtlsdesclocmod.c | ||
| tst-audit.h | ||
| unwind-dw2-fde-glibc.c | ||
| unwind-pe.c | ||
| unwind-resume.h | ||
| unwind.h | ||
| Versions | ||