Fix missing clock_* IFUNCs in librtkaio.

Conflicts:
	glibc.spec
This commit is contained in:
Carlos O'Donell 2015-02-12 01:36:24 -05:00 committed by Siddhesh Poyarekar
parent 8a3ff05495
commit f132ef66b5
2 changed files with 5 additions and 4 deletions

View File

@ -10,10 +10,10 @@
# We remove the clock* functions from librtkaio.so.1 and # We remove the clock* functions from librtkaio.so.1 and
# use those provided in libc.so.6, matching librt.so. # use those provided in libc.so.6, matching librt.so.
# #
diff -urN glibc-2.21-59-gd35273f.mod/rtkaio/clock-compat.c glibc-2.21-59-gd35273f/rtkaio/clock-compat.c --- glibc-2.21-63-gebf27d1.mod/rtkaio/clock-compat.c 1969-12-31 19:00:00.000000000 -0500
--- glibc-2.21-59-gd35273f.mod/rtkaio/clock-compat.c 1969-12-31 19:00:00.000000000 -0500 +++ glibc-2.21-63-gebf27d1/rtkaio/clock-compat.c 2015-02-12 01:28:59.615026597 -0500
+++ glibc-2.21-59-gd35273f/rtkaio/clock-compat.c 2015-02-11 22:52:29.912765683 -0500 @@ -0,0 +1,2 @@
@@ -0,0 +1 @@ +#define librt librtkaio
+#include <rt/clock-compat.c> +#include <rt/clock-compat.c>
diff -urN glibc-2.21-59-gd35273f.mod/rtkaio/kaio_clock_getcpuclockid.c glibc-2.21-59-gd35273f/rtkaio/kaio_clock_getcpuclockid.c diff -urN glibc-2.21-59-gd35273f.mod/rtkaio/kaio_clock_getcpuclockid.c glibc-2.21-59-gd35273f/rtkaio/kaio_clock_getcpuclockid.c
--- glibc-2.21-59-gd35273f.mod/rtkaio/kaio_clock_getcpuclockid.c 2015-02-11 13:00:55.105400863 -0500 --- glibc-2.21-59-gd35273f.mod/rtkaio/kaio_clock_getcpuclockid.c 2015-02-11 13:00:55.105400863 -0500

View File

@ -1762,6 +1762,7 @@ rm -f *.filelist*
- Unicode 7.0.0 update (#1191059). - Unicode 7.0.0 update (#1191059).
- Add back x86 vDSO support. - Add back x86 vDSO support.
- Fix rtkaio build to reference clock_* functions from libc. - Fix rtkaio build to reference clock_* functions from libc.
- Fix missing clock_* IFUNCs in librtkaio.
* Tue Feb 17 2015 Carlos O'Donell <carlos@redhat.com> - 2.21-3 * Tue Feb 17 2015 Carlos O'Donell <carlos@redhat.com> - 2.21-3
- Change patch file to avoid rpm bug 1193603 and rebuild with new NVR - Change patch file to avoid rpm bug 1193603 and rebuild with new NVR