From 5a6de5075b71e32c824c847b4f342a4c9d088996bef78f37b57fe51fb0f473b6 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 29 Jan 2010 13:56:15 +0000 Subject: [PATCH] Accepting request 30532 from Base:System Copy from Base:System/glibc based on submit request 30532 from user pbaudis OBS-URL: https://build.opensuse.org/request/show/30532 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glibc?expand=0&rev=15 --- glibc-2.11-1bc1954c7357.tar.bz2 | 3 --- glibc-2.11.1-11c19d374bd4.tar.bz2 | 3 +++ glibc-ia64-memchr.diff | 39 ------------------------------- glibc.changes | 23 ++++++++++++++++++ glibc.spec | 17 +++++++------- 5 files changed, 35 insertions(+), 50 deletions(-) delete mode 100644 glibc-2.11-1bc1954c7357.tar.bz2 create mode 100644 glibc-2.11.1-11c19d374bd4.tar.bz2 delete mode 100644 glibc-ia64-memchr.diff diff --git a/glibc-2.11-1bc1954c7357.tar.bz2 b/glibc-2.11-1bc1954c7357.tar.bz2 deleted file mode 100644 index 81d08cb..0000000 --- a/glibc-2.11-1bc1954c7357.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d0ab54f44140cae0caac44045051efa49d7fe663257dd95a47231d1bfec789fd -size 15683806 diff --git a/glibc-2.11.1-11c19d374bd4.tar.bz2 b/glibc-2.11.1-11c19d374bd4.tar.bz2 new file mode 100644 index 0000000..ae9b0ca --- /dev/null +++ b/glibc-2.11.1-11c19d374bd4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e03c84ffe3b41a81a070a896307fa59b4618f2cc053360a65c867a79a32a718c +size 15670997 diff --git a/glibc-ia64-memchr.diff b/glibc-ia64-memchr.diff deleted file mode 100644 index c137892..0000000 --- a/glibc-ia64-memchr.diff +++ /dev/null @@ -1,39 +0,0 @@ -On Mon, Nov 09, 2009 at 11:57:06AM -0800, H.J. Lu wrote: -> When data is shorter than software pipeline, recovery may fail. This -> patch avoids it by using a simple loop on data shorter than software -> pipeline. -> - -Here is an updated patch. This one properly handles the shorter read -on speculative load. - - -H.J. ---- -2009-11-09 H.J. Lu - - PR libc/10162 - * sysdeps/ia64/memchr.S: Properly recover from shorter read. - -diff --git a/sysdeps/ia64/memchr.S b/sysdeps/ia64/memchr.S -index cd062b2..cdd71ca 100644 ---- a/sysdeps/ia64/memchr.S -+++ b/sysdeps/ia64/memchr.S -@@ -126,7 +126,16 @@ ENTRY(__memchr) - br.ret.sptk.many b0 - - .recovery: -- adds ret0 = -((MEMLAT + 1) * 8), ret0;; -+#if MEMLAT != 6 -+# error "MEMLAT must be 6!" -+#endif -+(p[MEMLAT-6]) add ret0 = -8, ret0;; -+(p[MEMLAT-5]) add ret0 = -8, ret0;; -+(p[MEMLAT-4]) add ret0 = -8, ret0;; -+(p[MEMLAT-3]) add ret0 = -8, ret0;; -+(p[MEMLAT-2]) add ret0 = -8, ret0;; -+(p[MEMLAT-1]) add ret0 = -8, ret0;; -+(p[MEMLAT]) add ret0 = -8, ret0;; - (p[MEMLAT+1]) add ret0 = -8, ret0;; - (p[MEMLAT+2]) add ret0 = -8, ret0;; - .l4: diff --git a/glibc.changes b/glibc.changes index eb3a7c7..6b9a5c9 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Mon Jan 25 17:35:25 CET 2010 - meissner@suse.de + +- ignore power6, power7 and cell specific Power CPU optimizations + on openSUSE. + +------------------------------------------------------------------- +Tue Jan 19 02:42:40 CET 2010 - pbaudis@suse.cz + +- Disable AMD-optimized strncmp() on x86_64 that is getting miscompiled + by the assembler [bnc#540647] + +------------------------------------------------------------------- +Mon Jan 18 18:22:32 CET 2010 - pbaudis@suse.cz + +- Upgrade to latest release/2.11/master - glibc-2.11.1-11c19d374bd4 + - Just trivial changes - version bump to 2.11.1, NIS-related + resolver fixes, ELF lookup race, .h typo fix and regcomp + out-of-memory handling miss + - Few more bugfixes, weekday updated in three locales +- Retired patches: + glibc-ia64-memchr.diff + ------------------------------------------------------------------- Mon Dec 14 23:49:33 CET 2009 - jengelh@medozas.de diff --git a/glibc.spec b/glibc.spec index 7e7ae16..40ac766 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,5 +1,5 @@ # -# spec file for package glibc (Version 2.11) +# spec file for package glibc (Version 2.11.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -30,9 +30,10 @@ BuildRequires: libselinux-devel %define optimize_power 1 %define powerpc_optimize_base power4 %define powerpc_optimize_tune power5 - %define powerpc_optimize_cpu_power6 1 - %define powerpc_optimize_cpu_power7 1 - %define powerpc_optimize_cpu_cell 1 + # We are not building Power CPU specific optimizations for openSUSE. + %define powerpc_optimize_cpu_power6 0 + %define powerpc_optimize_cpu_power7 0 + %define powerpc_optimize_cpu_cell 0 %else %define optimize_power 0 %define powerpc_optimize_base 0 @@ -54,12 +55,12 @@ Obsoletes: glibc-32bit %endif Provides: rtld(GNU_HASH) AutoReqProv: on -Version: 2.11 +Version: 2.11.1 Release: 1 Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: glibc-%{version}-1bc1954c7357.tar.bz2 +Source: glibc-%{version}-11c19d374bd4.tar.bz2 Source2: glibc-ports-2.10.1-2b2b217196.tar.bz2 Source3: noversion.tar.bz2 Source4: manpages.tar.bz2 @@ -123,7 +124,6 @@ Patch45: glibc-nis-splitgroups.diff Patch46: glibc-2.10.99-ia64-include.diff Patch47: libm-x86-64-exceptions.diff Patch48: glibc-uio-cell.diff -Patch49: glibc-ia64-memchr.diff Patch50: glibc-nameserver-localhost.diff Patch500: ARM_glibc-2.10.1-local-eabi-wchar.diff Patch501: ARM_glibc-2.10.1-local-hwcap-updates.diff @@ -297,6 +297,8 @@ versions of your software. %patch11 %patch12 %patch13 +# strncmp.S triggers amd64 assembler bug [bnc#540647] +rm sysdeps/x86_64/strncmp.S %patch14 -E # We have s_sincos.c in patch13, remove duplicate rm sysdeps/x86_64/fpu/s_sincos.S @@ -331,7 +333,6 @@ rm sysdeps/x86_64/fpu/s_sincos.S %patch46 %patch47 %patch48 -p1 -%patch49 -p1 %patch50 -p1 %ifarch %arm armv5tel armv7l %patch500