merge upstream changes

diff --cc ldso/ldso/xtensa/dl-startup.h
Simple merge

diff --cc ldso/ldso/xtensa/dl-sysdep.h
Simple merge

diff --cc libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch
Simple merge

diff --cc test/nptl/Makefile.in
Simple merge

diff --cc test/nptl/tst-cancel7.c
Simple merge

diff --cc test/nptl/tst-mqueue7.c
Simple merge