SHA256
3
0
forked from pool/glibc

Accepting request 211751 from home:Andreas_Schwab:Factory

- Update to glibc 2.18.90 83f5c32d21f7:
  * Support for STT_GNU_IFUNC symbols added for ppc64
  * A new feature test macro _DEFAULT_SOURCE is available
  * The _BSD_SOURCE feature test macro no longer enables BSD interfaces
    that conflict with POSIX.  The libbsd-compat library (which was a
    dummy library that did nothing) has also been removed.
  * Added support for version-3 tz format files
- i686-no-sse42-strstr.patch: Removed

OBS-URL: https://build.opensuse.org/request/show/211751
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=324
This commit is contained in:
Andreas Schwab 2013-12-19 16:40:33 +00:00 committed by Git OBS Bridge
parent 3e8ca4009d
commit 4d5135901e
9 changed files with 42 additions and 138 deletions

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:efbd2068042f6ec83e9a0d9f30df5605e949f131c5c9b32482cc2b16690d4a2a
size 12301308

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e45ffc72da188e9914fe0bd1b8d4bab51c5ecd14b6d579218ba68bfc994f2f68
size 12033044

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Dec 19 13:45:17 UTC 2013 - schwab@suse.de
- Update to glibc 2.18.90 83f5c32d21f7:
* Support for STT_GNU_IFUNC symbols added for ppc64
* A new feature test macro _DEFAULT_SOURCE is available
* The _BSD_SOURCE feature test macro no longer enables BSD interfaces
that conflict with POSIX. The libbsd-compat library (which was a
dummy library that did nothing) has also been removed.
* Added support for version-3 tz format files
- i686-no-sse42-strstr.patch: Removed
-------------------------------------------------------------------
Tue Dec 10 15:03:59 UTC 2013 - schwab@suse.de

View File

