@@ -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
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "uClibc-ng - small C library for embedded systems". The branch, master has been updated via 7136bb422a0681d787d07dc2936f08395b8a1007 (commit) via 9b1077dc70e52ee85a718bce3fcfec7ae9af2967 (commit) via 17ad14e5780533db90171e16b95dbeda4e81ffb0 (commit) from d4d4f37fda7fa57e57132ff2f0d735ce7cc2178e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7136bb422a0681d787d07dc2936f08395b8a1007 Author: Waldemar Brodkorb <wbx@uclibc-ng.org> Date: Sat Oct 8 18:03:27 2016 +0200 ppc: do not include copysgnl.c if UCLIBC_HAS_LONG_DOUBLE_MATH enabled Fixes compilation of uClibc-ng when UCLIBC_HAS_LONG_DOUBLE_MATH is used. commit 9b1077dc70e52ee85a718bce3fcfec7ae9af2967 Author: Waldemar Brodkorb <wbx@uclibc-ng.org> Date: Sat Oct 8 05:43:09 2016 +0200 cleanup libc.a The nested libpthread_nonshared.a and libdl.os shouldn't be included in the static libc.a. Fixes compile issues for static builds. commit 17ad14e5780533db90171e16b95dbeda4e81ffb0 Author: Waldemar Brodkorb <wbx@uclibc-ng.org> Date: Thu Oct 6 20:28:30 2016 +0200 test: fix tests including non-wrapper libgcc exception handling code The tests shouldn't include libgcc exception handling functions directly from libgcc.a when a non-shared gcc compiler is used while compiling the testcases. These fixes open testsuite regressions found for ppc and xtensa. ----------------------------------------------------------------------- Summary of changes: libc/Makefile.in | 1 - libc/sysdeps/linux/powerpc/Makefile.arch | 3 ++- libpthread/nptl/Makefile.in | 2 -- test/nptl/Makefile.in | 28 +++++++++++++++++++++++++--- 4 files changed, 27 insertions(+), 7 deletions(-) hooks/post-receive