@@ -44,7 +44,6 @@ endif
libc-a-y += $(libnsl-a-y)
libc-a-y += $(libresolv-a-y)
-libc-a-$(HAVE_SHARED) += $(libdl-a-y)
libc-a-y += $(libm-a-y)
libc-a-$(UCLIBC_HAS_LIBUTIL) += $(libutil-a-y)
libc-a-$(UCLIBC_HAS_CRYPT) += $(libcrypt-a-y)
@@ -5,7 +5,8 @@
# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
#
-CSRC-y := __syscall_error.c ioctl.c copysignl.c
+CSRC-y := __syscall_error.c ioctl.c
+CSRC-$(if $(UCLIBC_HAS_LONG_DOUBLE_MATH),,y) += copysignl.c
SSRC-y := \
__longjmp.S setjmp.S bsd-setjmp.S bsd-_setjmp.S brk.S \
@@ -41,8 +41,6 @@ else
libpthread-a-y := $(libpthread-static-y)
endif
-libpthread-a-y += $(top_builddir)lib/libpthread_nonshared.a
-
libc-shared-routines-y := $(filter-out $(notdir $(libpthread_libc_OBJS:.o=.c)), $(libc-shared-routines-y))
libc-static-routines-y := $(filter-out $(notdir $(libpthread_libc_OBJS:.o=.c)), $(libc-static-routines-y))
libc-shared-routines-y := $(addprefix $(libpthread_OUT)/,$(libc-shared-routines-y:.c=.oS))
@@ -103,9 +103,31 @@ CFLAGS_tst-tls5modf.so := -fPIC -DPIC -DSHARED -shared -DNOT_IN_libc
CFLAGS_tst-fini1mod.so := -fPIC -DPIC -DSHARED -shared -DNOT_IN_libc
LDFLAGS_tst-cond11 = -lrt
LDFLAGS_tst-cond19 = -lrt
-LDFLAGS_tst-cancel18 = -lrt
-LDFLAGS_tst-cancelx18 = -lrt
-LDFLAGS_tst-clock2 = -lrt
+
+LDFLAGS_tst-cancelx2 = -lc
+LDFLAGS_tst-cancelx3 = -lc
+LDFLAGS_tst-cancelx4 = -lc
+LDFLAGS_tst-cancelx6 = -lc
+LDFLAGS_tst-cancelx6 = -lc
+LDFLAGS_tst-cancelx7 = -lc
+LDFLAGS_tst-cancelx8 = -lc
+LDFLAGS_tst-cancelx9 = -lc
+LDFLAGS_tst-cancelx10 = -lc
+LDFLAGS_tst-cancelx11 = -lc
+LDFLAGS_tst-cancelx12 = -lc
+LDFLAGS_tst-cancelx13 = -lc
+LDFLAGS_tst-cancelx14 = -lc
+LDFLAGS_tst-cancelx15 = -lc
+LDFLAGS_tst-cancelx16 = -lc
+LDFLAGS_tst-cancelx18 = -lc
+LDFLAGS_tst-cancelx20 = -lc
+LDFLAGS_tst-cancelx21 = -lc
+LDFLAGS_tst-cleanupx0 = -lc
+LDFLAGS_tst-cleanupx1 = -lc
+LDFLAGS_tst-cleanupx2 = -lc
+LDFLAGS_tst-cleanupx3 = -lc
+LDFLAGS_tst-oncex3 = -lc
+LDFLAGS_tst-oncex4 = -lc
LDFLAGS_tst-rwlock14 = -lrt
LDFLAGS_tst-fini1 = -Wl,-rpath=./ tst-fini1mod.so
LDFLAGS_tst-fini1mod.so = -Wl,-soname=tst-fini1mod.so