- Temporarily add patch2 to fix #745739.
Patch is upstream so can be removed at next update from master.
This commit is contained in:
parent
13d2c2fdc2
commit
cf6224207f
27
0001-Check-for-zero-size-in-memrchr-for-x86_64.patch
Normal file
27
0001-Check-for-zero-size-in-memrchr-for-x86_64.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
From 81dcc7fb74a766f970800b9975e85b5fe7f6ea38 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Andreas Schwab <schwab@redhat.com>
|
||||||
|
Date: Thu, 13 Oct 2011 13:33:58 +0200
|
||||||
|
Subject: [PATCH] Check for zero size in memrchr for x86_64
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 2 ++
|
||||||
|
sysdeps/x86_64/memrchr.S | 3 +++
|
||||||
|
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/sysdeps/x86_64/memrchr.S b/sysdeps/x86_64/memrchr.S
|
||||||
|
index 81b7a1c..70adca3 100644
|
||||||
|
--- a/sysdeps/x86_64/memrchr.S
|
||||||
|
+++ b/sysdeps/x86_64/memrchr.S
|
||||||
|
@@ -282,6 +282,9 @@ L(return_null):
|
||||||
|
|
||||||
|
.p2align 4
|
||||||
|
L(length_less16_offset0):
|
||||||
|
+ test %edx, %edx
|
||||||
|
+ jz L(return_null)
|
||||||
|
+
|
||||||
|
mov %dl, %cl
|
||||||
|
pcmpeqb (%rdi), %xmm1
|
||||||
|
|
||||||
|
--
|
||||||
|
1.7.6
|
||||||
|
|
@ -28,7 +28,7 @@
|
|||||||
Summary: The GNU libc libraries
|
Summary: The GNU libc libraries
|
||||||
Name: glibc
|
Name: glibc
|
||||||
Version: %{glibcversion}
|
Version: %{glibcversion}
|
||||||
Release: 11
|
Release: 12
|
||||||
# GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
|
# GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
|
||||||
# Things that are linked directly into dynamically linked programs
|
# Things that are linked directly into dynamically linked programs
|
||||||
# and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
|
# and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
|
||||||
@ -42,6 +42,7 @@ Source1: %{?glibc_release_url}%{glibcportsdir}.tar.xz
|
|||||||
Source2: %{glibcsrcdir}-fedora.tar.xz
|
Source2: %{glibcsrcdir}-fedora.tar.xz
|
||||||
Patch0: %{name}-fedora.patch
|
Patch0: %{name}-fedora.patch
|
||||||
Patch1: %{name}-ia64-lib64.patch
|
Patch1: %{name}-ia64-lib64.patch
|
||||||
|
Patch2: 0001-Check-for-zero-size-in-memrchr-for-x86_64.patch
|
||||||
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
Obsoletes: glibc-profile < 2.4
|
Obsoletes: glibc-profile < 2.4
|
||||||
Obsoletes: nss_db
|
Obsoletes: nss_db
|
||||||
@ -260,6 +261,7 @@ rm -rf %{glibcportsdir}
|
|||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
%patch2 -p1
|
||||||
|
|
||||||
# A lot of programs still misuse memcpy when they have to use
|
# A lot of programs still misuse memcpy when they have to use
|
||||||
# memmove. The memcpy implementation below is not tolerant at
|
# memmove. The memcpy implementation below is not tolerant at
|
||||||
@ -1112,6 +1114,10 @@ rm -f *.filelist*
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Oct 14 2011 Richard W.M. Jones <rjones@redhat.com> - 2.14.90-12
|
||||||
|
- Temporarily add patch2 to fix #745739.
|
||||||
|
Patch is upstream so can be removed at next update from master.
|
||||||
|
|
||||||
* Tue Oct 11 2011 Andreas Schwab <schwab@redhat.com> - 2.14.90-11
|
* Tue Oct 11 2011 Andreas Schwab <schwab@redhat.com> - 2.14.90-11
|
||||||
- Update from master
|
- Update from master
|
||||||
- Clean up locarchive mmap reservation code
|
- Clean up locarchive mmap reservation code
|
||||||
|
Loading…
Reference in New Issue
Block a user