[PATCH] nptl: fix static linking

[Carmelo AMOROSO]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 9/9/2010 8:51 AM, Natanael Copa wrote:
> We need dl-tls.c for static libc or we will get missing symbols when
> linking things like openssl static.
> 
> This issue was introduced in 9381d622e2411a35a5fd73a5a573eb269e2dd9c9
> ---
> libpthread/nptl/Makefile.in | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in
> index 99a726a..3e9676a 100644
> --- a/libpthread/nptl/Makefile.in
> +++ b/libpthread/nptl/Makefile.in
> @@ -48,9 +48,9 @@ libc-shared-routines-y := $(addprefix 
> $(libpthread_OUT)/,$(libc-shared-routines-
> libc-static-routines-y := $(addprefix 
> $(libpthread_OUT)/,$(libc-static-routines-y:.c=.o))
> libc-shared-y += $(libc-shared-routines-y) $(libpthread_libc_OBJS:.o=.oS)
> ifeq ($(DOPIC),y)
> -libc-static-y += $(libc-static-routines-y:.o=.os) 
> $(libpthread_libc_a_OBJS:.o=.os) # $(libpthread_ld_tls_COBJ:.o=.os)
> +libc-static-y += $(libc-static-routines-y:.o=.os) 
> $(libpthread_libc_a_OBJS:.o=.os) $(libpthread_ld_tls_COBJ:.o=.os)
> else
> -libc-static-y += $(libc-static-routines-y) $(libpthread_libc_a_OBJS) # 
> $(libpthread_ld_tls_COBJ)
> +libc-static-y += $(libc-static-routines-y) $(libpthread_libc_a_OBJS) 
> $(libpthread_ld_tls_COBJ)
> endif
> 
> librt-pt-routines-y := $(patsubst %.c,$(libpthread_pthread_OUT)/%.o,$(filter-out 
> $(notdir $(libpthread_librt_OBJS:.o=.c)), $(librt-pt-routines-y)))
> --
> 1.7.2.3
> 
> _______________________________________________
> uClibc mailing list
> uClibc at uclibc.org
> http://lists.busybox.net/mailman/listinfo/uclibc
> 

Natanael,
I'm not able to apply your patch correctly, as it seems to break lines.
Could you check it ... or likely it's my damned M$ exchange server :(

carmelo

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkyIuKkACgkQoRq/3BrK1s+v/QCg6t4UIomeG+RzSX7ZjoLbhy3c
UB4AoLmLAaSuExLgdkG+D1a9/QqqaS1S
=2ZdQ
-----END PGP SIGNATURE-----