MIPS NPTL patches [1/3]

[Dan E]

It figures.  Let's try that again without the word wrapping.

---------- patch start ----------
Index: uClibc-nptl/include/unistd.h
===================================================================
--- uClibc-nptl/include/unistd.h	(revision 26031)
+++ uClibc-nptl/include/unistd.h	(working copy)
@@ -771,7 +771,7 @@
 #endif /* Use BSD. */
 
 /* Special exit function which only terminates the current thread.  */
-extern void __exit_thread (int val) __attribute__ ((noreturn));
+extern void __exit_thread (int val) __attribute__ ((__noreturn__));
 
 /* Return the pathname of the terminal FD is open on, or NULL on errors.
    The returned storage is good only until the next call to this function.  */
Index: uClibc-nptl/ldso/ldso/mips/elfinterp.c
===================================================================
--- uClibc-nptl/ldso/ldso/mips/elfinterp.c	(revision 26031)
+++ uClibc-nptl/ldso/ldso/mips/elfinterp.c	(working copy)
@@ -210,7 +210,7 @@
 
 				if (ELF32_ST_BIND(symtab[symtab_index].st_info) != STB_LOCAL) {
 					_dl_find_hash((strtab + symtab[symtab_index].st_name),
-							_dl_symbol_tables, tpnt_tls, 1, &sym_tls);
+							_dl_symbol_tables, tpnt_tls, 1, &tpnt_tls);
 				}
 
 				switch (reloc_type)
Index: uClibc-nptl/ldso/ldso/mips/dl-sysdep.h
===================================================================
--- uClibc-nptl/ldso/ldso/mips/dl-sysdep.h	(revision 26031)
+++ uClibc-nptl/ldso/ldso/mips/dl-sysdep.h	(working copy)
@@ -127,7 +127,7 @@
 	GOT_BASE[0] = (unsigned long) _dl_runtime_resolve;			\
 	GOT_BASE[1] = (unsigned long) MODULE;					\
 										\
-	pltgot = MODULE->dynamic_info[DT_MIPS_PLTGOT_IDX];			\
+	pltgot = (unsigned long *) MODULE->dynamic_info[DT_MIPS_PLTGOT_IDX];	\
 	if (pltgot) {								\
 		pltgot[0] = (unsigned long) _dl_runtime_pltresolve;		\
 		pltgot[1] = (unsigned long) MODULE;				\
Index: uClibc-nptl/ldso/include/ldso.h
===================================================================
--- uClibc-nptl/ldso/include/ldso.h	(revision 26031)
+++ uClibc-nptl/ldso/include/ldso.h	(working copy)
@@ -40,6 +40,7 @@
 #ifdef __UCLIBC_HAS_TLS__
 /* Defines USE_TLS */
 #include <tls.h>
+#include <dl-tls.h>
 #endif
 #include <dl-hash.h>
 
Index: uClibc-nptl/libc/signal/sigpause.c
===================================================================
--- uClibc-nptl/libc/signal/sigpause.c	(revision 26031)
+++ uClibc-nptl/libc/signal/sigpause.c	(working copy)
@@ -23,6 +23,7 @@
 #define __FAVOR_BSD
 #include <signal.h>
 #include <stddef.h>		/* For NULL.  */
+#include <string.h>
 #ifdef __UCLIBC_HAS_THREADS_NATIVE__
 #include <sysdep-cancel.h>
 #endif
---------- patch end ------------

-- 
http://www.fastmail.fm - And now for something completely different