glibc:hjl/pthread/2.21

Branch merges

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

a574db3... by "H.J. Lu" <email address hidden> on 2012-09-13

Use STB_SECONDARY on pthread functions in libc

Use STB_SECONDARY binding on pthread functions in libc so that they will
be preempted by definitions in libpthread at link-time as well as at
run-time.

 * csu/libc-tls.c (__pthread_initialize_minimal): Mark it
 secondary if HAVE_ASM_SECONDARY_DIRECTIVE is defined.
 * misc/error.c (error): Replace pthread_setcancelstate with
 __pthread_setcancelstate.
 (error_at_line): Likewise.
 * posix/wordexp.c (parse_comm): Likewise.
 * stdlib/fmtmsg.c (fmtmsg): Likewise.
 * nptl/Makefile: Include ../Makeconfig.
 (libc-libpthread-routines): New macro.
 (libc-libpthread-static-only-routines): Likewise.
 (static-only-routines): Add $(libc-libpthread-static-only-routines)
 if $(have-secondary) is yes.
 (routines): Add $(libc-libpthread-routines) if $(have-secondary)
 is yes.
 (CFLAGS-libc-pthread_unwind.c): New.
 * nptl/Versions [HAVE_ASM_SECONDARY_DIRECTIVE] (libc:GLIBC_2.0):
 Add _pthread_cleanup_pop_restore, _pthread_cleanup_push_defer,
 __pthread_getspecific, __pthread_setspecific,
 __pthread_key_create, pthread_once, __pthread_once,
 __pthread_mutex_lock and __pthread_mutex_unlock.
 [HAVE_ASM_SECONDARY_DIRECTIVE] (libc:GLIBC_2.2): Add
 __pthread_rwlock_init, __pthread_rwlock_destroy,
 __pthread_rwlock_rdlock, __pthread_rwlock_wrlock and
 __pthread_rwlock_unlock.
 [HAVE_ASM_SECONDARY_DIRECTIVE] (libc:GLIBC_PRIVATE): Add
 __pthread_unwind and __pthread_setcancelstate.
 [HAVE_ASM_SECONDARY_DIRECTIVE] (libpthread:GLIBC_PRIVATE): Add
 __pthread_setcancelstate.
 * nptl/forward.c [HAVE_ASM_SECONDARY_DIRECTIVE] (FORWARD2): New.
 (FORWARD_NORETURN): Likewise.
 (pthread_setcancelstate): Renamed to ...
 (__pthread_setcancelstate): This. Don't define if
 (__pthread_unwind): Don't define if HAVE_ASM_SECONDARY_DIRECTIVE
 is defined.
 * nptl/libc-cleanup_defer_compat.c: New file.
 * nptl/libc-pthread_getspecific.c: Likewise.
 * nptl/libc-pthread_key_create.c: Likewise.
 * nptl/libc-pthread_mutex_lock.c: Likewise.
 * nptl/libc-pthread_mutex_unlock.c: Likewise.
 * nptl/libc-pthread_once.c: Likewise.
 * nptl/libc-pthread_rwlock_destroy.c: Likewise.
 * nptl/libc-pthread_rwlock_init.c: Likewise.
 * nptl/libc-pthread_rwlock_rdlock.c: Likewise.
 * nptl/libc-pthread_rwlock_unlock.c: Likewise.
 * nptl/libc-pthread_rwlock_wrlock.c: Likewise.
 * nptl/libc-pthread_setcancelstate.c: Likewise.
 * nptl/libc-pthread_setspecific.c: Likewise.
 * nptl/libc-pthread_unwind.c: Likewise.
 * nptl/nptl-init.c (pthread_functions): Don't include secondary
 pthread functions in libc if HAVE_ASM_SECONDARY_DIRECTIVE is
 defined. Replace ptr_pthread_setcancelstate with
 ptr___pthread_setcancelstate.
 * sysdeps/nptl/pthread-functions.h (pthread_functions): Likewise.
 * nptl/pthreadP.h (__pthread_unwind): Don't mark it weak if
 HAVE_ASM_SECONDARY_DIRECTIVE is defined.
 (__pthread_cond_broadcast_2_0): Declare only if not in libc.
 (__pthread_cond_destroy_2_0): Likewise.
 (__pthread_cond_init_2_0): Likewise.
 (__pthread_cond_signal_2_0): Likewise.
 (__pthread_cond_timedwait_2_0): Likewise.
 (__pthread_cond_wait_2_0): Likewise.
 * scripts/abilist.awk: Support secondary symbols.
 * sysdeps/generic/localplt.data: Allow pthread functions.
 * sysdeps/unix/sysv/linux/i386/libc.abilist: Likewise.
 * sysdeps/unix/sysv/linux/i386/localplt.data: Likewise.
 * sysdeps/unix/sysv/linux/x86_64/64/libc.abilist: Likewise.
 * sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist: Likewise.
 * sysdeps/nptl/bits/libc-lockP.h (PTFAVAIL): Defined as 1 if
 HAVE_ASM_SECONDARY_DIRECTIVE is defined.
 (__libc_maybe_call): Always call FUNC if
 HAVE_ASM_SECONDARY_DIRECTIVE is defined.
 (__libc_ptf_call): Likewise.
 (__libc_ptf_call_always): Likewise.
 (__pthread_mutex_init): Don't mark it weak if
 HAVE_ASM_SECONDARY_DIRECTIVE is defined.
 (__pthread_mutex_destroy): Likewise.
 (__pthread_mutex_lock): Likewise.
 (__pthread_mutex_trylock): Likewise.
 (__pthread_mutex_unlock): Likewise.
 (__pthread_mutexattr_init): Likewise.
 (__pthread_mutexattr_destroy): Likewise.
 (__pthread_mutexattr_settype): Likewise.
 (__pthread_rwlock_destroy): Likewise.
 (__pthread_rwlock_rdlock): Likewise.
 (__pthread_rwlock_tryrdlock): Likewise.
 (__pthread_rwlock_wrlock): Likewise.
 (__pthread_rwlock_trywrlock): Likewise.
 (__pthread_rwlock_unlock): Likewise.
 (__pthread_key_create): Likewise.
 (__pthread_setspecific): Likewise.
 (__pthread_getspecific): Likewise.
 (__pthread_once): Likewise.
 (__pthread_initialize): Likewise.
 (__pthread_atfork): Likewise.
 (_pthread_cleanup_push_defer): Likewise.
 (_pthread_cleanup_pop_restore): Likewise.
 (__pthread_setcancelstate): New prototype.
 (pthread_setcancelstate): Renamed to ...
 (__pthread_setcancelstate): This. Don't mark it weak if
 HAVE_ASM_SECONDARY_DIRECTIVE is defined.
 * sysdeps/unix/sysv/linux/x86_64/cancellation.S (__pthread_unwind):
 Likewise.
 * sysdeps/unix/sysv/linux/fatal-prepare.h (FATAL_PREPARE): Always
 call __pthread_setcancelstate if HAVE_ASM_SECONDARY_DIRECTIVE is
 defined. Replace pthread_setcancelstate with
 __pthread_setcancelstate.
 * sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S: Make
 __lll_lock_wait_private and __lll_unlock_wake_private weak in
 libc.a.
 * sysdeps/unix/sysv/linux/x86_64/libc-lowlevellock.S: Likewise.

