- Try again to fix AVX testing (#801650)

This commit is contained in:
Jeff Law 2012-05-10 20:57:08 -06:00
parent 111ecf779a
commit 6403acaa71
2 changed files with 20 additions and 1 deletions

12
glibc-rh801650-3.patch Normal file
View File

@ -0,0 +1,12 @@
diff -rup c/sysdeps/x86_64/multiarch/init-arch.c d/sysdeps/x86_64/multiarch/init-arch.c
--- c/sysdeps/x86_64/multiarch/init-arch.c 2012-05-10 14:06:54.607713791 -0600
+++ d/sysdeps/x86_64/multiarch/init-arch.c 2012-05-10 14:15:37.855008615 -0600
@@ -154,6 +154,8 @@ __init_cpu_features (void)
: "=a" (xcrlow), "=d" (xcrhigh) : "c" (0));
(xcrlow & 6) == 6; }))
__cpu_features.feature[index_YMM_Usable] |= bit_YMM_Usable;
+ else
+ __cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx &= ~bit_AVX;
}
__cpu_features.family = family;

View File

@ -28,7 +28,7 @@
Summary: The GNU libc libraries Summary: The GNU libc libraries
Name: glibc Name: glibc
Version: %{glibcversion} Version: %{glibcversion}
Release: 36%{?dist} Release: 37%{?dist}
# 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
@ -190,6 +190,9 @@ Patch2051: %{name}-rh788989-2.patch
Patch2054: %{name}-arm-hardfloat-1.patch Patch2054: %{name}-arm-hardfloat-1.patch
Patch2055: %{name}-arm-hardfloat-2.patch Patch2055: %{name}-arm-hardfloat-2.patch
# Upstream BZ 13753, probably will be fixed differently
Patch2056: %{name}-rh801650-3.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
@ -463,6 +466,7 @@ pushd ../%{glibcportsdir}
%patch2055 -p1 %patch2055 -p1
popd popd
%patch2056 -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
@ -1315,6 +1319,9 @@ rm -f *.filelist*
%endif %endif
%changelog %changelog
* Thu May 10 2012 Jeff Law <law@redhat.com> - 2.15-37
- Try again to fix AVX testing (#801650)
* Mon May 7 2012 Jeff Law <law@redhat.com> - 2.15-36 * Mon May 7 2012 Jeff Law <law@redhat.com> - 2.15-36
- Improve fortification disabled warning. - Improve fortification disabled warning.
- Change location of dynamic linker for armhf. - Change location of dynamic linker for armhf.