@ -109,7 +109,7 @@ BuildRequires: gd-devel
Version: 2.18.90
Release: 0
%define glibc_major_version 2.18.90
%define git_id aeb95445d128
%define git_id 83f5c32d21f7
Url: http://www.gnu.org/software/libc/libc.html
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: glibc-%{version}-%{git_id}.tar.xz
@ -211,8 +211,6 @@ Patch15: glibc-2.3.90-langpackdir.diff
Patch18: glibc-cpusetsize.diff
# PATCH-FEATURE-SLE Use nscd user for nscd
Patch19: nscd-server-user.patch
# PATCH-FIX-OPENSUSE Remove SSE4.2 implementation of strstr for x86-32 (bnc#843464)
Patch20: i686-no-sse42-strstr.patch
### Locale related patches
# PATCH-FIX-OPENSUSE Add additional locales
@ -437,7 +435,6 @@ rm nscd/s-stamp
%patch15 -p1
%patch18 -p1
%patch19 -p1
%patch20 -p1
%patch100 -p1
%patch102 -p1
@ -1178,7 +1175,6 @@ exit 0
%{_libdir}/*.o
%{_libdir}/*.so
# These static libraries are needed even for shared builds
%{_libdir}/libbsd-compat.a
%{_libdir}/libc_nonshared.a
%{_libdir}/libg.a
%{_libdir}/libieee.a

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Dec 19 13:45:17 UTC 2013 - schwab@suse.de
- Update to glibc 2.18.90 83f5c32d21f7:
* Support for STT_GNU_IFUNC symbols added for ppc64
* A new feature test macro _DEFAULT_SOURCE is available
* The _BSD_SOURCE feature test macro no longer enables BSD interfaces
that conflict with POSIX. The libbsd-compat library (which was a
dummy library that did nothing) has also been removed.
* Added support for version-3 tz format files
- i686-no-sse42-strstr.patch: Removed
-------------------------------------------------------------------
Tue Dec 10 15:03:59 UTC 2013 - schwab@suse.de

View File

@ -108,7 +108,7 @@ BuildRequires: gd-devel
Version: 2.18.90
Release: 0
%define glibc_major_version 2.18.90
%define git_id aeb95445d128
%define git_id 83f5c32d21f7
Url: http://www.gnu.org/software/libc/libc.html
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: glibc-%{version}-%{git_id}.tar.xz
@ -210,8 +210,6 @@ Patch15: glibc-2.3.90-langpackdir.diff
Patch18: glibc-cpusetsize.diff
# PATCH-FEATURE-SLE Use nscd user for nscd
Patch19: nscd-server-user.patch
# PATCH-FIX-OPENSUSE Remove SSE4.2 implementation of strstr for x86-32 (bnc#843464)
Patch20: i686-no-sse42-strstr.patch
### Locale related patches
# PATCH-FIX-OPENSUSE Add additional locales
@ -437,7 +435,6 @@ rm nscd/s-stamp
%patch15 -p1
%patch18 -p1
%patch19 -p1
%patch20 -p1
%patch100 -p1
%patch102 -p1
@ -1178,7 +1175,6 @@ exit 0
%{_libdir}/*.o
%{_libdir}/*.so
# These static libraries are needed even for shared builds
%{_libdir}/libbsd-compat.a
%{_libdir}/libc_nonshared.a
%{_libdir}/libg.a
%{_libdir}/libieee.a

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Dec 19 13:45:17 UTC 2013 - schwab@suse.de
- Update to glibc 2.18.90 83f5c32d21f7:
* Support for STT_GNU_IFUNC symbols added for ppc64
* A new feature test macro _DEFAULT_SOURCE is available
* The _BSD_SOURCE feature test macro no longer enables BSD interfaces
that conflict with POSIX. The libbsd-compat library (which was a
dummy library that did nothing) has also been removed.
* Added support for version-3 tz format files
- i686-no-sse42-strstr.patch: Removed
-------------------------------------------------------------------
Tue Dec 10 15:03:59 UTC 2013 - schwab@suse.de

View File

@ -109,7 +109,7 @@ BuildRequires: gd-devel
Version: 2.18.90
Release: 0
%define glibc_major_version 2.18.90
%define git_id aeb95445d128
%define git_id 83f5c32d21f7
Url: http://www.gnu.org/software/libc/libc.html
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: glibc-%{version}-%{git_id}.tar.xz
@ -211,8 +211,6 @@ Patch15: glibc-2.3.90-langpackdir.diff
Patch18: glibc-cpusetsize.diff
# PATCH-FEATURE-SLE Use nscd user for nscd
Patch19: nscd-server-user.patch
# PATCH-FIX-OPENSUSE Remove SSE4.2 implementation of strstr for x86-32 (bnc#843464)
Patch20: i686-no-sse42-strstr.patch
### Locale related patches
# PATCH-FIX-OPENSUSE Add additional locales
@ -437,7 +435,6 @@ rm nscd/s-stamp
%patch15 -p1
%patch18 -p1
%patch19 -p1
%patch20 -p1
%patch100 -p1
%patch102 -p1
@ -1178,7 +1175,6 @@ exit 0
%{_libdir}/*.o
%{_libdir}/*.so
# These static libraries are needed even for shared builds
%{_libdir}/libbsd-compat.a
%{_libdir}/libc_nonshared.a
%{_libdir}/libg.a
%{_libdir}/libieee.a

View File

@ -1,120 +0,0 @@
Index: glibc-2.18/sysdeps/i386/i686/multiarch/Makefile
===================================================================
--- glibc-2.18.orig/sysdeps/i386/i686/multiarch/Makefile
+++ glibc-2.18/sysdeps/i386/i686/multiarch/Makefile
@@ -11,7 +11,7 @@ sysdep_routines += bzero-sse2 memset-sse
memmove-ssse3-rep bcopy-ssse3 bcopy-ssse3-rep \
memset-sse2-rep bzero-sse2-rep strcmp-ssse3 \
strcmp-sse4 strncmp-c strncmp-ssse3 strncmp-sse4 \
- memcmp-ssse3 memcmp-sse4 strcasestr-nonascii varshift \
+ memcmp-ssse3 memcmp-sse4 varshift \
strlen-sse2 strlen-sse2-bsf strncpy-c strcpy-ssse3 \
strncpy-ssse3 stpcpy-ssse3 stpncpy-ssse3 strcpy-sse2 \
strncpy-sse2 stpcpy-sse2 stpncpy-sse2 strcat-ssse3 \
@@ -25,14 +25,11 @@ sysdep_routines += bzero-sse2 memset-sse
strncase_l-c strncase-c strncase_l-ssse3 \
strcasecmp_l-sse4 strncase_l-sse4
ifeq (yes,$(config-cflags-sse4))
-sysdep_routines += strcspn-c strpbrk-c strspn-c strstr-c strcasestr-c
+sysdep_routines += strcspn-c strpbrk-c strspn-c
CFLAGS-varshift.c += -msse4
CFLAGS-strcspn-c.c += -msse4
CFLAGS-strpbrk-c.c += -msse4
CFLAGS-strspn-c.c += -msse4
-CFLAGS-strstr.c += -msse4
-CFLAGS-strcasestr.c += -msse4
-CFLAGS-strcasestr-nonascii.c += -msse4
endif
endif
Index: glibc-2.18/sysdeps/i386/i686/multiarch/ifunc-impl-list.c
===================================================================
--- glibc-2.18.orig/sysdeps/i386/i686/multiarch/ifunc-impl-list.c
+++ glibc-2.18/sysdeps/i386/i686/multiarch/ifunc-impl-list.c
@@ -141,12 +141,6 @@ __libc_ifunc_impl_list (const char *name
IFUNC_IMPL_ADD (array, i, strcasecmp_l, 1,
__strcasecmp_l_ia32))
- /* Support sysdeps/i386/i686/multiarch/strcasestr.c. */
- IFUNC_IMPL (i, name, strcasestr,
- IFUNC_IMPL_ADD (array, i, strcasestr, HAS_SSE4_2,
- __strcasestr_sse42)
- IFUNC_IMPL_ADD (array, i, strcasestr, 1, __strcasestr_ia32))
-
/* Support sysdeps/i386/i686/multiarch/strcat.S. */
IFUNC_IMPL (i, name, strcat,
IFUNC_IMPL_ADD (array, i, strcat, HAS_SSSE3, __strcat_ssse3)
@@ -234,11 +228,6 @@ __libc_ifunc_impl_list (const char *name
IFUNC_IMPL_ADD (array, i, strspn, HAS_SSE4_2, __strspn_sse42)
IFUNC_IMPL_ADD (array, i, strspn, 1, __strspn_ia32))
- /* Support sysdeps/i386/i686/multiarch/strstr-c.c. */
- IFUNC_IMPL (i, name, strstr,
- IFUNC_IMPL_ADD (array, i, strstr, HAS_SSE4_2, __strstr_sse42)
- IFUNC_IMPL_ADD (array, i, strstr, 1, __strstr_ia32))
-
/* Support sysdeps/i386/i686/multiarch/wcschr.S. */
IFUNC_IMPL (i, name, wcschr,
IFUNC_IMPL_ADD (array, i, wcschr, HAS_SSE2, __wcschr_sse2)
Index: glibc-2.18/sysdeps/i386/i686/multiarch/strcasestr-c.c
===================================================================
--- glibc-2.18.orig/sysdeps/i386/i686/multiarch/strcasestr-c.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Multiple versions of strcasestr
- All versions must be listed in ifunc-impl-list.c. */
-#define __strcasestr_sse2 __strcasestr_ia32
-#include <sysdeps/x86_64/multiarch/strcasestr-c.c>
Index: glibc-2.18/sysdeps/i386/i686/multiarch/strcasestr-nonascii.c
===================================================================
--- glibc-2.18.orig/sysdeps/i386/i686/multiarch/strcasestr-nonascii.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <nmmintrin.h>
-#include <sysdeps/x86_64/multiarch/strcasestr-nonascii.c>
Index: glibc-2.18/sysdeps/i386/i686/multiarch/strcasestr.c
===================================================================
--- glibc-2.18.orig/sysdeps/i386/i686/multiarch/strcasestr.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/x86_64/multiarch/strcasestr.c>
Index: glibc-2.18/sysdeps/i386/i686/multiarch/strstr-c.c
===================================================================
--- glibc-2.18.orig/sysdeps/i386/i686/multiarch/strstr-c.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Multiple versions of strstr
- All versions must be listed in ifunc-impl-list.c. */
-
-#include "init-arch.h"
-
-#define STRSTR __strstr_ia32
-#if defined SHARED && !defined NO_HIDDEN
-#undef libc_hidden_builtin_def
-#define libc_hidden_builtin_def(name) \
- __hidden_ver1 (__strstr_ia32, __GI_strstr, __strstr_ia32);
-#endif
-
-/* Redefine strstr so that the compiler won't complain about the type
- mismatch with the IFUNC selector in strong_alias, below. */
-#undef strstr
-#define strstr __redirect_strstr
-
-#include "string/strstr.c"
-
-extern __typeof (__redirect_strstr) __strstr_sse42 attribute_hidden;
-extern __typeof (__redirect_strstr) __strstr_ia32 attribute_hidden;
-
-/* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle
- ifunc symbol properly. */
-extern __typeof (__redirect_strstr) __libc_strstr;
-libc_ifunc (__libc_strstr, HAS_SSE4_2 ? __strstr_sse42 : __strstr_ia32)
-
-#undef strstr
-strong_alias (__libc_strstr, strstr)
Index: glibc-2.18/sysdeps/i386/i686/multiarch/strstr.c
===================================================================
--- glibc-2.18.orig/sysdeps/i386/i686/multiarch/strstr.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/x86_64/multiarch/strstr.c>