svn commit: branches/uClibc-nptl/libpthread/nptl/sysdeps: alpha generic i386 mips powerpc sh sparc etc...
sjhill at uclibc.org
sjhill at uclibc.org
Sun Feb 5 05:21:29 UTC 2006
Author: sjhill
Date: 2006-02-04 21:21:27 -0800 (Sat, 04 Feb 2006)
New Revision: 13846
Log:
Clean up NPTL thread C library support files and simplify build process.
Added:
branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/Makefile
branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/Makefile.in
Removed:
branches/uClibc-nptl/libpthread/nptl/sysdeps/alpha/dl-tls.c
branches/uClibc-nptl/libpthread/nptl/sysdeps/i386/dl-tls.c
branches/uClibc-nptl/libpthread/nptl/sysdeps/i386/libc-tls.c
branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/dl-support.c
branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/dl-tls.c
branches/uClibc-nptl/libpthread/nptl/sysdeps/powerpc/dl-tls.c
branches/uClibc-nptl/libpthread/nptl/sysdeps/powerpc/libc-tls.c
branches/uClibc-nptl/libpthread/nptl/sysdeps/sh/dl-tls.c
branches/uClibc-nptl/libpthread/nptl/sysdeps/sh/libc-tls.c
branches/uClibc-nptl/libpthread/nptl/sysdeps/sparc/dl-tls.c
branches/uClibc-nptl/libpthread/nptl/sysdeps/sparc/libc-tls.c
branches/uClibc-nptl/libpthread/nptl/sysdeps/x86_64/dl-tls.c
Modified:
branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/libc-tls.c
branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/libc-tls.c
Changeset:
Deleted: branches/uClibc-nptl/libpthread/nptl/sysdeps/alpha/dl-tls.c
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/alpha/dl-tls.c 2006-02-05 05:12:27 UTC (rev 13845)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/alpha/dl-tls.c 2006-02-05 05:21:27 UTC (rev 13846)
@@ -1 +0,0 @@
-#include <../generic/dl-tls.c>
Added: branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/Makefile
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/Makefile 2006-02-05 05:12:27 UTC (rev 13845)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/Makefile 2006-02-05 05:21:27 UTC (rev 13846)
@@ -0,0 +1,13 @@
+# Makefile for uClibc NPTL
+#
+# Copyright (C) 2006 Steven J. Hill <sjhill at 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
Added: branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/Makefile.in
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/Makefile.in 2006-02-05 05:12:27 UTC (rev 13845)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/Makefile.in 2006-02-05 05:21:27 UTC (rev 13846)
@@ -0,0 +1,31 @@
+# Makefile for uClibc NPTL
+#
+# Copyright (C) 2006 Steven J. Hill <sjhill at 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}
Modified: branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/libc-tls.c
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/libc-tls.c 2006-02-05 05:12:27 UTC (rev 13845)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/libc-tls.c 2006-02-05 05:21:27 UTC (rev 13846)
@@ -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 @@
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 ();
Deleted: branches/uClibc-nptl/libpthread/nptl/sysdeps/i386/dl-tls.c
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/i386/dl-tls.c 2006-02-05 05:12:27 UTC (rev 13845)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/i386/dl-tls.c 2006-02-05 05:21:27 UTC (rev 13846)
@@ -1 +0,0 @@
-#include <../generic/dl-tls.c>
Deleted: branches/uClibc-nptl/libpthread/nptl/sysdeps/i386/libc-tls.c
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/i386/libc-tls.c 2006-02-05 05:12:27 UTC (rev 13845)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/i386/libc-tls.c 2006-02-05 05:21:27 UTC (rev 13846)
@@ -1 +0,0 @@
-#include <../generic/libc-tls.c>
Deleted: branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/dl-support.c
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/dl-support.c 2006-02-05 05:12:27 UTC (rev 13845)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/dl-support.c 2006-02-05 05:21:27 UTC (rev 13846)
@@ -1 +0,0 @@
-#include <../generic/dl-support.c>
Deleted: branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/dl-tls.c
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/dl-tls.c 2006-02-05 05:12:27 UTC (rev 13845)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/dl-tls.c 2006-02-05 05:21:27 UTC (rev 13846)
@@ -1 +0,0 @@
-#include <../generic/dl-tls.c>
Modified: branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/libc-tls.c
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/libc-tls.c 2006-02-05 05:12:27 UTC (rev 13845)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/libc-tls.c 2006-02-05 05:21:27 UTC (rev 13846)
@@ -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;
}
Deleted: branches/uClibc-nptl/libpthread/nptl/sysdeps/powerpc/dl-tls.c
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/powerpc/dl-tls.c 2006-02-05 05:12:27 UTC (rev 13845)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/powerpc/dl-tls.c 2006-02-05 05:21:27 UTC (rev 13846)
@@ -1 +0,0 @@
-#include <../generic/dl-tls.c>
Deleted: branches/uClibc-nptl/libpthread/nptl/sysdeps/powerpc/libc-tls.c
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/powerpc/libc-tls.c 2006-02-05 05:12:27 UTC (rev 13845)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/powerpc/libc-tls.c 2006-02-05 05:21:27 UTC (rev 13846)
@@ -1 +0,0 @@
-#include <../generic/libc-tls.c>
Deleted: branches/uClibc-nptl/libpthread/nptl/sysdeps/sh/dl-tls.c
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/sh/dl-tls.c 2006-02-05 05:12:27 UTC (rev 13845)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/sh/dl-tls.c 2006-02-05 05:21:27 UTC (rev 13846)
@@ -1 +0,0 @@
-#include <../generic/dl-tls.c>
Deleted: branches/uClibc-nptl/libpthread/nptl/sysdeps/sh/libc-tls.c
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/sh/libc-tls.c 2006-02-05 05:12:27 UTC (rev 13845)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/sh/libc-tls.c 2006-02-05 05:21:27 UTC (rev 13846)
@@ -1 +0,0 @@
-#include <../generic/libc-tls.c>
Deleted: branches/uClibc-nptl/libpthread/nptl/sysdeps/sparc/dl-tls.c
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/sparc/dl-tls.c 2006-02-05 05:12:27 UTC (rev 13845)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/sparc/dl-tls.c 2006-02-05 05:21:27 UTC (rev 13846)
@@ -1 +0,0 @@
-#include <../generic/dl-tls.c>
Deleted: branches/uClibc-nptl/libpthread/nptl/sysdeps/sparc/libc-tls.c
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/sparc/libc-tls.c 2006-02-05 05:12:27 UTC (rev 13845)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/sparc/libc-tls.c 2006-02-05 05:21:27 UTC (rev 13846)
@@ -1 +0,0 @@
-#include <../generic/libc-tls.c>
Deleted: branches/uClibc-nptl/libpthread/nptl/sysdeps/x86_64/dl-tls.c
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/x86_64/dl-tls.c 2006-02-05 05:12:27 UTC (rev 13845)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/x86_64/dl-tls.c 2006-02-05 05:21:27 UTC (rev 13846)
@@ -1 +0,0 @@
-#include <../generic/dl-tls.c>
More information about the uClibc-cvs
mailing list