[git commit nptl] linuxthreads.old: extend workaround for asm rename warnings

[Mike Frysinger]

commit: http://git.uclibc.org/uClibc/commit/?id=1cb3602ad09298ff25409cb8f1bd2254258669d2
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/nptl

The libc_pthread_init.c needs the include workaround like forward.c, and
forward.c needs more includes now.

Signed-off-by: Mike Frysinger <vapier at gentoo.org>
Signed-off-by: Austin Foxley <austinf at cetoncorp.com>
---
 libpthread/linuxthreads.old/forward.c           |    1 +
 libpthread/linuxthreads.old/libc_pthread_init.c |   11 +++++++++++
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/libpthread/linuxthreads.old/forward.c b/libpthread/linuxthreads.old/forward.c
index aa5c8ab..402b155 100644
--- a/libpthread/linuxthreads.old/forward.c
+++ b/libpthread/linuxthreads.old/forward.c
@@ -46,6 +46,7 @@ For now, just include all headers before internals.h
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <sys/time.h>
 
 #include "internals.h"
 
diff --git a/libpthread/linuxthreads.old/libc_pthread_init.c b/libpthread/linuxthreads.old/libc_pthread_init.c
index 6bd0807..2b0deae 100644
--- a/libpthread/linuxthreads.old/libc_pthread_init.c
+++ b/libpthread/linuxthreads.old/libc_pthread_init.c
@@ -21,6 +21,17 @@
 #include <locale.h>
 #include <stdlib.h>
 #include <string.h>
+
+/* see comment in forward.c */
+#define GCC_RENAME_BUG 1
+#ifdef GCC_RENAME_BUG
+# include <ctype.h>
+# include <signal.h>
+# include <unistd.h>
+# include <sys/time.h>
+# include <sys/wait.h>
+#endif
+
 #include "internals.h"
 #include "sysdeps/pthread/pthread-functions.h"
 
-- 
1.6.3.3