Merge remote branch 'origin/master' into nptl_merge

Conflicts:
	Rules.mak
	libc/misc/sysvipc/msgq.c
	test/Rules.mak

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

diff --cc Makefile.in
Simple merge

diff --cc Rules.mak
index 779d7b3,039625f..18d9d39
--- 1/Rules.mak
--- 2/Rules.mak
+++ b/Rules.mak
@@@ -580,9 -587,9 +587,9 @@@ endi
  
  LDFLAGS:=$(LDFLAGS_NOSTRIP) -Wl,-z,defs
  ifeq ($(DODEBUG),y)
 -CFLAGS += -O0 -g3
 +CFLAGS += -O0 -g3 -DDEBUG
  else
- CFLAGS += $(OPTIMIZATION) $(XARCH_CFLAGS) -DNDEBUG
+ CFLAGS += $(OPTIMIZATION)
  endif
  ifeq ($(DOSTRIP),y)
  LDFLAGS += -Wl,-s

diff --cc libc/misc/sysvipc/msgq.c
index d67645a,dac886f..e20e3ca
--- 1/libc/misc/sysvipc/msgq.c
--- 2/libc/misc/sysvipc/msgq.c
+++ b/libc/misc/sysvipc/msgq.c
@@@ -48,16 -43,11 +48,16 @@@ struct new_msg_buf
  
  #ifdef L_msgrcv
  #ifdef __NR_msgrcv
 -_syscall5(ssize_t, msgrcv, int, msqid, void *, msgp, size_t, msgsz, long int, msgtyp, int, msgflg)
 -#else
 -ssize_t msgrcv (int msqid, void *msgp, size_t msgsz,
 -      long int msgtyp, int msgflg)
 +#define __NR___syscall_msgrcv __NR_msgrcv
- static inline _syscall5(int, __syscall_msgrcv, int, msqid, void *, msgp,
++static inline _syscall5(ssize_t, __syscall_msgrcv, int, msqid, void *, msgp,
 +                      size_t, msgsz, long int, msgtyp, int, msgflg)
 +#endif
- static inline int do_msgrcv (int msqid, void *msgp, size_t msgsz,
++static inline ssize_t do_msgrcv (int msqid, void *msgp, size_t msgsz,
 +                          long int msgtyp, int msgflg)
  {
 +#ifdef __NR_msgrcv
 +    return __syscall_msgrcv(msqid, msgp, msgsz, msgtyp, msgflg);
 +#else
      struct new_msg_buf temp;
  
      temp.r_msgtyp = msgtyp;

diff --cc libc/sysdeps/linux/common/_exit.c
index a36927d,6cece08..51117d1
--- 1/libc/sysdeps/linux/common/_exit.c
--- 2/libc/sysdeps/linux/common/_exit.c
+++ b/libc/sysdeps/linux/common/_exit.c
@@@ -21,13 -18,7 +21,14 @@@ void attribute_noreturn _exit(int statu
  {
        /* The loop is added only to keep gcc happy. */
        while(1)
 +      {
 +#ifdef __UCLIBC_HAS_THREADS_NATIVE__
 +# ifdef __NR_exit_group
 +              INLINE_SYSCALL(exit_group, 1, status);
 +# endif
 +#endif
                INLINE_SYSCALL(exit, 1, status);
 +      }
  }
  libc_hidden_def(_exit)
+ weak_alias(_exit,_Exit)

diff --cc test/Test.mak
Simple merge