diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-06-28 09:51:01 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-06-28 09:51:01 +0200 |
| commit | 30639e79d3370243ee5ef3a029204a4c71e15856 (patch) | |
| tree | 4e3f8d5501fbcb5ab1155a3a6cd7f8161863055c /sysdeps/pthread | |
| parent | 477910b83e5ef3b3aa78b11808433846989461c8 (diff) | |
| download | glibc-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 'sysdeps/pthread')
| -rw-r--r-- | sysdeps/pthread/Makefile | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile index fedb785d38..9b862b93c4 100644 --- a/sysdeps/pthread/Makefile +++ b/sysdeps/pthread/Makefile @@ -17,13 +17,7 @@ # <https://www.gnu.org/licenses/>. ifeq ($(subdir),rt) - -ifeq (yes,$(build-shared)) -$(objpfx)tst-timer: $(objpfx)librt.so $(shared-thread-library) -else -$(objpfx)tst-timer: $(objpfx)librt.a $(static-thread-library) -endif - +$(objpfx)tst-timer: $(librt) endif ifneq (,$(filter $(subdir),htl nptl)) @@ -232,12 +226,10 @@ $(objpfx)tst-cleanup0.out: /dev/null $(objpfx)tst-cleanup0 $(objpfx)tst-cleanup0-cmp.out: $(..)sysdeps/pthread/tst-cleanup0.expect $(objpfx)tst-cleanup0.out cmp $^ > $@; \ $(evaluate-test) - -$(objpfx)tst-cancel28: $(common-objpfx)rt/librt.so -else -$(objpfx)tst-cancel28: $(common-objpfx)rt/librt.a endif +$(objpfx)tst-cancel28: $(librt) + $(objpfx)tst-fini1: $(shared-thread-library) $(objpfx)tst-fini1mod.so $(objpfx)tst-fini1mod.so: $(shared-thread-library) |