about summary refs log tree commit diff
path: root/nptl
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-06-28 09:51:01 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-06-28 09:51:01 +0200
commit30639e79d3370243ee5ef3a029204a4c71e15856 (patch)
tree4e3f8d5501fbcb5ab1155a3a6cd7f8161863055c /nptl
parent477910b83e5ef3b3aa78b11808433846989461c8 (diff)
downloadglibc-30639e79d3370243ee5ef3a029204a4c71e15856.tar.gz
glibc-30639e79d3370243ee5ef3a029204a4c71e15856.tar.xz
glibc-30639e79d3370243ee5ef3a029204a4c71e15856.zip
Linux: Cleanups after librt move
librt.so is no longer installed for PTHREAD_IN_LIBC, and tests
are not linked against it.  $(librt) is introduced globally for
shared tests that need to be linked for both PTHREAD_IN_LIBC
and !PTHREAD_IN_LIBC.

GLIBC_PRIVATE symbols that were needed during the transition are
removed again.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'nptl')
-rw-r--r--nptl/Makefile9
1 files changed, 0 insertions, 9 deletions
diff --git a/nptl/Makefile b/nptl/Makefile
index c64e4af2f6..9b94bfcd31 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -535,15 +535,6 @@ $(objpfx)tst-tls6.out: tst-tls6.sh $(objpfx)tst-tls5 \
 	$(evaluate-test)
 endif
 
-ifeq (yes,$(build-shared))
-librt = $(common-objpfx)rt/librt.so
-else
-librt = $(common-objpfx)rt/librt.a
-endif
-
-$(objpfx)tst-cancel17: $(librt)
-$(objpfx)tst-cancelx17: $(librt)
-
 LDLIBS-tst-cancel24 = -Wl,--no-as-needed -lstdc++
 LDLIBS-tst-cancel24-static = $(LDLIBS-tst-cancel24)