Clean up NPTL thread C library support files and simplify build process.

16 files changed, 48 insertions, 18 deletions

diff --git a/libpthread/nptl/sysdeps/alpha/dl-tls.c b/libpthread/nptl/sysdeps/alpha/dl-tls.c
deleted file mode 100644
index db50de8ab..000000000
--- a/libpthread/nptl/sysdeps/alpha/dl-tls.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <../generic/dl-tls.c>
diff --git a/libpthread/nptl/sysdeps/generic/Makefile b/libpthread/nptl/sysdeps/generic/Makefile
new file mode 100644
index 000000000..582661fde
--- /dev/null
+++ b/libpthread/nptl/sysdeps/generic/Makefile
@@ -0,0 +1,13 @@
+# Makefile for uClibc NPTL
+#
+# Copyright (C) 2006 Steven J. Hill <sjhill@uclibc.org>
+#
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+#
+
+top_srcdir=../../../../
+top_builddir=../../../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libpthread/nptl/sysdeps/generic/Makefile.in b/libpthread/nptl/sysdeps/generic/Makefile.in
new file mode 100644
index 000000000..2d2a00d8e
--- /dev/null
+++ b/libpthread/nptl/sysdeps/generic/Makefile.in
@@ -0,0 +1,31 @@
+# Makefile for uClibc NPTL
+#
+# Copyright (C) 2006 Steven J. Hill <sjhill@uclibc.org>
+#
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+#
+
+#
+# NOTE: Alpha and MIPS have their own versions of 'libc-tls.c' in
+#       their architecture specific directory which will override
+#       the one here.
+#
+libc_a_CSRC = dl-support.c dl-tls.c libc-tls.c
+
+CFLAGS-dl-support.c = -D_GNU_SOURCE
+
+CFLAGS-generic = $(SSP_ALL_CFLAGS)
+#CFLAGS:=$(CFLAGS:-O1=-O2)
+
+PTHREAD_GENERIC_OUT:=$(top_builddir)libpthread/nptl/sysdeps/generic
+
+LIBC_GENERIC_OBJ:=$(patsubst %.c,$(PTHREAD_GENERIC_OUT)/%.o,$(libc_a_CSRC))
+
+libc-a-y+=$(LIBC_GENERIC_OBJ)
+
+libc-nomulti-y+=$(LIBC_GENERIC_OBJ)
+
+objclean-y+=pthread_generic_objclean
+
+pthread_generic_objclean:
+	$(RM) $(PTHREAD_GENERIC_OUT)/*.{o,os,oS}
diff --git a/libpthread/nptl/sysdeps/generic/libc-tls.c b/libpthread/nptl/sysdeps/generic/libc-tls.c
index 5a71e3a60..8946c93aa 100644
--- a/libpthread/nptl/sysdeps/generic/libc-tls.c
+++ b/libpthread/nptl/sysdeps/generic/libc-tls.c
@@ -23,13 +23,11 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/param.h>
-#ifdef __UCLIBC__
 #include <elf.h>
 #include <link.h>
 #include <string.h>
 
-#define __sbrk	sbrk
-#endif
+//#define __sbrk	sbrk
 
 
 #ifdef SHARED
@@ -209,9 +207,6 @@ __libc_setup_tls (size_t tcbsize, size_t tcbalign)
   static_map.l_tls_blocksize = memsz;
   static_map.l_tls_initimage = initimage;
   static_map.l_tls_initimage_size = filesz;
-#ifndef __UCLIBC__
-  static_map.l_type = lt_executable;
-#endif
   static_map.l_tls_modid = 1;
 
   init_slotinfo ();
diff --git a/libpthread/nptl/sysdeps/i386/dl-tls.c b/libpthread/nptl/sysdeps/i386/dl-tls.c
deleted file mode 100644
index db50de8ab..000000000
--- a/libpthread/nptl/sysdeps/i386/dl-tls.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <../generic/dl-tls.c>
diff --git a/libpthread/nptl/sysdeps/i386/libc-tls.c b/libpthread/nptl/sysdeps/i386/libc-tls.c
deleted file mode 100644
index 4e726c14d..000000000
--- a/libpthread/nptl/sysdeps/i386/libc-tls.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <../generic/libc-tls.c>
diff --git a/libpthread/nptl/sysdeps/mips/dl-support.c b/libpthread/nptl/sysdeps/mips/dl-support.c
deleted file mode 100644
index 7ed833fc6..000000000
--- a/libpthread/nptl/sysdeps/mips/dl-support.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <../generic/dl-support.c>
diff --git a/libpthread/nptl/sysdeps/mips/dl-tls.c b/libpthread/nptl/sysdeps/mips/dl-tls.c
deleted file mode 100644
index db50de8ab..000000000
--- a/libpthread/nptl/sysdeps/mips/dl-tls.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <../generic/dl-tls.c>
diff --git a/libpthread/nptl/sysdeps/mips/libc-tls.c b/libpthread/nptl/sysdeps/mips/libc-tls.c
index fdedc9f5a..fbaa40f39 100644
--- a/libpthread/nptl/sysdeps/mips/libc-tls.c
+++ b/libpthread/nptl/sysdeps/mips/libc-tls.c
@@ -20,6 +20,8 @@
 #include <../generic/libc-tls.c>
 #include <dl-tls.h>
 
+extern int sjh;
+
 #if USE_TLS
 
 /* On MIPS, linker optimizations are not required, so __tls_get_addr
@@ -30,6 +32,7 @@
 void *
 __tls_get_addr (tls_index *ti)
 {
+	sjh = 4;
   dtv_t *dtv = THREAD_DTV ();
   return (char *) dtv[1].pointer.val + GET_ADDR_OFFSET;
 }
diff --git a/libpthread/nptl/sysdeps/powerpc/dl-tls.c b/libpthread/nptl/sysdeps/powerpc/dl-tls.c
deleted file mode 100644
index db50de8ab..000000000
--- a/libpthread/nptl/sysdeps/powerpc/dl-tls.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <../generic/dl-tls.c>
diff --git a/libpthread/nptl/sysdeps/powerpc/libc-tls.c b/libpthread/nptl/sysdeps/powerpc/libc-tls.c
deleted file mode 100644
index 4e726c14d..000000000
--- a/libpthread/nptl/sysdeps/powerpc/libc-tls.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <../generic/libc-tls.c>
diff --git a/libpthread/nptl/sysdeps/sh/dl-tls.c b/libpthread/nptl/sysdeps/sh/dl-tls.c
deleted file mode 100644
index db50de8ab..000000000
--- a/libpthread/nptl/sysdeps/sh/dl-tls.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <../generic/dl-tls.c>
diff --git a/libpthread/nptl/sysdeps/sh/libc-tls.c b/libpthread/nptl/sysdeps/sh/libc-tls.c
deleted file mode 100644
index 4e726c14d..000000000
--- a/libpthread/nptl/sysdeps/sh/libc-tls.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <../generic/libc-tls.c>
diff --git a/libpthread/nptl/sysdeps/sparc/dl-tls.c b/libpthread/nptl/sysdeps/sparc/dl-tls.c
deleted file mode 100644
index db50de8ab..000000000
--- a/libpthread/nptl/sysdeps/sparc/dl-tls.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <../generic/dl-tls.c>
diff --git a/libpthread/nptl/sysdeps/sparc/libc-tls.c b/libpthread/nptl/sysdeps/sparc/libc-tls.c
deleted file mode 100644
index 4e726c14d..000000000
--- a/libpthread/nptl/sysdeps/sparc/libc-tls.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <../generic/libc-tls.c>
diff --git a/libpthread/nptl/sysdeps/x86_64/dl-tls.c b/libpthread/nptl/sysdeps/x86_64/dl-tls.c
deleted file mode 100644
index db50de8ab..000000000
--- a/libpthread/nptl/sysdeps/x86_64/dl-tls.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <../generic/dl-tls.c>