forked from rpms/glibc
import glibc-2.28-184.el8
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
parent
4c3afbceed
commit
f73a02cba0
51
SOURCES/glibc-rh2033648-1.patch
Normal file
51
SOURCES/glibc-rh2033648-1.patch
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
commit c36f64aa6dff13b12a1e03a185e75a50fa9f6a4c
|
||||||
|
Author: Hans-Peter Nilsson <hp@axis.com>
|
||||||
|
Date: Fri Dec 17 21:38:00 2021 +0100
|
||||||
|
|
||||||
|
timezone: handle truncated timezones from tzcode-2021d and later (BZ #28707)
|
||||||
|
|
||||||
|
When using a timezone file with a truncated starting time,
|
||||||
|
generated by the zic in IANA tzcode-2021d a.k.a. tzlib-2021d
|
||||||
|
(also in tzlib-2021e; current as of this writing), glibc
|
||||||
|
asserts in __tzfile_read (on e.g. tzset() for this file) and
|
||||||
|
you may find lines matching "tzfile.c:435: __tzfile_read:
|
||||||
|
Assertion `num_types == 1' failed" in your syslog.
|
||||||
|
|
||||||
|
One example of such a file is the tzfile for Asuncion
|
||||||
|
generated by tzlib-2021e as follows, using the tzlib-2021e zic:
|
||||||
|
"zic -d DEST -r @1546300800 -L /dev/null -b slim
|
||||||
|
SOURCE/southamerica". Note that in its type 2 header, it has
|
||||||
|
two entries in its "time-types" array (types), but only one
|
||||||
|
entry in its "transition types" array (type_idxs).
|
||||||
|
|
||||||
|
This is valid and expected already in the published RFC8536, and
|
||||||
|
not even frowned upon: "Local time for timestamps before the
|
||||||
|
first transition is specified by the first time type (time type
|
||||||
|
0)" ... "every nonzero local time type index SHOULD appear at
|
||||||
|
least once in the transition type array". Note the "nonzero ...
|
||||||
|
index". Until the 2021d zic, index 0 has been shared by the
|
||||||
|
first valid transition but with 2021d it's separate, set apart
|
||||||
|
as a placeholder and only "implicitly" indexed. (A draft update
|
||||||
|
of the RFC mandates that the entry at index 0 is a placeholder
|
||||||
|
in this case, hence can no longer be shared.)
|
||||||
|
|
||||||
|
* time/tzfile.c (__tzfile_read): Don't assert when no transitions
|
||||||
|
are found.
|
||||||
|
|
||||||
|
Co-authored-by: Christopher Wong <Christopher.Wong@axis.com>
|
||||||
|
|
||||||
|
diff --git a/time/tzfile.c b/time/tzfile.c
|
||||||
|
index 190a777152..8668392ad3 100644
|
||||||
|
--- a/time/tzfile.c
|
||||||
|
+++ b/time/tzfile.c
|
||||||
|
@@ -431,8 +431,8 @@ __tzfile_read (const char *file, size_t extra, char **extrap)
|
||||||
|
if (__tzname[0] == NULL)
|
||||||
|
{
|
||||||
|
/* This should only happen if there are no transition rules.
|
||||||
|
- In this case there should be only one single type. */
|
||||||
|
- assert (num_types == 1);
|
||||||
|
+ In this case there's usually only one single type, unless
|
||||||
|
+ e.g. the data file has a truncated time-range. */
|
||||||
|
__tzname[0] = __tzstring (zone_names);
|
||||||
|
}
|
||||||
|
if (__tzname[1] == NULL)
|
||||||
126
SOURCES/glibc-rh2033648-2.patch
Normal file
126
SOURCES/glibc-rh2033648-2.patch
Normal file
@ -0,0 +1,126 @@
|
|||||||
|
commit ebe899af0dc3215159a9c896ac6f35b72a18cb6e
|
||||||
|
Author: Hans-Peter Nilsson <hp@axis.com>
|
||||||
|
Date: Fri Dec 17 21:45:54 2021 +0100
|
||||||
|
|
||||||
|
timezone: test-case for BZ #28707
|
||||||
|
|
||||||
|
This test-case is the tzfile for Asuncion generated by
|
||||||
|
tzlib-2021e as follows, using the tzlib-2021e zic: "zic -d
|
||||||
|
DEST -r @1546300800 -L /dev/null -b slim
|
||||||
|
SOURCE/southamerica". Note that in its type 2 header, it
|
||||||
|
has two entries in its "time-types" array (types), but only
|
||||||
|
one entry in its "transition types" array (type_idxs).
|
||||||
|
|
||||||
|
* timezone/Makefile, timezone/tst-pr28707.c,
|
||||||
|
timezone/testdata/gen-XT5.sh: New test.
|
||||||
|
|
||||||
|
Co-authored-by: Christopher Wong <Christopher.Wong@axis.com>
|
||||||
|
|
||||||
|
Reworked due to timezone/Makefile difference.
|
||||||
|
|
||||||
|
diff -Nrup a/timezone/Makefile b/timezone/Makefile
|
||||||
|
--- a/timezone/Makefile 2021-07-06 15:04:00.000000000 -0400
|
||||||
|
+++ b/timezone/Makefile 2022-01-05 15:03:57.433756574 -0500
|
||||||
|
@@ -23,7 +23,7 @@ subdir := timezone
|
||||||
|
include ../Makeconfig
|
||||||
|
|
||||||
|
others := zdump zic
|
||||||
|
-tests := test-tz tst-timezone tst-tzset
|
||||||
|
+tests := test-tz tst-timezone tst-tzset tst-bz28707
|
||||||
|
|
||||||
|
generated-dirs += testdata
|
||||||
|
|
||||||
|
@@ -85,10 +85,12 @@ $(objpfx)tst-timezone.out: $(addprefix $
|
||||||
|
America/Sao_Paulo Asia/Tokyo \
|
||||||
|
Europe/London)
|
||||||
|
$(objpfx)tst-tzset.out: $(addprefix $(testdata)/XT, 1 2 3 4)
|
||||||
|
+$(objpfx)tst-bz28707.out: $(testdata)/XT5
|
||||||
|
|
||||||
|
test-tz-ENV = TZDIR=$(testdata)
|
||||||
|
tst-timezone-ENV = TZDIR=$(testdata)
|
||||||
|
tst-tzset-ENV = TZDIR=$(testdata)
|
||||||
|
+tst-bz28707-ENV = TZDIR=$(testdata)
|
||||||
|
|
||||||
|
# Note this must come second in the deps list for $(built-program-cmd) to work.
|
||||||
|
zic-deps = $(objpfx)zic $(leapseconds) yearistype
|
||||||
|
@@ -122,6 +124,10 @@ $(testdata)/XT%: testdata/XT%
|
||||||
|
$(make-target-directory)
|
||||||
|
cp $< $@
|
||||||
|
|
||||||
|
+$(testdata)/XT%: testdata/gen-XT%.sh
|
||||||
|
+ $(SHELL) $< > $@.tmp
|
||||||
|
+ mv $@.tmp $@
|
||||||
|
+
|
||||||
|
$(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
|
||||||
|
sed -e 's|/bin/bash|$(BASH)|' \
|
||||||
|
-e 's|TZDIR=[^}]*|TZDIR=$(zonedir)|' \
|
||||||
|
diff -Nrup a/timezone/testdata/gen-XT5.sh b/timezone/testdata/gen-XT5.sh
|
||||||
|
--- a/timezone/testdata/gen-XT5.sh 1969-12-31 19:00:00.000000000 -0500
|
||||||
|
+++ b/timezone/testdata/gen-XT5.sh 2022-01-05 12:50:01.666972313 -0500
|
||||||
|
@@ -0,0 +1,16 @@
|
||||||
|
+#! /bin/sh
|
||||||
|
+
|
||||||
|
+# This test-case is the tzfile for America/Asuncion
|
||||||
|
+# generated by tzlib-2021e as follows, using the tzlib-2021e
|
||||||
|
+# zic: "zic -d DEST -r @1546300800 -L /dev/null -b slim
|
||||||
|
+# SOURCE/southamerica". Note that in its type 2 header, it
|
||||||
|
+# has two entries in its "time-types" array (types), but
|
||||||
|
+# only one entry in its "transition types" array
|
||||||
|
+# (type_idxs).
|
||||||
|
+
|
||||||
|
+printf \
|
||||||
|
+'TZif2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0'\
|
||||||
|
+'\0\0\0\0\0\0\0\1\0\0\0\1\0\0\0\0\0\0\0TZif2\0\0\0\0\0\0\0\0'\
|
||||||
|
+'\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\b\0'\
|
||||||
|
+'\0\0\0\*\255\200\1\0\0\0\0\0\0\377\377\325\320\1\4-00\0-03\0\n'\
|
||||||
|
+'<-04>4<-03>,M10.1.0/0,M3.4.0/0\n'
|
||||||
|
diff -Nrup a/timezone/tst-bz28707.c b/timezone/tst-bz28707.c
|
||||||
|
--- a/timezone/tst-bz28707.c 1969-12-31 19:00:00.000000000 -0500
|
||||||
|
+++ b/timezone/tst-bz28707.c 2022-01-05 12:50:01.666972313 -0500
|
||||||
|
@@ -0,0 +1,46 @@
|
||||||
|
+/* Copyright (C) 2021 Free Software Foundation, Inc.
|
||||||
|
+ This file is part of the GNU C Library.
|
||||||
|
+
|
||||||
|
+ The GNU C Library is free software; you can redistribute it and/or
|
||||||
|
+ modify it under the terms of the GNU Lesser General Public
|
||||||
|
+ License as published by the Free Software Foundation; either
|
||||||
|
+ version 2.1 of the License, or (at your option) any later version.
|
||||||
|
+
|
||||||
|
+ The GNU C Library is distributed in the hope that it will be useful,
|
||||||
|
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
+ Lesser General Public License for more details.
|
||||||
|
+
|
||||||
|
+ You should have received a copy of the GNU Lesser General Public
|
||||||
|
+ License along with the GNU C Library; if not, see
|
||||||
|
+ <https://www.gnu.org/licenses/>. */
|
||||||
|
+
|
||||||
|
+#include <time.h>
|
||||||
|
+#include <stdio.h>
|
||||||
|
+#include <stdlib.h>
|
||||||
|
+#include <string.h>
|
||||||
|
+
|
||||||
|
+/* Test that we can use a truncated timezone-file, where the time-type
|
||||||
|
+ at index 0 is not indexed by the transition-types array (and the
|
||||||
|
+ transition-types array does not contain at least both one DST and one
|
||||||
|
+ normal time members). */
|
||||||
|
+
|
||||||
|
+static int
|
||||||
|
+do_test (void)
|
||||||
|
+{
|
||||||
|
+ if (setenv ("TZ", "XT5", 1))
|
||||||
|
+ {
|
||||||
|
+ puts ("setenv failed.");
|
||||||
|
+ return 1;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ tzset ();
|
||||||
|
+
|
||||||
|
+ return
|
||||||
|
+ /* Sanity-check that we got the right timezone-name for DST. For
|
||||||
|
+ normal time, we're likely to get "-00" (the "unspecified" marker),
|
||||||
|
+ even though the POSIX timezone string says "-04". Let's not test
|
||||||
|
+ that. */
|
||||||
|
+ !(strcmp (tzname[1], "-03") == 0);
|
||||||
|
+}
|
||||||
|
+#include <support/test-driver.c>
|
||||||
185
SOURCES/glibc-rh2033655.patch
Normal file
185
SOURCES/glibc-rh2033655.patch
Normal file
@ -0,0 +1,185 @@
|
|||||||
|
commit ff012870b2c02a62598c04daa1e54632e020fd7d
|
||||||
|
Author: Nikita Popov <npv1310@gmail.com>
|
||||||
|
Date: Tue Nov 2 13:21:42 2021 +0500
|
||||||
|
|
||||||
|
gconv: Do not emit spurious NUL character in ISO-2022-JP-3 (bug 28524)
|
||||||
|
|
||||||
|
Bugfix 27256 has introduced another issue:
|
||||||
|
In conversion from ISO-2022-JP-3 encoding, it is possible
|
||||||
|
to force iconv to emit extra NUL character on internal state reset.
|
||||||
|
To do this, it is sufficient to feed iconv with escape sequence
|
||||||
|
which switches active character set.
|
||||||
|
The simplified check 'data->__statep->__count != ASCII_set'
|
||||||
|
introduced by the aforementioned bugfix picks that case and
|
||||||
|
behaves as if '\0' character has been queued thus emitting it.
|
||||||
|
|
||||||
|
To eliminate this issue, these steps are taken:
|
||||||
|
* Restore original condition
|
||||||
|
'(data->__statep->__count & ~7) != ASCII_set'.
|
||||||
|
It is necessary since bits 0-2 may contain
|
||||||
|
number of buffered input characters.
|
||||||
|
* Check that queued character is not NUL.
|
||||||
|
Similar step is taken for main conversion loop.
|
||||||
|
|
||||||
|
Bundled test case follows following logic:
|
||||||
|
* Try to convert ISO-2022-JP-3 escape sequence
|
||||||
|
switching active character set
|
||||||
|
* Reset internal state by providing NULL as input buffer
|
||||||
|
* Ensure that nothing has been converted.
|
||||||
|
|
||||||
|
Signed-off-by: Nikita Popov <npv1310@gmail.com>
|
||||||
|
|
||||||
|
Conflicts:
|
||||||
|
iconvdata/Makefile
|
||||||
|
(Copyright header. Usual test backporting differences.)
|
||||||
|
iconvdata/iso-2022-jp-3.c
|
||||||
|
(Copyright header.)
|
||||||
|
|
||||||
|
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
|
||||||
|
index 95e5fb8f722a513b..646e2ccd11478646 100644
|
||||||
|
--- a/iconvdata/Makefile
|
||||||
|
+++ b/iconvdata/Makefile
|
||||||
|
@@ -1,4 +1,5 @@
|
||||||
|
-# Copyright (C) 1997-2018 Free Software Foundation, Inc.
|
||||||
|
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
|
||||||
|
+# Copyright (C) The GNU Toolchain Authors.
|
||||||
|
# This file is part of the GNU C Library.
|
||||||
|
|
||||||
|
# The GNU C Library is free software; you can redistribute it and/or
|
||||||
|
@@ -73,7 +74,8 @@ modules.so := $(addsuffix .so, $(modules))
|
||||||
|
ifeq (yes,$(build-shared))
|
||||||
|
tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \
|
||||||
|
tst-iconv6 bug-iconv5 bug-iconv6 tst-iconv7 bug-iconv8 bug-iconv9 \
|
||||||
|
- bug-iconv10 bug-iconv11 bug-iconv12 bug-iconv13 bug-iconv14
|
||||||
|
+ bug-iconv10 bug-iconv11 bug-iconv12 bug-iconv13 bug-iconv14 \
|
||||||
|
+ bug-iconv15
|
||||||
|
ifeq ($(have-thread-library),yes)
|
||||||
|
tests += bug-iconv3
|
||||||
|
endif
|
||||||
|
@@ -321,6 +323,8 @@ $(objpfx)bug-iconv12.out: $(addprefix $(objpfx), $(gconv-modules)) \
|
||||||
|
$(addprefix $(objpfx),$(modules.so))
|
||||||
|
$(objpfx)bug-iconv14.out: $(addprefix $(objpfx), $(gconv-modules)) \
|
||||||
|
$(addprefix $(objpfx),$(modules.so))
|
||||||
|
+$(objpfx)bug-iconv15.out: $(addprefix $(objpfx), $(gconv-modules)) \
|
||||||
|
+ $(addprefix $(objpfx),$(modules.so))
|
||||||
|
|
||||||
|
$(objpfx)iconv-test.out: run-iconv-test.sh \
|
||||||
|
$(addprefix $(objpfx), $(gconv-modules)) \
|
||||||
|
diff --git a/iconvdata/bug-iconv15.c b/iconvdata/bug-iconv15.c
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000000000..cc04bd0313a68786
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/iconvdata/bug-iconv15.c
|
||||||
|
@@ -0,0 +1,60 @@
|
||||||
|
+/* Bug 28524: Conversion from ISO-2022-JP-3 with iconv
|
||||||
|
+ may emit spurious NUL character on state reset.
|
||||||
|
+ Copyright (C) The GNU Toolchain Authors.
|
||||||
|
+ This file is part of the GNU C Library.
|
||||||
|
+
|
||||||
|
+ The GNU C Library is free software; you can redistribute it and/or
|
||||||
|
+ modify it under the terms of the GNU Lesser General Public
|
||||||
|
+ License as published by the Free Software Foundation; either
|
||||||
|
+ version 2.1 of the License, or (at your option) any later version.
|
||||||
|
+
|
||||||
|
+ The GNU C Library is distributed in the hope that it will be useful,
|
||||||
|
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
+ Lesser General Public License for more details.
|
||||||
|
+
|
||||||
|
+ You should have received a copy of the GNU Lesser General Public
|
||||||
|
+ License along with the GNU C Library; if not, see
|
||||||
|
+ <https://www.gnu.org/licenses/>. */
|
||||||
|
+
|
||||||
|
+#include <stddef.h>
|
||||||
|
+#include <iconv.h>
|
||||||
|
+#include <support/check.h>
|
||||||
|
+
|
||||||
|
+static int
|
||||||
|
+do_test (void)
|
||||||
|
+{
|
||||||
|
+ char in[] = "\x1b(I";
|
||||||
|
+ char *inbuf = in;
|
||||||
|
+ size_t inleft = sizeof (in) - 1;
|
||||||
|
+ char out[1];
|
||||||
|
+ char *outbuf = out;
|
||||||
|
+ size_t outleft = sizeof (out);
|
||||||
|
+ iconv_t cd;
|
||||||
|
+
|
||||||
|
+ cd = iconv_open ("UTF8", "ISO-2022-JP-3");
|
||||||
|
+ TEST_VERIFY_EXIT (cd != (iconv_t) -1);
|
||||||
|
+
|
||||||
|
+ /* First call to iconv should alter internal state.
|
||||||
|
+ Now, JISX0201_Kana_set is selected and
|
||||||
|
+ state value != ASCII_set. */
|
||||||
|
+ TEST_VERIFY (iconv (cd, &inbuf, &inleft, &outbuf, &outleft) != (size_t) -1);
|
||||||
|
+
|
||||||
|
+ /* No bytes should have been added to
|
||||||
|
+ the output buffer at this point. */
|
||||||
|
+ TEST_VERIFY (outbuf == out);
|
||||||
|
+ TEST_VERIFY (outleft == sizeof (out));
|
||||||
|
+
|
||||||
|
+ /* Second call shall emit spurious NUL character in unpatched glibc. */
|
||||||
|
+ TEST_VERIFY (iconv (cd, NULL, NULL, &outbuf, &outleft) != (size_t) -1);
|
||||||
|
+
|
||||||
|
+ /* No characters are expected to be produced. */
|
||||||
|
+ TEST_VERIFY (outbuf == out);
|
||||||
|
+ TEST_VERIFY (outleft == sizeof (out));
|
||||||
|
+
|
||||||
|
+ TEST_VERIFY_EXIT (iconv_close (cd) != -1);
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+#include <support/test-driver.c>
|
||||||
|
diff --git a/iconvdata/iso-2022-jp-3.c b/iconvdata/iso-2022-jp-3.c
|
||||||
|
index 047fab8e8dfbde7e..a2b33b171e56392a 100644
|
||||||
|
--- a/iconvdata/iso-2022-jp-3.c
|
||||||
|
+++ b/iconvdata/iso-2022-jp-3.c
|
||||||
|
@@ -1,5 +1,6 @@
|
||||||
|
/* Conversion module for ISO-2022-JP-3.
|
||||||
|
- Copyright (C) 1998-2018 Free Software Foundation, Inc.
|
||||||
|
+ Copyright (C) 1998-2021 Free Software Foundation, Inc.
|
||||||
|
+ Copyright (C) The GNU Toolchain Authors.
|
||||||
|
This file is part of the GNU C Library.
|
||||||
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998,
|
||||||
|
and Bruno Haible <bruno@clisp.org>, 2002.
|
||||||
|
@@ -81,20 +82,31 @@ enum
|
||||||
|
the output state to the initial state. This has to be done during the
|
||||||
|
flushing. */
|
||||||
|
#define EMIT_SHIFT_TO_INIT \
|
||||||
|
- if (data->__statep->__count != ASCII_set) \
|
||||||
|
+ if ((data->__statep->__count & ~7) != ASCII_set) \
|
||||||
|
{ \
|
||||||
|
if (FROM_DIRECTION) \
|
||||||
|
{ \
|
||||||
|
- if (__glibc_likely (outbuf + 4 <= outend)) \
|
||||||
|
+ uint32_t ch = data->__statep->__count >> 6; \
|
||||||
|
+ \
|
||||||
|
+ if (__glibc_unlikely (ch != 0)) \
|
||||||
|
{ \
|
||||||
|
- /* Write out the last character. */ \
|
||||||
|
- *((uint32_t *) outbuf) = data->__statep->__count >> 6; \
|
||||||
|
- outbuf += sizeof (uint32_t); \
|
||||||
|
- data->__statep->__count = ASCII_set; \
|
||||||
|
+ if (__glibc_likely (outbuf + 4 <= outend)) \
|
||||||
|
+ { \
|
||||||
|
+ /* Write out the last character. */ \
|
||||||
|
+ put32u (outbuf, ch); \
|
||||||
|
+ outbuf += 4; \
|
||||||
|
+ data->__statep->__count &= 7; \
|
||||||
|
+ data->__statep->__count |= ASCII_set; \
|
||||||
|
+ } \
|
||||||
|
+ else \
|
||||||
|
+ /* We don't have enough room in the output buffer. */ \
|
||||||
|
+ status = __GCONV_FULL_OUTPUT; \
|
||||||
|
} \
|
||||||
|
else \
|
||||||
|
- /* We don't have enough room in the output buffer. */ \
|
||||||
|
- status = __GCONV_FULL_OUTPUT; \
|
||||||
|
+ { \
|
||||||
|
+ data->__statep->__count &= 7; \
|
||||||
|
+ data->__statep->__count |= ASCII_set; \
|
||||||
|
+ } \
|
||||||
|
} \
|
||||||
|
else \
|
||||||
|
{ \
|
||||||
54
SOURCES/glibc-rh2036955.patch
Normal file
54
SOURCES/glibc-rh2036955.patch
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
commit e5fa62b8db546f8792ec9e5c61e6419f4f8e3f4d
|
||||||
|
Author: Wilco Dijkstra <wdijkstr@arm.com>
|
||||||
|
Date: Thu Jan 6 14:36:28 2022 +0000
|
||||||
|
|
||||||
|
AArch64: Check for SVE in ifuncs [BZ #28744]
|
||||||
|
|
||||||
|
Add a check for SVE in the A64FX ifuncs for memcpy, memset and memmove.
|
||||||
|
This fixes BZ #28744.
|
||||||
|
|
||||||
|
Conflicts:
|
||||||
|
sysdeps/aarch64/multiarch/memcpy.c
|
||||||
|
sysdeps/aarch64/multiarch/memmove.c
|
||||||
|
sysdeps/aarch64/multiarch/memset.c
|
||||||
|
(IFUNC resolver differences in the backport.)
|
||||||
|
|
||||||
|
diff --git a/sysdeps/aarch64/multiarch/memcpy.c b/sysdeps/aarch64/multiarch/memcpy.c
|
||||||
|
index e0313c42e82a7b86..a6ebeb06d3bda00f 100644
|
||||||
|
--- a/sysdeps/aarch64/multiarch/memcpy.c
|
||||||
|
+++ b/sysdeps/aarch64/multiarch/memcpy.c
|
||||||
|
@@ -44,7 +44,7 @@ libc_ifunc (__libc_memcpy,
|
||||||
|
: (IS_THUNDERX2 (midr) || IS_THUNDERX2PA (midr)
|
||||||
|
? __memcpy_thunderx2
|
||||||
|
# if HAVE_AARCH64_SVE_ASM
|
||||||
|
- : (IS_A64FX (midr)
|
||||||
|
+ : (IS_A64FX (midr) && sve
|
||||||
|
? __memcpy_a64fx
|
||||||
|
: __memcpy_generic)))));
|
||||||
|
# else
|
||||||
|
diff --git a/sysdeps/aarch64/multiarch/memmove.c b/sysdeps/aarch64/multiarch/memmove.c
|
||||||
|
index d96612b9cf7c3a4e..bea72b3eddde54c0 100644
|
||||||
|
--- a/sysdeps/aarch64/multiarch/memmove.c
|
||||||
|
+++ b/sysdeps/aarch64/multiarch/memmove.c
|
||||||
|
@@ -41,7 +41,7 @@ libc_ifunc (__libc_memmove,
|
||||||
|
: (IS_FALKOR (midr) || IS_PHECDA (midr)
|
||||||
|
? __memmove_falkor
|
||||||
|
# if HAVE_AARCH64_SVE_ASM
|
||||||
|
- : (IS_A64FX (midr)
|
||||||
|
+ : (IS_A64FX (midr) && sve
|
||||||
|
? __memmove_a64fx
|
||||||
|
: __memmove_generic))));
|
||||||
|
# else
|
||||||
|
diff --git a/sysdeps/aarch64/multiarch/memset.c b/sysdeps/aarch64/multiarch/memset.c
|
||||||
|
index 2c8cc72bb0b18474..e7bd412377533f18 100644
|
||||||
|
--- a/sysdeps/aarch64/multiarch/memset.c
|
||||||
|
+++ b/sysdeps/aarch64/multiarch/memset.c
|
||||||
|
@@ -38,7 +38,7 @@ libc_ifunc (__libc_memset,
|
||||||
|
((IS_FALKOR (midr) || IS_PHECDA (midr)) && zva_size == 64
|
||||||
|
? __memset_falkor
|
||||||
|
# if HAVE_AARCH64_SVE_ASM
|
||||||
|
- : (IS_A64FX (midr)
|
||||||
|
+ : (IS_A64FX (midr) && sve
|
||||||
|
? __memset_a64fx
|
||||||
|
: __memset_generic)));
|
||||||
|
# else
|
||||||
@ -1,6 +1,6 @@
|
|||||||
%define glibcsrcdir glibc-2.28
|
%define glibcsrcdir glibc-2.28
|
||||||
%define glibcversion 2.28
|
%define glibcversion 2.28
|
||||||
%define glibcrelease 181%{?dist}
|
%define glibcrelease 184%{?dist}
|
||||||
# Pre-release tarballs are pulled in from git using a command that is
|
# Pre-release tarballs are pulled in from git using a command that is
|
||||||
# effectively:
|
# effectively:
|
||||||
#
|
#
|
||||||
@ -820,6 +820,10 @@ Patch642: glibc-rh2023420-4.patch
|
|||||||
Patch643: glibc-rh2023420-5.patch
|
Patch643: glibc-rh2023420-5.patch
|
||||||
Patch644: glibc-rh2023420-6.patch
|
Patch644: glibc-rh2023420-6.patch
|
||||||
Patch645: glibc-rh2023420-7.patch
|
Patch645: glibc-rh2023420-7.patch
|
||||||
|
Patch646: glibc-rh2033648-1.patch
|
||||||
|
Patch647: glibc-rh2033648-2.patch
|
||||||
|
Patch648: glibc-rh2036955.patch
|
||||||
|
Patch649: glibc-rh2033655.patch
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
# Continued list of core "glibc" package information:
|
# Continued list of core "glibc" package information:
|
||||||
@ -2809,6 +2813,15 @@ fi
|
|||||||
%files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
|
%files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jan 7 2022 Florian Weimer <fweimer@redhat.com> - 2.28-184
|
||||||
|
- Conversion from ISO-2022-JP-3 may emit spurious NUL character (#2033655)
|
||||||
|
|
||||||
|
* Fri Jan 7 2022 Florian Weimer <fweimer@redhat.com> - 2.28-183
|
||||||
|
- aarch64: A64FX optimizations break "sve=off" guest mode (#2036955)
|
||||||
|
|
||||||
|
* Fri Jan 7 2022 Patsy Griffin <patsy@redhat.com> - 2.28-182
|
||||||
|
- Handle truncated timezones from tzcode-2021d and later. (#2033648)
|
||||||
|
|
||||||
* Tue Jan 4 2022 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.28-181
|
* Tue Jan 4 2022 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.28-181
|
||||||
- Weaken dependency of glibc on glibc-gconv-extra (#2015768)
|
- Weaken dependency of glibc on glibc-gconv-extra (#2015768)
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user