Merge commit 'origin/master' into nptl

Conflicts:
	Makefile.in
	extra/Configs/Config.in
	libc/sysdeps/linux/common/bits/kernel-features.h
	libc/sysdeps/linux/common/poll.c
	libc/sysdeps/linux/common/sysdep.h
	libc/sysdeps/linux/sh/sysdep.h

Signed-off-by: Austin Foxley <austinf@cetoncorp.com>

diff --cc Makefile.in
Simple merge

diff --cc Rules.mak
Simple merge

diff --cc libc/Makefile.in
Simple merge

diff --cc libc/misc/pthread/Makefile.in
Simple merge

diff --cc libc/signal/Makefile.in
Simple merge

diff --cc libc/stdlib/Makefile.in
Simple merge

diff --cc libc/string/Makefile.in
Simple merge

diff --cc libc/sysdeps/linux/common/Makefile.in
Simple merge

diff --cc libc/sysdeps/linux/common/poll.c
index f50e92c,52f6c76..4211c26
--- 1/libc/sysdeps/linux/common/poll.c
--- 2/libc/sysdeps/linux/common/poll.c
+++ b/libc/sysdeps/linux/common/poll.c
@@@ -19,20 -19,14 +19,23 @@@
  
  #include <sys/syscall.h>
  #include <sys/poll.h>
+ #include <bits/kernel-features.h>
  
 -_syscall3(int, poll, struct pollfd *, fds,
 -      unsigned long int, nfds, int, timeout)
 +#ifdef __UCLIBC_HAS_THREADS_NATIVE__
 +#include <sysdep-cancel.h>
 +#else
 +#define SINGLE_THREAD_P 1
 +#endif
 +
+ #if defined __ASSUME_POLL_SYSCALL && defined __NR_poll
+ 
 +libc_hidden_proto(poll)
  
 -#elif defined(__NR_ppoll) && defined __UCLIBC_LINUX_SPECIFIC__
 +#ifdef __NR_poll
 +
 +#define __NR___syscall_poll __NR_poll
 +static inline _syscall3(int, __syscall_poll, struct pollfd *, fds,
 +                      unsigned long int, nfds, int, timeout);
  
  int poll(struct pollfd *fds, nfds_t nfds, int timeout)
  {

diff --cc libc/sysdeps/linux/common/sysdep.h
index 23151d9,cd5b2f1..dae74d7
--- 1/libc/sysdeps/linux/common/sysdep.h
--- 2/libc/sysdeps/linux/common/sysdep.h
+++ b/libc/sysdeps/linux/common/sysdep.h
@@@ -137,22 -137,3 +137,23 @@@
  # endif
  
  #endif /* __ASSEMBLER__ */
 +
 +/* Values used for encoding parameter of cfi_personality and cfi_lsda.  */
 +#define DW_EH_PE_absptr               0x00
 +#define DW_EH_PE_omit         0xff
 +#define DW_EH_PE_uleb128      0x01
 +#define DW_EH_PE_udata2               0x02
 +#define DW_EH_PE_udata4               0x03
 +#define DW_EH_PE_udata8               0x04
 +#define DW_EH_PE_sleb128      0x09
 +#define DW_EH_PE_sdata2               0x0a
 +#define DW_EH_PE_sdata4               0x0b
 +#define DW_EH_PE_sdata8               0x0c
 +#define DW_EH_PE_signed               0x08
 +#define DW_EH_PE_pcrel                0x10
 +#define DW_EH_PE_textrel      0x20
 +#define DW_EH_PE_datarel      0x30
 +#define DW_EH_PE_funcrel      0x40
 +#define DW_EH_PE_aligned      0x50
 +#define DW_EH_PE_indirect     0x80
++

diff --cc librt/Makefile.in
Simple merge

diff --cc test/Rules.mak
Simple merge