picnoir
/
glibc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

htl: Fix linking static tests by factorizing the symbols list 

libpthread_syms.a will contain the symbols that libc tries to get from
libpthread, to be used by the system, but also by tests.

* htl/libpthread.a, htl/libpthread_pic.a: Link libpthread_syms.a and Move EXTERN
references to...
* htl/libpthread_syms.a: ... new file. Add missing
__pthread_enable_asynccancel reference.
* htl/Makefile: Install libpthread_syms.a and link it into static tests.
This commit is contained in:
Samuel Thibault 2020-06-10 20:03:52 +00:00
parent 533dd2acf7
commit bc9cf8fbe8
4 changed files with 30 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htl/Makefile
View File

@ -173,6 +173,7 @@ static-only-routines = pt-atfork
extra-libs := libpthread
extra-libs-others := $(extra-libs)
install-lib := libpthread.so
install-lib-ldscripts := libpthread_syms.a
include ../Makeconfig
@ -180,7 +181,7 @@ CFLAGS-lockfile.c = -D_IO_MTSAFE_IO
all: # Make this the default target; it will be defined in Rules.
subdir_install: $(inst_libdir)/libpthread2.a
subdir_install: $(inst_libdir)/libpthread2.a $(inst_libdir)/libpthread_syms.a
# XXX: If $(inst_libdir)/libpthread2.a is installed and
# $(inst_libdir)/libpthread is not, we can have some issues.
@ -198,6 +199,9 @@ $(inst_libdir)/libpthread2_pic.a: $(inst_libdir)/libpthread_pic.a
mv $< $@
$(INSTALL_DATA) $(srcdir)/libpthread_pic.a $<
$(inst_libdir)/libpthread_syms.a: $(srcdir)/libpthread_syms.a $(+force)
$(do-install)
libc-link.so = $(common-objpfx)libc.so
extra-B-pthread.so = -B$(common-objpfx)htl/
@ -217,7 +221,7 @@ $(objpfx)tst-unload: $(libdl)
$(addprefix $(objpfx), $(tests-reverse)): \
$(objpfx)../libc.so $(objpfx)libpthread.so
$(objpfx)../libc.so: $(common-objpfx)libc.so ;
$(addprefix $(objpfx),$(tests-static) $(xtests-static)): $(objpfx)libpthread.a
$(addprefix $(objpfx),$(tests-static) $(xtests-static)): $(srcdir)/libpthread_syms.a $(objpfx)libpthread.a
else
$(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
$(addprefix $(objpfx),$(tests) $(test-srcs)): $(srcdir)/libpthread_syms.a $(objpfx)libpthread.a
endif

22
htl/libpthread.a
View File

@ -1,22 +1,2 @@
/* pthread initializer is weak in glibc. It must be included if glibc
is to start threading. */
EXTERN(_cthread_init_routine)
/* Weak references in glibc that must be filled if glibc is to be
thread safe. */
EXTERN(cthread_detach)
EXTERN(cthread_fork)
EXTERN(cthread_keycreate)
EXTERN(cthread_getspecific)
EXTERN(cthread_setspecific)
EXTERN(__mutex_lock_solid)
EXTERN(__mutex_unlock_solid)
/* For libio stream locking. */
EXTERN(_cthreads_flockfile)
EXTERN(_cthreads_funlockfile)
EXTERN(_cthreads_ftrylockfile)
/* To get the sigthread stack layout on fork */
EXTERN(pthread_getattr_np)
EXTERN(pthread_attr_getstack)
GROUP(-lpthread_syms)
GROUP(-lpthread2 -lrt)

22
htl/libpthread_pic.a
View File

@ -1,22 +1,2 @@
/* pthread initializer is weak in glibc. It must be included if glibc
is to start threading. */
EXTERN(_cthread_init_routine)
/* Weak references in glibc that must be filled if glibc is to be
thread safe. */
EXTERN(cthread_detach)
EXTERN(cthread_fork)
EXTERN(cthread_keycreate)
EXTERN(cthread_getspecific)
EXTERN(cthread_setspecific)
EXTERN(__mutex_lock_solid)
EXTERN(__mutex_unlock_solid)
/* For libio stream locking. */
EXTERN(_cthreads_flockfile)
EXTERN(_cthreads_funlockfile)
EXTERN(_cthreads_ftrylockfile)
/* To get the sigthread stack layout on fork */
EXTERN(pthread_getattr_np)
EXTERN(pthread_attr_getstack)
GROUP(-lpthread_syms)
GROUP(-lpthread2_pic)

21
htl/libpthread_syms.a Normal file
View File

@ -0,0 +1,21 @@
/* pthread initializer is weak in glibc. It must be included if glibc
is to start threading. */
EXTERN(_cthread_init_routine)
/* Weak references in glibc that must be filled if glibc is to be
thread safe. */
EXTERN(cthread_detach)
EXTERN(cthread_fork)
EXTERN(cthread_keycreate)
EXTERN(cthread_getspecific)
EXTERN(cthread_setspecific)
EXTERN(__mutex_lock_solid)
EXTERN(__mutex_unlock_solid)
/* For libio stream locking. */
EXTERN(_cthreads_flockfile)
EXTERN(_cthreads_funlockfile)
EXTERN(_cthreads_ftrylockfile)
/* To get the sigthread stack layout on fork */
EXTERN(pthread_getattr_np)
EXTERN(pthread_attr_getstack)
EXTERN(__pthread_enable_asynccancel)