svn commit: branches/uClibc-nptl/libc: misc/internals sysdeps/linux/common

[Peter S. Mazinger]

On Sat, 5 Nov 2005 sjhill at uclibc.org wrote:

> Author: sjhill
> Date: 2005-11-05 21:25:52 -0800 (Sat, 05 Nov 2005)
> New Revision: 12170
> 
> Log:
> Changes to sync with trunk.
> 
> 
> Modified:
>    branches/uClibc-nptl/libc/Makefile
>    branches/uClibc-nptl/libc/misc/internals/Makefile
> 
> 
> Changeset:
> Modified: branches/uClibc-nptl/libc/Makefile
> ===================================================================
> --- branches/uClibc-nptl/libc/Makefile	2005-11-06 05:22:05 UTC (rev 12169)
> +++ branches/uClibc-nptl/libc/Makefile	2005-11-06 05:25:52 UTC (rev 12170)
> @@ -82,7 +82,7 @@
>  	$(INSTALL) -d $(TOPDIR)lib
>  	$(RM) $(AR_LIB_NAME)
>  	cp shared_$(LIB_NAME).a $(AR_LIB_NAME)
> -	$(AR) $(ARFLAGS) $(AR_LIB_NAME) misc/internals/static.o `cat nonshared_obj.*`
> +	$(AR) $(ARFLAGS) $(AR_LIB_NAME) `cat nonshared_obj.*`
>  ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
>  	$(MAKE) -C $(TOPDIR)libpthread/nptl obj.pthread.ar
>  	$(AR) $(ARFLAGS) $(AR_LIB_NAME) `cat obj.pthread.ar`
> 
> Modified: branches/uClibc-nptl/libc/misc/internals/Makefile
> ===================================================================
> --- branches/uClibc-nptl/libc/misc/internals/Makefile	2005-11-06 05:22:05 UTC (rev 12169)
> +++ branches/uClibc-nptl/libc/misc/internals/Makefile	2005-11-06 05:25:52 UTC (rev 12170)
> @@ -50,7 +50,7 @@
>  		"(\".interp\"))) =\""$(SHARED_LIB_LOADER_PREFIX)/$(UCLIBC_LDSO)"\";" >> interp.c
>  	echo "#endif" >> interp.c
>  
> -$(COBJS) interp.o static.o: %.o : %.c
> +$(COBJS) interp.o: %.o : %.c
>  	$(CC) $(CFLAGS) -c $< -o $@
>  	$(STRIPTOOL) -x -R .note -R .comment $*.o
>  
> 

Until you do not move to new build system, you have to undo this, static.o 
has to go into libc.a (in new build system I have made use of -DSHARED and 
provided the part from static.c in uClibc_main.c)

Peter

-- 
Peter S. Mazinger <ps dot m at gmx dot net>           ID: 0xA5F059F2
Key fingerprint = 92A4 31E1 56BC 3D5A 2D08  BB6E C389 975E A5F0 59F2