Hello community,
here is the log from the commit of package glibc for openSUSE:13.1 checked in
at 2013-10-22 10:17:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1/glibc (Old)
and /work/SRC/openSUSE:13.1/.glibc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glibc"
Changes:
--------
--- /work/SRC/openSUSE:13.1/glibc/glibc-testsuite.changes 2013-09-26
19:33:55.000000000 +0200
+++ /work/SRC/openSUSE:13.1/.glibc.new/glibc-testsuite.changes 2013-10-22
10:17:24.000000000 +0200
@@ -1,0 +2,16 @@
+Mon Oct 21 12:14:38 UTC 2013 - sch...@suse.de
+
+- Remove SSE4.2 implementation of strstr for x86-32 (bnc#843464)
+
+-------------------------------------------------------------------
+Mon Oct 14 09:32:44 UTC 2013 - sch...@suse.de
+
+- Depend on gcc defaults for base powerpc optimisations (bnc#844824)
+
+-------------------------------------------------------------------
+Fri Oct 11 08:37:38 UTC 2013 - sch...@suse.de
+
+- Enable ports addon for m68k and adapt file list
+- m68k-Scrt1.patch: Use PIC for Scrt1.o
+
+-------------------------------------------------------------------
glibc-utils.changes: same change
glibc.changes: same change
New:
----
i686-no-sse42-strstr.patch
m68k-Scrt1.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ glibc-testsuite.spec ++++++
--- /var/tmp/diff_new_pack.PvWxzt/_old 2013-10-22 10:17:25.000000000 +0200
+++ /var/tmp/diff_new_pack.PvWxzt/_new 2013-10-22 10:17:25.000000000 +0200
@@ -78,11 +78,11 @@
%ifarch ppc ppc64
%define optimize_power 1
%ifarch ppc
- %define powerpc_optimize_base power3
+ %define powerpc_optimize_base %{nil}
%define powerpc_optimize_tune power3
%define powerpc_optimize_cpu_power4 %{normal_build}
%else
- %define powerpc_optimize_base power4
+ %define powerpc_optimize_base %{nil}
%define powerpc_optimize_tune power5
%define powerpc_optimize_cpu_power4 0
%endif
@@ -92,7 +92,7 @@
%define powerpc_optimize_cpu_cell 0
%else
%define optimize_power 0
- %define powerpc_optimize_base 0
+ %define powerpc_optimize_base %{nil}
%define powerpc_optimize_cpu_power4 0
%define powerpc_optimize_cpu_power6 0
%define powerpc_optimize_cpu_power7 0
@@ -211,6 +211,8 @@
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
@@ -246,6 +248,8 @@
Patch1000: fcntl-o-tmpfile.patch
# PATCH-FIX-UPSTREAM Integer overflows in malloc
Patch1001: malloc-overflows.patch
+# PATCH-FIX-UPSTREAM m68k: Use PIC for Scrt1.o
+Patch1002: m68k-Scrt1.patch
###
# Patches awaiting upstream approval
@@ -457,6 +461,7 @@
%patch15 -p1
%patch18 -p1
%patch19 -p1
+%patch20 -p1
%patch100 -p1
%patch101 -p1
@@ -472,6 +477,7 @@
%patch1000 -p1
%patch1001 -p1
+%patch1002 -p1
# XXX Disable, it breaks the testsuite, test elf/tst-audit2
# %patch2008 -p1
@@ -585,7 +591,7 @@
%ifarch %ix86
add_ons=$add_ons,noversion
%endif
-%ifarch %arm aarch64 mipsel ia64
+%ifarch %arm aarch64 mipsel ia64 m68k
add_ons=$add_ons,ports
%endif
%ifarch mipsel
@@ -655,8 +661,11 @@
# Build POWER-optimized glibc
#
# First, base build:
- pBuildFlags="$BuildFlags -mcpu=%{powerpc_optimize_base}
-mtune=%{powerpc_optimize_tune}"
- %if %{powerpc_optimize_base} != "power3"
+ pBuildFlags="$BuildFlags -mtune=%{powerpc_optimize_tune}"
+ %if "%{powerpc_optimize_base}" != ""
+ pBuildFlags+=" -mcpu=%{powerpc_optimize_base}"
+ %endif
+ %if "%{powerpc_optimize_base}" != ""
configure_and_build_glibc base "$pBuildFlags" "$add_ons"
--with-cpu=%{powerpc_optimize_base}
%else
# Use no default CPU
@@ -1057,7 +1066,7 @@
%ifarch ia64
/%{_lib}/ld-linux-ia64.so.2
%endif
-%ifarch ppc s390 mips hppa
+%ifarch ppc s390 mips hppa m68k
/%{_lib}/ld.so.1
%endif
%ifarch ppc64
@@ -1156,7 +1165,7 @@
%{_bindir}/getent
%{_bindir}/iconv
%attr(755,root,root) %{_bindir}/ldd
-%ifarch %ix86 sparc sparcv9
+%ifarch %ix86 sparc sparcv9 m68k
%{_bindir}/lddlibc4
%endif
%{_bindir}/locale
glibc-utils.spec: same change
++++++ glibc.spec ++++++
--- /var/tmp/diff_new_pack.PvWxzt/_old 2013-10-22 10:17:25.000000000 +0200
+++ /var/tmp/diff_new_pack.PvWxzt/_new 2013-10-22 10:17:25.000000000 +0200
@@ -78,11 +78,11 @@
%ifarch ppc ppc64
%define optimize_power 1
%ifarch ppc
- %define powerpc_optimize_base power3
+ %define powerpc_optimize_base %{nil}
%define powerpc_optimize_tune power3
%define powerpc_optimize_cpu_power4 %{normal_build}
%else
- %define powerpc_optimize_base power4
+ %define powerpc_optimize_base %{nil}
%define powerpc_optimize_tune power5
%define powerpc_optimize_cpu_power4 0
%endif
@@ -92,7 +92,7 @@
%define powerpc_optimize_cpu_cell 0
%else
%define optimize_power 0
- %define powerpc_optimize_base 0
+ %define powerpc_optimize_base %{nil}
%define powerpc_optimize_cpu_power4 0
%define powerpc_optimize_cpu_power6 0
%define powerpc_optimize_cpu_power7 0
@@ -211,6 +211,8 @@
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
@@ -246,6 +248,8 @@
Patch1000: fcntl-o-tmpfile.patch
# PATCH-FIX-UPSTREAM Integer overflows in malloc
Patch1001: malloc-overflows.patch
+# PATCH-FIX-UPSTREAM m68k: Use PIC for Scrt1.o
+Patch1002: m68k-Scrt1.patch
###
# Patches awaiting upstream approval
@@ -457,6 +461,7 @@
%patch15 -p1
%patch18 -p1
%patch19 -p1
+%patch20 -p1
%patch100 -p1
%patch101 -p1
@@ -472,6 +477,7 @@
%patch1000 -p1
%patch1001 -p1
+%patch1002 -p1
# XXX Disable, it breaks the testsuite, test elf/tst-audit2
# %patch2008 -p1
@@ -585,7 +591,7 @@
%ifarch %ix86
add_ons=$add_ons,noversion
%endif
-%ifarch %arm aarch64 mipsel ia64
+%ifarch %arm aarch64 mipsel ia64 m68k
add_ons=$add_ons,ports
%endif
%ifarch mipsel
@@ -655,8 +661,11 @@
# Build POWER-optimized glibc
#
# First, base build:
- pBuildFlags="$BuildFlags -mcpu=%{powerpc_optimize_base}
-mtune=%{powerpc_optimize_tune}"
- %if %{powerpc_optimize_base} != "power3"
+ pBuildFlags="$BuildFlags -mtune=%{powerpc_optimize_tune}"
+ %if "%{powerpc_optimize_base}" != ""
+ pBuildFlags+=" -mcpu=%{powerpc_optimize_base}"
+ %endif
+ %if "%{powerpc_optimize_base}" != ""
configure_and_build_glibc base "$pBuildFlags" "$add_ons"
--with-cpu=%{powerpc_optimize_base}
%else
# Use no default CPU
@@ -1057,7 +1066,7 @@
%ifarch ia64
/%{_lib}/ld-linux-ia64.so.2
%endif
-%ifarch ppc s390 mips hppa
+%ifarch ppc s390 mips hppa m68k
/%{_lib}/ld.so.1
%endif
%ifarch ppc64
@@ -1156,7 +1165,7 @@
%{_bindir}/getent
%{_bindir}/iconv
%attr(755,root,root) %{_bindir}/ldd
-%ifarch %ix86 sparc sparcv9
+%ifarch %ix86 sparc sparcv9 m68k
%{_bindir}/lddlibc4
%endif
%{_bindir}/locale
++++++ i686-no-sse42-strstr.patch ++++++
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 DO_VERSIONING && !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>
++++++ m68k-Scrt1.patch ++++++
2013-10-08 Andreas Schwab <sch...@suse.de>
* sysdeps/m68k/start.S [SHARED]: Use PIC.
Index: glibc-2.18/ports/sysdeps/m68k/start.S
===================================================================
--- glibc-2.18.orig/ports/sysdeps/m68k/start.S
+++ glibc-2.18/ports/sysdeps/m68k/start.S
@@ -52,6 +52,8 @@
NULL
*/
+#include <sysdep.h>
+
.text
.globl _start
.type _start,@function
@@ -74,6 +76,24 @@ _start:
pea (%a1) /* Push address of the shared library
termination function. */
+#ifdef SHARED
+ /* Load PIC register. */
+ LOAD_GOT (%a5)
+
+ /* Push the address of our own entry points to `.fini' and
+ `.init'. */
+ move.l __libc_csu_fini@GOT(%a5), -(%sp)
+ move.l __libc_csu_init@GOT(%a5), -(%sp)
+
+ pea (%a0) /* Push second argument: argv. */
+ move.l %d0, -(%sp) /* Push first argument: argc. */
+
+ move.l main@GOT(%a5), -(%sp)
+
+ /* Call the user's main function, and exit with its value. But
+ let the libc call main. */
+ jbsr __libc_start_main@PLTPC
+#else
/* Push the address of our own entry points to `.fini' and
`.init'. */
pea __libc_csu_fini
@@ -87,6 +107,7 @@ _start:
/* Call the user's main function, and exit with its value. But
let the libc call main. */
jbsr __libc_start_main
+#endif
illegal /* Crash if somehow `exit' does return. */
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
