Drop glibc-fedora-nptl-linklibc.patch

We do not reference any compatibility symbols from libpthread, so
this patch appears unnecessary.
This commit is contained in:
Florian Weimer 2018-03-01 08:27:57 +01:00
parent d92633e7a9
commit 0e84fd763d
2 changed files with 0 additions and 27 deletions

View File

@ -1,25 +0,0 @@
diff -Nrup a/nptl/Makefile b/nptl/Makefile
--- a/nptl/Makefile 2012-06-05 07:42:49.000000000 -0600
+++ b/nptl/Makefile 2012-06-07 12:15:21.816318678 -0600
@@ -529,15 +529,19 @@ $(addprefix $(objpfx), \
$(objpfx)libpthread.so \
$(objpfx)libpthread_nonshared.a
$(objpfx)tst-unload: $(libdl)
-# $(objpfx)../libc.so is used instead of $(common-objpfx)libc.so,
+# $(objpfx)linklibc.so is used instead of $(common-objpfx)libc.so,
# since otherwise libpthread.so comes before libc.so when linking.
$(addprefix $(objpfx), $(tests-reverse)): \
- $(objpfx)../libc.so $(objpfx)libpthread.so \
+ $(objpfx)linklibc.so $(objpfx)libpthread.so \
$(objpfx)libpthread_nonshared.a
$(objpfx)../libc.so: $(common-objpfx)libc.so ;
$(addprefix $(objpfx),$(tests-static) $(xtests-static)): $(objpfx)libpthread.a
$(objpfx)tst-atfork2.out: $(objpfx)tst-atfork2mod.so
+
+$(objpfx)linklibc.so: $(common-objpfx)libc.so
+ ln -s ../libc.so $@
+generated += libclink.so
else
$(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
endif

View File

@ -166,7 +166,6 @@ Patch2: glibc-fedora-nscd.patch
# round of reviewing. Ideally they'll either be submitted upstream or # round of reviewing. Ideally they'll either be submitted upstream or
# dropped. # dropped.
Patch0012: glibc-fedora-linux-tcsetattr.patch Patch0012: glibc-fedora-linux-tcsetattr.patch
Patch0014: glibc-fedora-nptl-linklibc.patch
Patch0015: glibc-fedora-localedef.patch Patch0015: glibc-fedora-localedef.patch
Patch0019: glibc-fedora-nis-rh188246.patch Patch0019: glibc-fedora-nis-rh188246.patch
Patch0020: glibc-fedora-manual-dircategory.patch Patch0020: glibc-fedora-manual-dircategory.patch
@ -728,7 +727,6 @@ microbenchmark tests on the system.
%patch2007 -p1 %patch2007 -p1
%patch0012 -p1 %patch0012 -p1
%patch2013 -p1 %patch2013 -p1
%patch0014 -p1
%patch0015 -p1 %patch0015 -p1
%patch0019 -p1 %patch0019 -p1
%patch0020 -p1 %patch0020 -p1