Ubuntu
glibc package

Merge ~xnox/ubuntu/+source/glibc:focal-power10 into ~ubuntu-core-dev/ubuntu/+source/glibc:ubuntu/focal

  1. Git
  2. lp:~xnox/ubuntu/+source/glibc
  3. focal-power10
  4. Merge into ubuntu/focal
Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 94595c7061d99a99d8d36d21fc7cd7c8c7e00689
Proposed branch: ~xnox/ubuntu/+source/glibc:focal-power10
Merge into: ~ubuntu-core-dev/ubuntu/+source/glibc:ubuntu/focal
Diff against target: 470 lines (+425/-0)
6 files modified
debian/changelog (+4/-0)
debian/patches/powerpc/146fea07640387c78e334933de24b6353e1f0eba.patch (+161/-0)
debian/patches/powerpc/ae725e3f9cb4e1eb825ebe1d55241c98c2ea32f1.patch (+42/-0)
debian/patches/powerpc/d2ba3677da7a785556fcd708404d8e049b1c063b.patch (+183/-0)
debian/patches/powerpc/f6add169c89bbdd139a2eb845686127ead5799cd.patch (+31/-0)
debian/patches/series (+4/-0)
Reviewer Review Type Date Requested Status
Balint Reczey Pending
Review via email: mp+389404@code.launchpad.net

Commit message

debian/patches/powerpc: Cherrypick upstream patches to support POWER10 optimized library loading. LP: #1887989

To post a comment you must log in.
Revision history for this message
Balint Reczey (rbalint) wrote :