5c0fcf5... by "H.J. Lu" <email address hidden> on 2012-09-11

Place libpthread.a right before libc.a

GCC driver places -lpthread in --start-group -lgcc -lgcc_eh -lpthread
-lc --end-group. Glibc tests should do the same.

 [BZ #14569]
 * Makeconfig (+link-static-before-libc): Also filter out
 $(common-objpfx)nptl/libpthread%. Remove $(link-libc-static).
 (link-libc-static-tests): Place libpthread.a before libc.a.
 * nptl/Makefile (tests-static): Add tst-cancelx7-static,
 tst-raise1-static and tst-cancel7-static.
 (tests): Likewise.
 * nptl/tst-cancel7-static.c: New file.
 * nptl/tst-cancelx7-static.c: Likewise.
 * nptl/tst-raise1-static.c: Likewise.

d8f0433... by "H.J. Lu" <email address hidden> on 2015-09-11

Make pthread_rwlock_destroy/pthread_rwlock_init/weak

 * pthread_rwlock_destroy.c (pthread_rwlock_destroy): Replace
 strong_alias with weak_alias.
 * pthread_rwlock_init.c (pthread_rwlock_init): Likewise.

af345c2... by "H.J. Lu" <email address hidden> on 2015-09-10

Add STB_SECONDARY support to conform/linknamespace.pl

 * conform/linknamespace.pl (list_syms): Support STB_SECONDARY.

f10bae9... by "H.J. Lu" <email address hidden> on 2012-06-30

Add STB_SECONDARY support to ld.so

Enable STB_SECONDARY if it is supported by binutils. Add 3 STB_SECONDARY
tests.

 * config.h.in: Add HAVE_ASM_SECONDARY_DIRECTIVE.
 * config.make.in (have-secondary): New macro.
 * configure.in: Check if STB_SECONDARY is supported by as/ld.
 Define HAVE_ASM_SECONDARY_DIRECTIVE and set have-secondary to yes
 if the .secondary assembly directive works.
 * configure: Regenerated.
 * elf/Makefile (tests): Add tst-secondary1 tst-secondary2
 tst-secondary3 if STB_SECONDARY is supported by as/ld.
 (modules-names): Add tst-secondarymod tst-secondary1mod
 tst-secondary2mod tst-secondary3mod if STB_SECONDARY is supported
 by as/ld.
 (LDFLAGS-tst-secondarymod.so): New macro.
 ($(objpfx)tst-secondary1): New rule.
 ($(objpfx)tst-secondary2): Likewise.
 ($(objpfx)tst-secondary3): Likewise.
 * elf/dl-addr.c (determine_info): Also check STB_SECONDARY.
 * elf/dl-lookup.c (do_lookup_x): Handle STB_SECONDARY.
 (_dl_lookup_symbol_x): Likewise.
 * elf/sprof.c (read_symbols): Likewise.
 * elf/elf.h (STB_SECONDARY): New.
 (STB_NUM): Updated.
 * elf/tst-secondary.h: New file.
 * elf/tst-secondary1.c: Likewise.
 * elf/tst-secondary1mod.c: Likewise.
 * elf/tst-secondary2.c: Likewise.
 * elf/tst-secondary2mod.c: Likewise.
 * elf/tst-secondary3.c: Likewise.
 * elf/tst-secondary3mod.c: Likewise.
 * elf/tst-secondarymod.c: Likewise.

01b07c7... by Arjun Shankar <email address hidden> on 2015-04-21

CVE-2015-1781: resolv/nss_dns/dns-host.c buffer overflow [BZ#18287]

(cherry picked from commit 2959eda9272a033863c271aff62095abd01bd4e3)

75adf43... by Evangelos Foutras on 2015-02-10

Fix __memcpy_chk on non-SSE2 CPUs

In commit 8b4416d, the 1: jump label in __mempcpy_chk was accidentally
moved. This resulted in failures of mempcpy on CPU without SSE2.

(cherry picked from commit 132a1328eccd20621b77f7810eebbeec0a1af187)

c66e8b9... by Florian Weimer on 2015-02-06

NEWS: Also mention CVE-2015-1473

004c993... by Carlos O'Donell <email address hidden> on 2015-02-06

Fix missing ChangeLog attribution.

4e42b5b... by Carlos O'Donell <email address hidden> on 2015-02-06

Update version.h and include/features.h for 2.21 release