[uClibc-cvs] svn commit: branches/uClibc-nptl: libc/inet libc/inet/rpc libc/misc/inter etc...

sjhill at uclibc.org sjhill at uclibc.org
Sun Jun 12 01:57:46 UTC 2005


Author: sjhill
Date: 2005-06-11 19:57:45 -0600 (Sat, 11 Jun 2005)
New Revision: 10535

Log:
Fixed up 'clean' target for latest NPTL changes and modified include
dependency directories so that either thread model can be used by the
C library modules that need some knowledge of pthreads.


Modified:
   branches/uClibc-nptl/Makefile
   branches/uClibc-nptl/Rules.mak
   branches/uClibc-nptl/libc/inet/Makefile
   branches/uClibc-nptl/libc/inet/rpc/Makefile
   branches/uClibc-nptl/libc/misc/internals/Makefile
   branches/uClibc-nptl/libc/misc/pthread/Makefile
   branches/uClibc-nptl/libc/misc/syslog/Makefile
   branches/uClibc-nptl/libc/sysdeps/linux/mips/Makefile
   branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/Makefile
   branches/uClibc-nptl/libpthread/nptl_db/Makefile


Changeset:
Modified: branches/uClibc-nptl/Makefile
===================================================================
--- branches/uClibc-nptl/Makefile	2005-06-12 01:40:26 UTC (rev 10534)
+++ branches/uClibc-nptl/Makefile	2005-06-12 01:57:45 UTC (rev 10535)
@@ -350,6 +350,7 @@
 	$(MAKE) -C libc/unistd clean
 	$(MAKE) -C libc/sysdeps/linux/common clean
 	$(MAKE) -C extra/locale clean
+	$(MAKE) -C libpthread clean
 	@set -e; \
 	for i in `(cd $(TOPDIR)/libc/sysdeps/linux/common/sys; ls *.h)` ; do \
 		$(RM) include/sys/$$i; \

Modified: branches/uClibc-nptl/Rules.mak
===================================================================
--- branches/uClibc-nptl/Rules.mak	2005-06-12 01:40:26 UTC (rev 10534)
+++ branches/uClibc-nptl/Rules.mak	2005-06-12 01:57:45 UTC (rev 10535)
@@ -274,6 +274,24 @@
     LDFLAGS := $(CPU_LDFLAGS-y) -s -shared --warn-common --warn-once -z combreloc
 endif
 
+#
+# Thread includes are needed to compile some files.
+#
+ifeq ($(PTHREADS_NATIVE),y)
+PTDIR 		:= $(TOPDIR)/libpthread/nptl/
+PT_INCLUDES	:= -I$(PTDIR)compat					\
+		   -I$(PTDIR)sysdeps/unix/sysv/linux/$(TARGET_ARCH)	\
+		   -I$(PTDIR)sysdeps/$(TARGET_ARCH)			\
+		   -I$(PTDIR)sysdeps/unix/sysv/linux			\
+		   -I$(PTDIR)sysdeps/pthread				\
+		   -include $(PTDIR)compat/libc-symbols.h
+else
+PTDIR 		:= $(TOPDIR)/libpthread/linuxthreads/
+PT_INCLUDES	:= -I$(PTDIR)sysdeps/$(TARGET_ARCH)			\
+		   -I$(PTDIR)sysdeps/pthread
+endif
+export PT_INCLUDES
+
 ifeq ($(UCLIBC_BUILD_RELRO),y)
 LDFLAGS+=-z relro
 endif

Modified: branches/uClibc-nptl/libc/inet/Makefile
===================================================================
--- branches/uClibc-nptl/libc/inet/Makefile	2005-06-12 01:40:26 UTC (rev 10534)
+++ branches/uClibc-nptl/libc/inet/Makefile	2005-06-12 01:57:45 UTC (rev 10535)
@@ -66,19 +66,19 @@
 	echo $(patsubst %, inet/%, $(OBJS)) > $(OBJ_LIST)
 
 $(MOBJ): $(MSRC)
-	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
+	$(CC) $(CFLAGS) $(PT_INCLUDES) -DL_$* $< -c -o $*.o
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 $(MOBJ2): $(MSRC2)
-	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
+	$(CC) $(CFLAGS) $(PT_INCLUDES) -DL_$* $< -c -o $*.o
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 $(MOBJ3): $(MSRC3)
-	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
+	$(CC) $(CFLAGS) $(PT_INCLUDES) -DL_$* $< -c -o $*.o
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 $(COBJS): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(CC) $(CFLAGS) $(PT_INCLUDES) -c $< -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean: subdirs_clean

Modified: branches/uClibc-nptl/libc/inet/rpc/Makefile
===================================================================
--- branches/uClibc-nptl/libc/inet/rpc/Makefile	2005-06-12 01:40:26 UTC (rev 10534)
+++ branches/uClibc-nptl/libc/inet/rpc/Makefile	2005-06-12 01:57:45 UTC (rev 10535)
@@ -23,7 +23,6 @@
 
 TOPDIR=../../../
 include $(TOPDIR)Rules.mak
-CFLAGS+=-I$(TOPDIR)libpthread/linuxthreads/sysdeps/pthread
 
 ifeq ($(strip $(UCLIBC_HAS_FULL_RPC)),y)
 CSRC :=auth_none.c auth_unix.c authunix_prot.c bindresvport.c \
@@ -58,7 +57,7 @@
 	echo $(patsubst %, inet/rpc/%, $(OBJS)) > $(OBJ_LIST)
 
 $(COBJS): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(CC) $(CFLAGS) $(PT_INCLUDES) -c $< -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:

