rpm/glibc
SHA256
1
0
Fork 0
forked from pool/glibc
Code Pull Requests Activity

Accepting request 500196 from home:Andreas_Schwab:Factory

Browse Source 
- fts-symbol-redirect.patch: Fix symbol redirect for fts_set (bsc#1041123,
  BZ #21289)

- test-math-vector-sincos-aliasing.patch: Fix test-math-vector-sincos.h
  aliasing

- add-locales.patch: renamed from glibc-2.3.locales.diff.bz2, drop en_BE
  locales (bsc#1039502)

- Remove glibc-testsuite.patch, no longer relevant

OBS-URL: https://build.opensuse.org/request/show/500196
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=457
This commit is contained in:
Andreas Schwab 2017-05-31 16:11:37 +00:00 committed by Git OBS Bridge
parent 4790269dff
commit da08f55dc8
7 changed files with 151 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
add-locales.patch Normal file
View File

@ -0,0 +1,29 @@
Index: glibc-2.25/localedata/SUPPORTED
===================================================================
--- glibc-2.25.orig/localedata/SUPPORTED
+++ glibc-2.25/localedata/SUPPORTED
@@ -129,6 +129,7 @@ en_CA.UTF-8/UTF-8 \
en_CA/ISO-8859-1 \
en_DK.UTF-8/UTF-8 \
en_DK/ISO-8859-1 \
+en_GB.ISO-8859-15/ISO-8859-15 \
en_GB.UTF-8/UTF-8 \
en_GB/ISO-8859-1 \
en_HK.UTF-8/UTF-8 \
@@ -145,6 +146,7 @@ en_PH.UTF-8/UTF-8 \
en_PH/ISO-8859-1 \
en_SG.UTF-8/UTF-8 \
en_SG/ISO-8859-1 \
+en_US.ISO-8859-15/ISO-8859-15 \
en_US.UTF-8/UTF-8 \
en_US/ISO-8859-1 \
en_ZA.UTF-8/UTF-8 \
@@ -269,6 +271,8 @@ it_IT/ISO-8859-1 \
it_IT@euro/ISO-8859-15 \
iu_CA/UTF-8 \
ja_JP.EUC-JP/EUC-JP \
+ja_JP.SHIFT_JISX0213/SHIFT_JISX0213 \
+ja_JP.SJIS/SHIFT_JIS \
ja_JP.UTF-8/UTF-8 \
ka_GE.UTF-8/UTF-8 \
ka_GE/GEORGIAN-PS \

18
fts-symbol-redirect.patch Normal file
View File

@ -0,0 +1,18 @@
2017-03-31 Slava Barinov <v.barinov@samsung.com>
[BZ #21289]
* io/fts.h (fts_set): Replace __REDIRECT with __REDIRECT_NTH.
Index: glibc-2.25/io/fts.h
===================================================================
--- glibc-2.25.orig/io/fts.h
+++ glibc-2.25/io/fts.h
@@ -193,7 +193,7 @@ FTS *__REDIRECT (fts_open, (char * const
int (*)(const FTSENT **, const FTSENT **)),
fts64_open);
FTSENT *__REDIRECT (fts_read, (FTS *), fts64_read);
-int __REDIRECT (fts_set, (FTS *, FTSENT *, int), fts64_set) __THROW;
+int __REDIRECT_NTH (fts_set, (FTS *, FTSENT *, int), fts64_set);
# else
# define fts_children fts64_children
# define fts_close fts64_close

3
glibc-2.3.locales.diff.bz2
View File

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

15
glibc-testsuite.patch
View File

@ -1,15 +0,0 @@
test-lfs runs for ever on ReiserFS. Let's disable it completely.
Index: glibc-2.17.90/io/Makefile
===================================================================
--- glibc-2.17.90.orig/io/Makefile
+++ glibc-2.17.90/io/Makefile
@@ -63,7 +63,7 @@ static-only-routines = stat fstat lstat
others := pwd
test-srcs := ftwtest
-tests := test-utime test-stat test-stat2 test-lfs tst-getcwd \
+tests := test-utime test-stat test-stat2 tst-getcwd \
tst-fcntl bug-ftw1 bug-ftw2 bug-ftw3 bug-ftw4 tst-statvfs \
tst-openat tst-unlinkat tst-fstatat tst-futimesat \
tst-renameat tst-fchownat tst-fchmodat tst-faccessat \

23
glibc.changes
View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Wed May 31 10:35:31 UTC 2017 - schwab@suse.de
- fts-symbol-redirect.patch: Fix symbol redirect for fts_set (bsc#1041123,
BZ #21289)
-------------------------------------------------------------------
Mon May 29 18:10:31 UTC 2017 - schwab@suse.de
- test-math-vector-sincos-aliasing.patch: Fix test-math-vector-sincos.h
aliasing
-------------------------------------------------------------------
Mon May 29 10:24:22 UTC 2017 - schwab@suse.de
- add-locales.patch: renamed from glibc-2.3.locales.diff.bz2, drop en_BE
locales (bsc#1039502)
-------------------------------------------------------------------
Tue May 23 09:54:08 UTC 2017 - schwab@suse.de
- Remove glibc-testsuite.patch, no longer relevant
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 22 10:04:59 UTC 2017 - schwab@suse.de Mon May 22 10:04:59 UTC 2017 - schwab@suse.de

25
glibc.spec
View File

@ -16,26 +16,22 @@
# #
%define build_snapshot 0
# PLEASE run pre_checkin.sh in this directory before submitting
# this package. Otherwise the .spec and .changes for glibc-testsuite
# and glibc-utils aren't updated.
# Run with osc --with=fast_build to have a shorter turnaround # Run with osc --with=fast_build to have a shorter turnaround
# It will avoid building some parts of glibc # It will avoid building some parts of glibc
%bcond_with fast_build %bcond_with fast_build
%define crypt_bf_version 1.3 %define crypt_bf_version 1.3
%define build_snapshot 0
%define normal_build ("@BUILD_FLAVOR@" == "" || "@BUILD_FLAVOR@" == "i686")
%define utils_build ("@BUILD_FLAVOR@" == "utils") %define utils_build ("@BUILD_FLAVOR@" == "utils")
%define testsuite_build ("@BUILD_FLAVOR@" == "testsuite") %define testsuite_build ("@BUILD_FLAVOR@" == "testsuite")
%define normal_build !(%utils_build || %testsuite_build)
%if %normal_build %if %normal_build
Name: glibc Name: glibc
Summary: Standard Shared Libraries (from the GNU C Library) Summary: Standard Shared Libraries (from the GNU C Library)
License: LGPL-2.1+ License: LGPL-2.1+ and SUSE-LGPL-2.1+-with-GCC-exception and GPL-2.0+
Group: Development/Languages/C and C++ Group: System/Libraries
%endif %endif
%if %utils_build %if %utils_build
Name: glibc-utils Name: glibc-utils
@ -224,8 +220,6 @@ Patch8: glibc-nscd.conf.patch
Patch9: glibc-nodate.patch Patch9: glibc-nodate.patch
# PATCH-FIX-OPENSUSE -- add some extra information to version output - kukuk@suse.de # PATCH-FIX-OPENSUSE -- add some extra information to version output - kukuk@suse.de
Patch10: glibc-version.diff Patch10: glibc-version.diff
# PATCH-FIX-OPENSUSE remove lfs test from testsuite aj@suse.de
Patch11: glibc-testsuite.patch
# PATCH-FIX-OPENSUSE handle old glibc binaries # PATCH-FIX-OPENSUSE handle old glibc binaries
Patch12: glibc-2.3.90-noversion.diff Patch12: glibc-2.3.90-noversion.diff
# PATCH-FIX-OPENSUSE -- Make --no-archive default for localedef - kukuk@suse.de # PATCH-FIX-OPENSUSE -- Make --no-archive default for localedef - kukuk@suse.de
@ -243,7 +237,7 @@ Patch21: powerpc-elision-enable-envvar.patch
### Locale related patches ### Locale related patches
# PATCH-FIX-OPENSUSE Add additional locales # PATCH-FIX-OPENSUSE Add additional locales
Patch100: glibc-2.3.locales.diff.bz2 Patch100: add-locales.patch
# PATCH-FIX-OPENSUSE -- Add no_NO back (XXX: Still needed?) # PATCH-FIX-OPENSUSE -- Add no_NO back (XXX: Still needed?)
Patch102: glibc-2.4.90-no_NO.diff Patch102: glibc-2.4.90-no_NO.diff
# PATCH-FIX-OPENSUSE -- Renames for China # PATCH-FIX-OPENSUSE -- Renames for China
@ -274,6 +268,10 @@ Patch1000: tunables-bigendian.patch
Patch1001: i686-memchr-sse.patch Patch1001: i686-memchr-sse.patch
# PATCH-FIX-UPSTREAM Avoid use-after-free read access in clntudp_call (BZ #21115) # PATCH-FIX-UPSTREAM Avoid use-after-free read access in clntudp_call (BZ #21115)
Patch1002: sunrpc-use-after-free.patch Patch1002: sunrpc-use-after-free.patch
# PATCH-FIX-UPSTREAM Fix test-math-vector-sincos.h aliasing
Patch1003: test-math-vector-sincos-aliasing.patch
# PATCH-FIX-UPSTREAM Fix symbol redirect for fts_set (BZ #21289)
Patch1004: fts-symbol-redirect.patch
### ###
# Patches awaiting upstream approval # Patches awaiting upstream approval
@ -486,7 +484,6 @@ touch -r nscd/nscd_stat.c nscd/s-stamp
touch -r nscd/s-stamp nscd/nscd_stat.c touch -r nscd/s-stamp nscd/nscd_stat.c
rm nscd/s-stamp rm nscd/s-stamp
%patch10 -p1 %patch10 -p1
%patch11 -p1
%patch12 -p1 %patch12 -p1
%patch13 -p1 %patch13 -p1
%patch14 -p1 %patch14 -p1
@ -509,6 +506,8 @@ rm nscd/s-stamp
%patch1000 -p1 %patch1000 -p1
%patch1001 -p1 %patch1001 -p1
%patch1002 -p1 %patch1002 -p1
%patch1003 -p1
%patch1004 -p1
%patch2000 -p1 %patch2000 -p1
%patch2001 -p1 %patch2001 -p1

69
test-math-vector-sincos-aliasing.patch Normal file
View File

@ -0,0 +1,69 @@
2017-03-15 Joseph Myers <joseph@codesourcery.com>
* sysdeps/x86/fpu/test-math-vector-sincos.h (INIT_VEC_PTRS_LOOP):
Use a union when storing pointers.
(VECTOR_WRAPPER_fFF_2): Do not take address of integer vector and
cast result when passing to INIT_VEC_PTRS_LOOP.
(VECTOR_WRAPPER_fFF_3): Likewise.
(VECTOR_WRAPPER_fFF_4): Likewise.
Index: glibc-2.25/sysdeps/x86/fpu/test-math-vector-sincos.h
===================================================================
--- glibc-2.25.orig/sysdeps/x86/fpu/test-math-vector-sincos.h
+++ glibc-2.25/sysdeps/x86/fpu/test-math-vector-sincos.h
@@ -17,14 +17,14 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#define INIT_VEC_PTRS_LOOP(vec, val, len) \
- do \
- { \
- for (i = 0; i < len; i++) \
- { \
- vec[i] = &val[i]; \
- } \
- } \
+#define INIT_VEC_PTRS_LOOP(vec, val, len) \
+ do \
+ { \
+ union { VEC_INT_TYPE v; __typeof__ ((val)[0]) *a[(len)]; } u; \
+ for (i = 0; i < len; i++) \
+ u.a[i] = &(val)[i]; \
+ (vec) = u.v; \
+ } \
while (0)
/* Wrapper for vector sincos/sincosf compatible with x86_64 and x32 variants
@@ -40,8 +40,8 @@ void scalar_func (FLOAT x, FLOAT * r, FL
VEC_TYPE mx; \
VEC_INT_TYPE mr, mr1; \
INIT_VEC_LOOP (mx, x, VEC_LEN); \
- INIT_VEC_PTRS_LOOP (((FLOAT **) &mr), r_loc, VEC_LEN); \
- INIT_VEC_PTRS_LOOP (((FLOAT **) &mr1), r1_loc, VEC_LEN); \
+ INIT_VEC_PTRS_LOOP (mr, r_loc, VEC_LEN); \
+ INIT_VEC_PTRS_LOOP (mr1, r1_loc, VEC_LEN); \
vector_func (mx, mr, mr1); \
TEST_VEC_LOOP (r_loc, VEC_LEN); \
TEST_VEC_LOOP (r1_loc, VEC_LEN); \
@@ -63,8 +63,8 @@ void scalar_func (FLOAT x, FLOAT * r, FL
VEC_TYPE mx; \
VEC_INT_TYPE mr, mr1; \
INIT_VEC_LOOP (mx, x, VEC_LEN); \
- INIT_VEC_PTRS_LOOP (((FLOAT **) &mr), r_loc, VEC_LEN/2); \
- INIT_VEC_PTRS_LOOP (((FLOAT **) &mr1), r1_loc, VEC_LEN/2); \
+ INIT_VEC_PTRS_LOOP (mr, r_loc, VEC_LEN/2); \
+ INIT_VEC_PTRS_LOOP (mr1, r1_loc, VEC_LEN/2); \
vector_func (mx, mr, mr, mr1, mr1); \
TEST_VEC_LOOP (r_loc, VEC_LEN/2); \
TEST_VEC_LOOP (r1_loc, VEC_LEN/2); \
@@ -87,8 +87,8 @@ void scalar_func (FLOAT x, FLOAT * r, FL
VEC_TYPE mx; \
VEC_INT_TYPE mr, mr1; \
INIT_VEC_LOOP (mx, x, VEC_LEN); \
- INIT_VEC_PTRS_LOOP (((FLOAT **) &mr), r_loc, VEC_LEN/4); \
- INIT_VEC_PTRS_LOOP (((FLOAT **) &mr1), r1_loc, VEC_LEN/4); \
+ INIT_VEC_PTRS_LOOP (mr, r_loc, VEC_LEN/4); \
+ INIT_VEC_PTRS_LOOP (mr1, r1_loc, VEC_LEN/4); \
vector_func (mx, mr, mr, mr, mr, mr1, mr1, mr1, mr1); \
TEST_VEC_LOOP (r_loc, VEC_LEN/4); \
TEST_VEC_LOOP (r1_loc, VEC_LEN/4); \