diff --git a/glibc.spec b/glibc.spec index 73a93b6d24003ab5dfb90695e2307e768859b74e..275f792ce958fdd626a2ba1a727e34b1198624f0 100644 --- a/glibc.spec +++ b/glibc.spec @@ -65,7 +65,7 @@ ############################################################################## Name: glibc Version: 2.34 -Release: 17 +Release: 18 Summary: The GNU libc libraries License: %{all_license} URL: http://www.gnu.org/software/glibc/ @@ -117,6 +117,7 @@ Patch30: x86-64-Optimize-load-of-all-bits-set-into-ZMM-regist.patch Patch31: mtrace-Fix-output-with-PIE-and-ASLR-BZ-22716.patch Patch32: rtld-copy-terminating-null-in-tunables_strdup-bug-28.patch Patch33: Use-__executable_start-as-the-lowest-address-for-pro.patch +Patch34: x86-64-Use-testl-to-check-__x86_string_control.patch #Patch9000: turn-REP_STOSB_THRESHOLD-from-2k-to-1M.patch Patch9001: delete-no-hard-link-to-avoid-all_language-package-to.patch @@ -1306,6 +1307,10 @@ fi %endif %changelog +* Thu Oct 28 2021 Qingqing Li - 2.34-18 +- use testl instead of andl to check __x86_string_control to + avoid updating __x86_string_control + * Tue Oct 26 2021 Yang Yanchao - 2.34-17 - Show more debugging information during testsuite diff --git a/x86-64-Use-testl-to-check-__x86_string_control.patch b/x86-64-Use-testl-to-check-__x86_string_control.patch new file mode 100644 index 0000000000000000000000000000000000000000..363930e209a2b3400809eefbe647cf306b263126 --- /dev/null +++ b/x86-64-Use-testl-to-check-__x86_string_control.patch @@ -0,0 +1,38 @@ +From 3c8b9879cab6d41787bc5b14c1748f62fd6d0e5f Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Sat, 28 Aug 2021 06:10:38 -0700 +Subject: [PATCH] x86-64: Use testl to check __x86_string_control + +Use testl, instead of andl, to check __x86_string_control to avoid +updating __x86_string_control. + +Reviewed-by: Carlos O'Donell +--- + sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S b/sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S +index 9f02624..abde843 100644 +--- a/sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S ++++ b/sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S +@@ -325,7 +325,7 @@ L(movsb): + /* Avoid slow backward REP MOVSB. */ + jb L(more_8x_vec_backward) + # if AVOID_SHORT_DISTANCE_REP_MOVSB +- andl $X86_STRING_CONTROL_AVOID_SHORT_DISTANCE_REP_MOVSB, __x86_string_control(%rip) ++ testl $X86_STRING_CONTROL_AVOID_SHORT_DISTANCE_REP_MOVSB, __x86_string_control(%rip) + jz 3f + movq %rdi, %rcx + subq %rsi, %rcx +@@ -333,7 +333,7 @@ L(movsb): + # endif + 1: + # if AVOID_SHORT_DISTANCE_REP_MOVSB +- andl $X86_STRING_CONTROL_AVOID_SHORT_DISTANCE_REP_MOVSB, __x86_string_control(%rip) ++ testl $X86_STRING_CONTROL_AVOID_SHORT_DISTANCE_REP_MOVSB, __x86_string_control(%rip) + jz 3f + movq %rsi, %rcx + subq %rdi, %rcx +-- +1.8.3.1 +