Modified: branches/uClibc-nptl/libc/misc/internals/Makefile
===================================================================
--- branches/uClibc-nptl/libc/misc/internals/Makefile	2005-06-12 01:40:26 UTC (rev 10534)
+++ branches/uClibc-nptl/libc/misc/internals/Makefile	2005-06-12 01:57:45 UTC (rev 10535)
@@ -45,11 +45,11 @@
 	echo "#endif" >> interp.c
 
 interp.o: interp.c
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(CC) $(CFLAGS) $(PT_INCLUDES) -c $< -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 $(COBJS): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(CC) $(CFLAGS) $(PT_INCLUDES) -c $< -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:

Modified: branches/uClibc-nptl/libc/misc/pthread/Makefile
===================================================================
--- branches/uClibc-nptl/libc/misc/pthread/Makefile	2005-06-12 01:40:26 UTC (rev 10534)
+++ branches/uClibc-nptl/libc/misc/pthread/Makefile	2005-06-12 01:57:45 UTC (rev 10535)
@@ -19,15 +19,7 @@
 TOPDIR=../../../
 include $(TOPDIR)Rules.mak
 
-PTDIR = $(TOPDIR)libpthread/linuxthreads/
-SYSDEPINC = -I$(PTDIR)sysdeps/unix/sysv/linux \
-            -I$(PTDIR)sysdeps/pthread \
-            -I$(PTDIR)sysdeps/unix/sysv \
-            -I$(PTDIR)sysdeps/unix/unix \
-            -I$(PTDIR)sysdeps/$(TARGET_ARCH) \
-            -I$(PTDIR)sysdeps \
-            -I$(TOPDIR)libc/sysdeps/linux/$(TARGET_ARCH)
-CFLAGS += $(SYSDEPINC) -D_GNU_SOURCE
+CFLAGS += $(PT_INCLUDES)
 
 CSRC=no-tsd.c weaks.c
 COBJS=$(patsubst %.c,%.o, $(CSRC))

Modified: branches/uClibc-nptl/libc/misc/syslog/Makefile
===================================================================
--- branches/uClibc-nptl/libc/misc/syslog/Makefile	2005-06-12 01:40:26 UTC (rev 10534)
+++ branches/uClibc-nptl/libc/misc/syslog/Makefile	2005-06-12 01:57:45 UTC (rev 10535)
@@ -36,7 +36,7 @@
 	echo $(patsubst %, misc/syslog/%, $(OBJS)) > $(OBJ_LIST)
 
 $(COBJS): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(CC) $(CFLAGS) $(PT_INCLUDES) -c $< -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:

Modified: branches/uClibc-nptl/libc/sysdeps/linux/mips/Makefile
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/mips/Makefile	2005-06-12 01:40:26 UTC (rev 10534)
+++ branches/uClibc-nptl/libc/sysdeps/linux/mips/Makefile	2005-06-12 01:57:45 UTC (rev 10535)
@@ -89,3 +89,4 @@
 	$(RM) bits/sysnum.h
 	$(RM) $(TOPDIR)/include/fpu_control.h
 	$(RM) $(TOPDIR)/include/sgidefs.h
+	$(RM) $(TOPDIR)/include/sysdep.h

Modified: branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/Makefile
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/Makefile	2005-06-12 01:40:26 UTC (rev 10534)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/Makefile	2005-06-12 01:57:45 UTC (rev 10535)
@@ -1,25 +1,39 @@
-# Copyright (C) 2005 Free Software Foundation, Inc.
-# This file is part of the GNU C Library.
+# Makefile for uClibc's NPTL pthread library
 #
-# The GNU C Library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
+# Copyright (C) 2005 Steven J. Hill <sjhill at realitydiluted.com>
 #
-# The GNU C Library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Library General Public License as published by the Free
+# Software Foundation; either version 2 of the License, or (at your option) any
+# later version.
 #
-# You should have received a copy of the GNU Lesser General Public
-# License along with the GNU C Library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Library General Public License
+# along with this program; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Makefile for uClibc
 
-ifeq ($(subdir),csu)
-gen-as-const-headers += tcb-offsets.sym
-endif
+TOPDIR=../../../../
+include $(TOPDIR)Rules.mak
 
-ifeq ($(subdir),nptl)
-libpthread-sysdep_routines += nptl-sysdep
-endif
+#
+# FIX ME: We should probably be including 'nptl-sysdep.S' which needs
+#         the new '__syscall_error' function for per-thread 'errno'. Maybe
+#         this work and maybe it will not.
+#
+SOBJS = $(patsubst %.S,%.o, $(filter-out nptl-sysdep.S, $(wildcard *.S)))
+
+OBJS = $(SOBJS)
+
+all: $(OBJS)
+
+$(SOBJS): %.o : %.S
+	echo $(PTDIR)
+	$(CC) $(ASFLAGS) -c $< -o $@
+
+clean:
+	$(RM) *.[oa] *~ core

Modified: branches/uClibc-nptl/libpthread/nptl_db/Makefile
===================================================================
--- branches/uClibc-nptl/libpthread/nptl_db/Makefile	2005-06-12 01:40:26 UTC (rev 10534)
+++ branches/uClibc-nptl/libpthread/nptl_db/Makefile	2005-06-12 01:57:45 UTC (rev 10535)
@@ -51,10 +51,13 @@
 libthread_db.so-no-z-defs = yes
 
 distribute = thread_dbP.h shlib-versions proc_service.h db_info.c structs.def
-include ../Rules
+#include ../Rules
 
 # Depend on libc.so so a DT_NEEDED is generated in the shared objects.
 # This ensures they will load libc.so for needed symbols if loaded by
 # a statically-linked program that hasn't already loaded it.
 $(objpfx)libthread_db.so: $(common-objpfx)libc.so \
 			  $(common-objpfx)libc_nonshared.a
+
+clean:
+	$(RM) *~ *.[ao]




More information about the uClibc-cvs mailing list