Sync with upstream master
This commit is contained in:
parent
9eb38c10e7
commit
191c4db426
|
@ -1,48 +0,0 @@
|
|||
commit 1fe3da33623aaf78b7cac5858f4a7a64aeeba303
|
||||
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
|
||||
Date: Tue Jun 24 13:19:06 2014 +0530
|
||||
|
||||
Add compat symbols for scalb* in i386
|
||||
|
||||
Bring back symbols into libc.so for scalb* functions. They are no
|
||||
longer used but unfortunately they're now part of the ABI.
|
||||
|
||||
diff --git a/sysdeps/i386/fpu/s_scalbn.S b/sysdeps/i386/fpu/s_scalbn.S
|
||||
index 548f19f..21cb98b 100644
|
||||
--- a/sysdeps/i386/fpu/s_scalbn.S
|
||||
+++ b/sysdeps/i386/fpu/s_scalbn.S
|
||||
@@ -16,3 +16,8 @@ ENTRY(__scalbn)
|
||||
END (__scalbn)
|
||||
weak_alias (__scalbn, scalbn)
|
||||
strong_alias (__scalbn, __scalbln)
|
||||
+
|
||||
+#include <shlib-compat.h>
|
||||
+#if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_20)
|
||||
+compat_symbol (libc, __scalbn, scalbln, GLIBC_2_1);
|
||||
+#endif
|
||||
diff --git a/sysdeps/i386/fpu/s_scalbnf.S b/sysdeps/i386/fpu/s_scalbnf.S
|
||||
index fe6516e..fe504c0 100644
|
||||
--- a/sysdeps/i386/fpu/s_scalbnf.S
|
||||
+++ b/sysdeps/i386/fpu/s_scalbnf.S
|
||||
@@ -16,3 +16,8 @@ ENTRY(__scalbnf)
|
||||
END (__scalbnf)
|
||||
weak_alias (__scalbnf, scalbnf)
|
||||
strong_alias (__scalbnf, __scalblnf)
|
||||
+
|
||||
+#include <shlib-compat.h>
|
||||
+#if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_20)
|
||||
+compat_symbol (libc, __scalbnf, scalblnf, GLIBC_2_1);
|
||||
+#endif
|
||||
diff --git a/sysdeps/i386/fpu/s_scalbnl.S b/sysdeps/i386/fpu/s_scalbnl.S
|
||||
index 8f65de4..f1ca7ad 100644
|
||||
--- a/sysdeps/i386/fpu/s_scalbnl.S
|
||||
+++ b/sysdeps/i386/fpu/s_scalbnl.S
|
||||
@@ -17,3 +17,8 @@ ENTRY(__scalbnl)
|
||||
END (__scalbnl)
|
||||
weak_alias (__scalbnl, scalbnl)
|
||||
strong_alias (__scalbnl, __scalblnl)
|
||||
+
|
||||
+#include <shlib-compat.h>
|
||||
+#if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_20)
|
||||
+compat_symbol (libc, __scalbnl, scalblnl, GLIBC_2_1);
|
||||
+#endif
|
|
@ -1,6 +1,6 @@
|
|||
%define glibcsrcdir glibc-2.19-654-g4841e6a
|
||||
%define glibcsrcdir glibc-2.19-743-g256aa66
|
||||
%define glibcversion 2.19.90
|
||||
%define glibcrelease 23%{?dist}
|
||||
%define glibcrelease 24%{?dist}
|
||||
# Pre-release tarballs are pulled in from git using a command that is
|
||||
# effectively:
|
||||
#
|
||||
|
@ -221,7 +221,6 @@ Patch2031: %{name}-rh1070416.patch
|
|||
|
||||
Patch2033: %{name}-aarch64-tls-fixes.patch
|
||||
Patch2034: %{name}-aarch64-workaround-nzcv-clobber-in-tlsdesc.patch
|
||||
Patch2035: %{name}-scalbn-i386-abi.patch
|
||||
|
||||
##############################################################################
|
||||
# End of glibc patches.
|
||||
|
@ -553,7 +552,6 @@ package or when debugging this package.
|
|||
%patch0047 -p1
|
||||
%patch2033 -p1
|
||||
%patch2034 -p1
|
||||
%patch2035 -p1
|
||||
|
||||
##############################################################################
|
||||
# %%prep - Additional prep required...
|
||||
|
@ -1643,6 +1641,9 @@ rm -f *.filelist*
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Jul 02 2014 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.19.90-24
|
||||
- Sync with upstream master.
|
||||
|
||||
* Tue Jun 24 2014 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.19.90-23
|
||||
- Sync with upstream master.
|
||||
- Add fix to unbreak i386 ABI breakage due to a change in scalbn.
|
||||
|
|
Loading…
Reference in New Issue