Looks good, I do a test build in https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4017/+packages then merge it, thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index e03e93b..4059246 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,10 @@ glibc (2.31-0ubuntu9.1) UNRELEASED; urgency=medium
15 * Fall back to calling nanosleep syscall when __clock_nanosleep returns EINVAL15 * Fall back to calling nanosleep syscall when __clock_nanosleep returns EINVAL
16 (LP: #1871129)16 (LP: #1871129)
1717
18 [ Dimitri John Ledkov ]
19 * debian/patches/powerpc: Cherrypick upstream patches to support POWER10
20 optimized library loading. LP: #1887989
21
18 -- Balint Reczey <rbalint@ubuntu.com> Mon, 03 Aug 2020 19:44:44 +020022 -- Balint Reczey <rbalint@ubuntu.com> Mon, 03 Aug 2020 19:44:44 +0200
1923
20glibc (2.31-0ubuntu9) focal; urgency=medium24glibc (2.31-0ubuntu9) focal; urgency=medium
diff --git a/debian/patches/powerpc/146fea07640387c78e334933de24b6353e1f0eba.patch b/debian/patches/powerpc/146fea07640387c78e334933de24b6353e1f0eba.patch
21new file mode 10064425new file mode 100644
index 0000000..7b7611f
--- /dev/null
+++ b/debian/patches/powerpc/146fea07640387c78e334933de24b6353e1f0eba.patch
@@ -0,0 +1,161 @@
1From 146fea07640387c78e334933de24b6353e1f0eba Mon Sep 17 00:00:00 2001
2From: "Paul E. Murphy" <murphyp@linux.vnet.ibm.com>
3Date: Fri, 8 May 2020 08:27:56 -0500
4Subject: [PATCH] powerpc: Automatic CPU detection in preconfigure
5
6Added a check to detect the CPU value in preconfigure, so that glibc is
7built with the correct --with-cpu value. And move existing checks into
8preconfigure.ac.
9
10Co-Authored-By: Carlos Eduardo Seo <cseo@linux.vnet.ibm.com>
11Co-Authored-By: Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>
12---
13 sysdeps/powerpc/preconfigure | 62 +++++++++++++++++++++++++++++----
14 sysdeps/powerpc/preconfigure.ac | 58 ++++++++++++++++++++++++++++++
15 2 files changed, 113 insertions(+), 7 deletions(-)
16 create mode 100644 sysdeps/powerpc/preconfigure.ac
17
18diff --git a/sysdeps/powerpc/preconfigure b/sysdeps/powerpc/preconfigure
19index a0ea745bb4..deac5a41e2 100644
20--- a/sysdeps/powerpc/preconfigure
21+++ b/sysdeps/powerpc/preconfigure
22@@ -1,4 +1,5 @@
23-# preconfigure fragment for powerpc.
24+# This file is generated from configure.ac by Autoconf. DO NOT EDIT!
25+ # Local preconfigure fragment for sysdeps/powerpc
26
27 case "$machine" in
28 powerpc64le)
29@@ -13,12 +14,59 @@ powerpc*)
30 case "$host_os" in
31 *gnuspe*)
32 # SPE support was dropped in glibc 2.30.
33- # We can't use AC_MSG_ERROR here.
34- # The parent script is in the middle of printing the
35- # "checking for sysdeps preconfigure fragments" line.
36- echo >&2
37- echo "Host system type $host is no longer supported." >&2
38- exit 1
39+ as_fn_error $? "Host system type $host is no longer supported." "$LINENO" 5
40+ ;;
41+ esac
42+ ;;
43+esac
44+
45+# Lets ask the compiler which Power processor we've got, in case the user did
46+# not choose a --with-cpu value. Scan a trivial generated assembly program
47+# and scrape the first
48+# .machine <machine>
49+# or
50+# .ascii "-mcpu=<machine>"
51+# directive which shows up, and try using it.
52+case "${machine}:${submachine}" in
53+*powerpc*:)
54+ archcpu=`echo "int foo () { return 0; }" \
55+ | $CC $CFLAGS $CPPFLAGS -S -frecord-gcc-switches -xc -o - - \
56+ | grep -E "mcpu=|.machine" -m 1 \
57+ | sed -e "s/.*machine //" -e "s/.*mcpu=\(.*\)\"/\1/"`
58+ # Note if you add patterns here you must ensure that an appropriate
59+ # directory exists in sysdeps/powerpc. Likewise, if we find a
60+ # cpu, don't let the generic configure append extra compiler options.
61+ case "$archcpu" in
62+ 405fp|440fp|464fp|476fp)
63+ submachine=${archcpu%fp}
64+ if ${libc_cv_cc_submachine+:} false; then :
65+ $as_echo_n "(cached) " >&6
66+else
67+ libc_cv_cc_submachine=""
68+fi
69+
70+ ;;
71+ 405|440|464|476)
72+ submachine=${archcpu}
73+ if ${libc_cv_cc_submachine+:} false; then :
74+ $as_echo_n "(cached) " >&6
75+else
76+ libc_cv_cc_submachine=""
77+fi
78+
79+ ;;
80+
81+ a2|970|power[4-9]|power5x|power6+)
82+ submachine=${archcpu}
83+ if ${libc_cv_cc_submachine+:} false; then :
84+ $as_echo_n "(cached) " >&6
85+else
86+ libc_cv_cc_submachine=""
87+fi
88+
89+ ;;
90+ *)
91+ # We couldn't figure it out, assume none
92 ;;
93 esac
94 ;;
95diff --git a/sysdeps/powerpc/preconfigure.ac b/sysdeps/powerpc/preconfigure.ac
96new file mode 100644
97index 0000000000..e6a5ae93a5
98--- /dev/null
99+++ b/sysdeps/powerpc/preconfigure.ac
100@@ -0,0 +1,58 @@
101+GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
102+# Local preconfigure fragment for sysdeps/powerpc
103+
104+case "$machine" in
105+powerpc64le)
106+ base_machine=powerpc machine=powerpc/powerpc64/le
107+ ;;
108+powerpc64*)
109+ base_machine=powerpc machine=powerpc/powerpc64/be
110+ ;;
111+powerpc*)
112+ base_machine=powerpc machine=powerpc/powerpc32
113+ with_fp_cond="!defined __NO_FPRS__"
114+ case "$host_os" in
115+ *gnuspe*)
116+ # SPE support was dropped in glibc 2.30.
117+ AC_MSG_ERROR([Host system type $host is no longer supported.])
118+ ;;
119+ esac
120+ ;;
121+esac
122+
123+# Lets ask the compiler which Power processor we've got, in case the user did
124+# not choose a --with-cpu value. Scan a trivial generated assembly program
125+# and scrape the first
126+# .machine <machine>
127+# or
128+# .ascii "-mcpu=<machine>"
129+# directive which shows up, and try using it.
130+case "${machine}:${submachine}" in
131+*powerpc*:)
132+ archcpu=`echo "int foo () { return 0; }" \
133+ | $CC $CFLAGS $CPPFLAGS -S -frecord-gcc-switches -xc -o - - \
134+ | grep -E "mcpu=|[.]machine" -m 1 \
135+ | sed -e "s/.*machine //" -e "s/.*mcpu=\(.*\)\"/\1/"`
136+ # Note if you add patterns here you must ensure that an appropriate
137+ # directory exists in sysdeps/powerpc. Likewise, if we find a
138+ # cpu, don't let the generic configure append extra compiler options.
139+ case "$archcpu" in
140+ 405fp|440fp|464fp|476fp)
141+ submachine=${archcpu%fp}
142+ AC_CACHE_VAL(libc_cv_cc_submachine,libc_cv_cc_submachine="")
143+ ;;
144+ 405|440|464|476)
145+ submachine=${archcpu}
146+ AC_CACHE_VAL(libc_cv_cc_submachine,libc_cv_cc_submachine="")
147+ ;;
148+
149+ a2|970|power[[4-9]]|power5x|power6+)
150+ submachine=${archcpu}
151+ AC_CACHE_VAL(libc_cv_cc_submachine,libc_cv_cc_submachine="")
152+ ;;
153+ *)
154+ # We couldn't figure it out, assume none
155+ ;;
156+ esac
157+ ;;
158+esac
159--
1602.27.0
161
diff --git a/debian/patches/powerpc/ae725e3f9cb4e1eb825ebe1d55241c98c2ea32f1.patch b/debian/patches/powerpc/ae725e3f9cb4e1eb825ebe1d55241c98c2ea32f1.patch
0new file mode 100644162new file mode 100644
index 0000000..55220e4
--- /dev/null
+++ b/debian/patches/powerpc/ae725e3f9cb4e1eb825ebe1d55241c98c2ea32f1.patch
@@ -0,0 +1,42 @@
1From ae725e3f9cb4e1eb825ebe1d55241c98c2ea32f1 Mon Sep 17 00:00:00 2001
2From: Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com>
3Date: Mon, 15 Jun 2020 11:15:57 -0300
4Subject: [PATCH] powerpc: Add new hwcap values
5
6Linux commit ID ee988c11acf6f9464b7b44e9a091bf6afb3b3a49 reserved 2 new
7bits in AT_HWCAP2:
8 - PPC_FEATURE2_ARCH_3_1 indicates the availability of the POWER ISA
9 3.1;
10 - PPC_FEATURE2_MMA indicates the availability of the Matrix-Multiply
11 Assist facility.
12---
13 sysdeps/powerpc/bits/hwcap.h | 2 ++
14 sysdeps/powerpc/dl-procinfo.c | 2 +-
15 2 files changed, 3 insertions(+), 1 deletion(-)
16
17diff --git a/sysdeps/powerpc/bits/hwcap.h b/sysdeps/powerpc/bits/hwcap.h
18index 4a5a7bcded..e8f3fdea92 100644
19--- a/sysdeps/powerpc/bits/hwcap.h
20+++ b/sysdeps/powerpc/bits/hwcap.h
21@@ -74,3 +74,5 @@
22 #define PPC_FEATURE2_SCV 0x00100000 /* scv syscall. */
23 #define PPC_FEATURE2_HTM_NO_SUSPEND 0x00080000 /* TM without suspended
24 state. */
25+#define PPC_FEATURE2_ARCH_3_1 0x00040000 /* ISA 3.1. */
26+#define PPC_FEATURE2_MMA 0x00020000 /* Matrix-Multiply Assist. */
27diff --git a/sysdeps/powerpc/dl-procinfo.c b/sysdeps/powerpc/dl-procinfo.c
28index 7a7d93dd0a..8dc07728f0 100644
29--- a/sysdeps/powerpc/dl-procinfo.c
30+++ b/sysdeps/powerpc/dl-procinfo.c
31@@ -77,7 +77,7 @@ PROCINFO_CLASS const char _dl_powerpc_cap_flags[64][15]
32 "", "", "", "",
33 "", "", "", "",
34 "", "", "", "",
35- "", "", "", "htm-no-suspend",
36+ "", "mma", "arch_3_1", "htm-no-suspend",
37 "scv", "darn", "ieee128", "arch_3_00",
38 "htm-nosc", "vcrypto", "tar", "isel",
39 "ebb", "dscr", "htm", "arch_2_07",
40--
412.27.0
42
diff --git a/debian/patches/powerpc/d2ba3677da7a785556fcd708404d8e049b1c063b.patch b/debian/patches/powerpc/d2ba3677da7a785556fcd708404d8e049b1c063b.patch
0new file mode 10064443new file mode 100644
index 0000000..c052433
--- /dev/null
+++ b/debian/patches/powerpc/d2ba3677da7a785556fcd708404d8e049b1c063b.patch
@@ -0,0 +1,183 @@
1From d2ba3677da7a785556fcd708404d8e049b1c063b Mon Sep 17 00:00:00 2001
2From: Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com>
3Date: Wed, 24 Jun 2020 18:04:41 -0300
4Subject: [PATCH] powerpc: Add support for POWER10
5
61. Add the directories to hold POWER10 files.
7
82. Add support to select POWER10 libraries based on AT_PLATFORM.
9
103. Let submachine=power10 be set automatically.
11---
12 sysdeps/powerpc/dl-procinfo.h | 11 ++++++++++-
13 sysdeps/powerpc/powerpc32/power10/Implies | 2 ++
14 .../powerpc/powerpc32/power10/fpu/multiarch/Implies | 1 +
15 sysdeps/powerpc/powerpc32/power10/multiarch/Implies | 1 +
16 sysdeps/powerpc/powerpc64/be/power10/Implies | 2 ++
17 sysdeps/powerpc/powerpc64/be/power10/fpu/Implies | 1 +
18 .../powerpc64/be/power10/fpu/multiarch/Implies | 1 +
19 .../powerpc/powerpc64/be/power10/multiarch/Implies | 1 +
20 sysdeps/powerpc/powerpc64/le/power10/Implies | 2 ++
21 sysdeps/powerpc/powerpc64/le/power10/fpu/Implies | 1 +
22 .../powerpc64/le/power10/fpu/multiarch/Implies | 1 +
23 .../powerpc/powerpc64/le/power10/multiarch/Implies | 1 +
24 sysdeps/powerpc/preconfigure | 2 +-
25 sysdeps/powerpc/preconfigure.ac | 2 +-
26 14 files changed, 26 insertions(+), 3 deletions(-)
27 create mode 100644 sysdeps/powerpc/powerpc32/power10/Implies
28 create mode 100644 sysdeps/powerpc/powerpc32/power10/fpu/multiarch/Implies
29 create mode 100644 sysdeps/powerpc/powerpc32/power10/multiarch/Implies
30 create mode 100644 sysdeps/powerpc/powerpc64/be/power10/Implies
31 create mode 100644 sysdeps/powerpc/powerpc64/be/power10/fpu/Implies
32 create mode 100644 sysdeps/powerpc/powerpc64/be/power10/fpu/multiarch/Implies
33 create mode 100644 sysdeps/powerpc/powerpc64/be/power10/multiarch/Implies
34 create mode 100644 sysdeps/powerpc/powerpc64/le/power10/Implies
35 create mode 100644 sysdeps/powerpc/powerpc64/le/power10/fpu/Implies
36 create mode 100644 sysdeps/powerpc/powerpc64/le/power10/fpu/multiarch/Implies
37 create mode 100644 sysdeps/powerpc/powerpc64/le/power10/multiarch/Implies
38
39diff --git a/sysdeps/powerpc/dl-procinfo.h b/sysdeps/powerpc/dl-procinfo.h
40index 9ae85f46ec..497dc568e9 100644
41--- a/sysdeps/powerpc/dl-procinfo.h
42+++ b/sysdeps/powerpc/dl-procinfo.h
43@@ -37,7 +37,7 @@
44 #define HWCAP_IMPORTANT (PPC_FEATURE_HAS_ALTIVEC \
45 + PPC_FEATURE_HAS_DFP)
46
47-#define _DL_PLATFORMS_COUNT 15
48+#define _DL_PLATFORMS_COUNT 16
49
50 #define _DL_FIRST_PLATFORM 32
51 /* Mask to filter out platforms. */
52@@ -60,6 +60,7 @@
53 #define PPC_PLATFORM_PPC476 12
54 #define PPC_PLATFORM_POWER8 13
55 #define PPC_PLATFORM_POWER9 14
56+#define PPC_PLATFORM_POWER10 15
57
58 static inline const char *
59 __attribute__ ((unused))
60@@ -91,6 +92,14 @@ _dl_string_platform (const char *str)
61 str += 5;
62 switch (*str)
63 {
64+ case '1':
65+ if (str[1] == '0')
66+ {
67+ ret = _DL_FIRST_PLATFORM + PPC_PLATFORM_POWER10;
68+ }
69+ else
70+ return -1;
71+ break;
72 case '4':
73 ret = _DL_FIRST_PLATFORM + PPC_PLATFORM_POWER4;
74 break;
75diff --git a/sysdeps/powerpc/powerpc32/power10/Implies b/sysdeps/powerpc/powerpc32/power10/Implies
76new file mode 100644
77index 0000000000..b298aca71f
78--- /dev/null
79+++ b/sysdeps/powerpc/powerpc32/power10/Implies
80@@ -0,0 +1,2 @@
81+powerpc/powerpc32/power9/fpu
82+powerpc/powerpc32/power9
83diff --git a/sysdeps/powerpc/powerpc32/power10/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc32/power10/fpu/multiarch/Implies
84new file mode 100644
85index 0000000000..1ffddd1cda
86--- /dev/null
87+++ b/sysdeps/powerpc/powerpc32/power10/fpu/multiarch/Implies
88@@ -0,0 +1 @@
89+powerpc/powerpc32/power9/fpu/multiarch
90diff --git a/sysdeps/powerpc/powerpc32/power10/multiarch/Implies b/sysdeps/powerpc/powerpc32/power10/multiarch/Implies
91new file mode 100644
92index 0000000000..46363b5207
93--- /dev/null
94+++ b/sysdeps/powerpc/powerpc32/power10/multiarch/Implies
95@@ -0,0 +1 @@
96+powerpc/powerpc32/power9/multiarch
97diff --git a/sysdeps/powerpc/powerpc64/be/power10/Implies b/sysdeps/powerpc/powerpc64/be/power10/Implies
98new file mode 100644
99index 0000000000..5aea9bc144
100--- /dev/null
101+++ b/sysdeps/powerpc/powerpc64/be/power10/Implies
102@@ -0,0 +1,2 @@
103+powerpc/powerpc64/be/power9/fpu
104+powerpc/powerpc64/be/power9
105diff --git a/sysdeps/powerpc/powerpc64/be/power10/fpu/Implies b/sysdeps/powerpc/powerpc64/be/power10/fpu/Implies
106new file mode 100644
107index 0000000000..19b2a318e2
108--- /dev/null
109+++ b/sysdeps/powerpc/powerpc64/be/power10/fpu/Implies
110@@ -0,0 +1 @@
111+powerpc/powerpc64/be/power9/fpu
112diff --git a/sysdeps/powerpc/powerpc64/be/power10/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/be/power10/fpu/multiarch/Implies
113new file mode 100644
114index 0000000000..a336feb55b
115--- /dev/null
116+++ b/sysdeps/powerpc/powerpc64/be/power10/fpu/multiarch/Implies
117@@ -0,0 +1 @@
118+powerpc/powerpc64/be/power9/fpu/multiarch
119diff --git a/sysdeps/powerpc/powerpc64/be/power10/multiarch/Implies b/sysdeps/powerpc/powerpc64/be/power10/multiarch/Implies
120new file mode 100644
121index 0000000000..b4c0f0a58a
122--- /dev/null
123+++ b/sysdeps/powerpc/powerpc64/be/power10/multiarch/Implies
124@@ -0,0 +1 @@
125+powerpc/powerpc64/be/power9/multiarch
126diff --git a/sysdeps/powerpc/powerpc64/le/power10/Implies b/sysdeps/powerpc/powerpc64/le/power10/Implies
127new file mode 100644
128index 0000000000..9e1b787348
129--- /dev/null
130+++ b/sysdeps/powerpc/powerpc64/le/power10/Implies
131@@ -0,0 +1,2 @@
132+powerpc/powerpc64/le/power9/fpu
133+powerpc/powerpc64/le/power9
134diff --git a/sysdeps/powerpc/powerpc64/le/power10/fpu/Implies b/sysdeps/powerpc/powerpc64/le/power10/fpu/Implies
135new file mode 100644
136index 0000000000..1b3525a0d7
137--- /dev/null
138+++ b/sysdeps/powerpc/powerpc64/le/power10/fpu/Implies
139@@ -0,0 +1 @@
140+powerpc/powerpc64/le/power9/fpu
141diff --git a/sysdeps/powerpc/powerpc64/le/power10/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/le/power10/fpu/multiarch/Implies
142new file mode 100644
143index 0000000000..189beb801d
144--- /dev/null
145+++ b/sysdeps/powerpc/powerpc64/le/power10/fpu/multiarch/Implies
146@@ -0,0 +1 @@
147+powerpc/powerpc64/le/power9/fpu/multiarch
148diff --git a/sysdeps/powerpc/powerpc64/le/power10/multiarch/Implies b/sysdeps/powerpc/powerpc64/le/power10/multiarch/Implies
149new file mode 100644
150index 0000000000..e6e5fc887e
151--- /dev/null
152+++ b/sysdeps/powerpc/powerpc64/le/power10/multiarch/Implies
153@@ -0,0 +1 @@
154+powerpc/powerpc64/le/power9/multiarch
155diff --git a/sysdeps/powerpc/preconfigure b/sysdeps/powerpc/preconfigure
156index deac5a41e2..dfe8e20399 100644
157--- a/sysdeps/powerpc/preconfigure
158+++ b/sysdeps/powerpc/preconfigure
159@@ -56,7 +56,7 @@ fi
160
161 ;;
162
163- a2|970|power[4-9]|power5x|power6+)
164+ a2|970|power[4-9]|power5x|power6+|power10)
165 submachine=${archcpu}
166 if ${libc_cv_cc_submachine+:} false; then :
167 $as_echo_n "(cached) " >&6
168diff --git a/sysdeps/powerpc/preconfigure.ac b/sysdeps/powerpc/preconfigure.ac
169index e6a5ae93a5..6c63bd8257 100644
170--- a/sysdeps/powerpc/preconfigure.ac
171+++ b/sysdeps/powerpc/preconfigure.ac
172@@ -46,7 +46,7 @@ case "${machine}:${submachine}" in
173 AC_CACHE_VAL(libc_cv_cc_submachine,libc_cv_cc_submachine="")
174 ;;
175
176- a2|970|power[[4-9]]|power5x|power6+)
177+ a2|970|power[[4-9]]|power5x|power6+|power10)
178 submachine=${archcpu}
179 AC_CACHE_VAL(libc_cv_cc_submachine,libc_cv_cc_submachine="")
180 ;;
181--
1822.27.0
183
diff --git a/debian/patches/powerpc/f6add169c89bbdd139a2eb845686127ead5799cd.patch b/debian/patches/powerpc/f6add169c89bbdd139a2eb845686127ead5799cd.patch
0new file mode 100644184new file mode 100644
index 0000000..308ec72
--- /dev/null
+++ b/debian/patches/powerpc/f6add169c89bbdd139a2eb845686127ead5799cd.patch
@@ -0,0 +1,31 @@
1From f6add169c89bbdd139a2eb845686127ead5799cd Mon Sep 17 00:00:00 2001
2From: Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com>
3Date: Tue, 21 Jul 2020 18:01:39 -0300
4Subject: [PATCH] powerpc: Fix POWER10 selection
5
6Add a line that was missing from a previous commit.
7Without increasing str, the null-byte is not validated, and
8_dl_string_platform returns -1.
9
10Fixes: d2ba3677da7a ("powerpc: Add support for POWER10")
11
12Reviewed-by: Carlos O'Donell <carlos@redhat.com>
13---
14 sysdeps/powerpc/dl-procinfo.h | 1 +
15 1 file changed, 1 insertion(+)
16
17diff --git a/sysdeps/powerpc/dl-procinfo.h b/sysdeps/powerpc/dl-procinfo.h
18index 497dc568e9..f07500619a 100644
19--- a/sysdeps/powerpc/dl-procinfo.h
20+++ b/sysdeps/powerpc/dl-procinfo.h
21@@ -96,6 +96,7 @@ _dl_string_platform (const char *str)
22 if (str[1] == '0')
23 {
24 ret = _DL_FIRST_PLATFORM + PPC_PLATFORM_POWER10;
25+ str++;
26 }
27 else
28 return -1;
29--
302.27.0
31
diff --git a/debian/patches/series b/debian/patches/series
index 2c9bfac..f38e388 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -86,6 +86,10 @@ m68k/submitted-gcc34-seccomment.diff
86mips/submitted-rld_map.diff86mips/submitted-rld_map.diff
8787
88powerpc/local-powerpc8xx-dcbz.diff88powerpc/local-powerpc8xx-dcbz.diff
89powerpc/146fea07640387c78e334933de24b6353e1f0eba.patch
90powerpc/ae725e3f9cb4e1eb825ebe1d55241c98c2ea32f1.patch
91powerpc/d2ba3677da7a785556fcd708404d8e049b1c063b.patch
92powerpc/f6add169c89bbdd139a2eb845686127ead5799cd.patch
8993
90sh4/local-fpscr_values.diff94sh4/local-fpscr_values.diff
9195

Subscribers

People subscribed via source and target branches