Merge ~mwhudson/ubuntu/+source/glibc:patch-review-tool into ~ubuntu-core-dev/ubuntu/+source/glibc:ubuntu/jammy

[Michael Hudson-Doyle]

Add an overengineered tool to track which commits from the upstream release branch to include and use it to include just two commits for now.

diff --git a/debian/changelog b/debian/changelog
index 6d571f3..3db6c2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+glibc (2.35-0ubuntu4) UNRELEASED; urgency=medium
+
+  * debian/maint: add a script to manage backports of patches from upstream
+    maintenance branch.
+  * Cherry-pick patches from upstream maintenance branch:
+    - 0001-S390-Add-new-s390-platform-z16.patch
+    - 0002-powerpc-Fix-VSX-register-number-on-__strncpy_power9-.patch
+
+ -- Michael Hudson-Doyle <[e-mail]>  Tue, 05 Jul 2022 09:54:00 +1200
+
 glibc (2.35-0ubuntu3) jammy; urgency=medium
 
   * debian/rules.d/build.mk: build with --with-default-link=no.
diff --git a/debian/maint/review b/debian/maint/review
new file mode 100755
index 0000000..09c0394
--- /dev/null
+++ b/debian/maint/review
@@ -0,0 +1,673 @@
+#!/usr/bin/python3
+
+"""
+Stupidly overengineered script to help decide which commits to cherry-pick.
+
+glibc upstream maintains a release branch for each release
+(release/$VER/master) which gets backports of selected commits from
+the master branch. However, upstream's policy is just a little less
+conservative than feels appropriate for an SRU so I'm not comfortable
+just taking all updates from the branch (in particular, many of the
+commits that are being backported have not yet been part of a glibc
+release).
+
+This script is designed to help decide which patchsets to include in an
+upload. The decisions are recorded in a hopefully mostly-readable file
+state.txt alongside this file.  Patchsets can be in four states:
+
+ * NEW -- no decision has been made about this yet
+ * NO -- we have decided not to include this
+ * YES -- this is to be included
+ * LATER -- we will proably include this in a subsequent upload
+
+It has subcommands:
+
+ * debian/maint/review import
+ * debian/maint/review review
+ * debian/maint/review export
+ * debian/maint/review dch
+
+## import
+
+This scans the upstream release branch (assumed to be the 'origin'
+remote in the same repo) and adds any new ones to the state.txt
+file. It applies some heuristics to group commits into patchsets
+
+## review
+
+This is an interactive command that allows review of the commits in
+state.txt (and the most over-engineered part of all this). There are
+keypresses to allow navigation, moving, joining, splitting and
+reviewing patchsets (press 'h' to get started).
+
+## export
+
+This synchronizes debian/patches with state.txt.
+
+## dch
+
+This constructs a changelog entry for the newly added patches
+(i.e. ones that are not yet mentioned in the changelog).
+"""
+
+
+import attr
+import enum
+import os
+import pathlib
+import shutil
+import signal
+import subprocess
+import sys
+import termios
+import tempfile
+import tty
+import uuid
+from typing import List
+
+
+SCRIPT_DIR = pathlib.Path(__file__).resolve().parent
+SOURCE_DIR = SCRIPT_DIR.parent.parent
+STATE_FILE = SCRIPT_DIR.joinpath('state.txt')
+
+
+class ReviewState(enum.Enum):
+
+    NEW = "?"
+    NO = "N"
+    YES = "Y"
+    LATER = "L"
+
+
+@attr.s(auto_attribs=True)
+class PatchSet:
+    _state: "State" = None
+    index: int = -1
+
+    hashes: List[str] = attr.Factory(list)
+    messages: List[str] = attr.Factory(list)
+    bugs: List[str] = attr.Factory(list)
+    review_state: ReviewState = ReviewState.NEW
+    comment: str = ''
+    first_patch_name: str = ''
+
+    def prev(self):
+        if self.index == 0:
+            return None
+        return self._state[self.index - 1]
+
+    def next(self):
+        if self.index >= len(self._state) - 1:
+            return None
+        return self._state[self.index + 1]
+
+
+class State:
+
+    def __init__(self):
+        self._patchsets = []
+
+    def __iter__(self):
+        return iter(self._patchsets)
+
+    def __len__(self):
+        return len(self._patchsets)
+
+    def __getitem__(self, thing):
+        return self._patchsets[thing]
+
+    def add(self, patchset, index=None):
+        patchset._state = self
+        if index is None:
+            patchset.index = len(self._patchsets)
+            self._patchsets.append(patchset)
+        else:
+            patchset.index = index
+            self._patchsets.insert(index, patchset)
+            for p2 in self._patchsets[index+1:]:
+                p2.index += 1
+
+    def remove(self, patchset):
+        for p2 in self._patchsets[patchset.index+1:]:
+            p2.index -= 1
+        del self._patchsets[patchset.index]
+
+    def with_state(self, *states):
+        return [ps for ps in self._patchsets if ps.review_state in states]
+
+    def load(self, path):
+        self.load_path = path
+        try:
+            fp = path.open()
+        except FileNotFoundError:
+            return
+
+        blocks = []
+        with fp:
+            cur = []
+            for line in fp:
+                line = line.strip()
+                if not line:
+                    if cur:
+                        blocks.append(cur)
+                    cur = []
+                else:
+                    cur.append(line)
+            if cur:
+                blocks.append(cur)
+
+        for block in blocks:
+            hashes = []
+            messages = []
+            bugs = []
+            state = None
+            comment = ''
+            state = getattr(ReviewState, block[0])
+            first_patch_name = ''
+            for line in block[1:]:
+                if line[0] in '#':
+                    comment += line[2:] + '\n'
+                elif line.startswith("LP#"):
+                    bugs.append(line[3:])
+                elif line.startswith("FirstPatch: "):
+                    first_patch_name = line.split(None, 1)[1]
+                else:
+                    hash, message = line.split(None, 1)
+                    hashes.append(hash)
+                    messages.append(message)
+            self.add(
+                PatchSet(
+                    hashes=hashes,
+                    review_state=state,
+                    comment=comment,
+                    messages=messages,
+                    bugs=bugs,
+                    first_patch_name=first_patch_name))
+
+    def save(self, path=None):
+        if path is None:
+            path = self.load_path
+        with path.open('w') as fp:
+            yes_patches = []
+            other_patches = []
+            for patchset in self._patchsets:
+                if patchset.review_state == ReviewState.YES:
+                    yes_patches.append(patchset)
+                else:
+                    other_patches.append(patchset)
+            for patchset in yes_patches + other_patches:
+                fp.write(patchset.review_state.name + '\n')
+                if patchset.comment:
+                    for line in patchset.comment.splitlines():
+                        fp.write('# {}\n'.format(line))
+                for bug in patchset.bugs:
+                    fp.write("LP#{}\n".format(bug))
+                if patchset.first_patch_name:
+                    fp.write(
+                        "FirstPatch: {}\n".format(patchset.first_patch_name))
+                if len(patchset.hashes) != len(patchset.messages):
+                    raise Exception("erp {}".format(patchset))
+                for hash, message in zip(patchset.hashes, patchset.messages):
+                    fp.write('{} {}\n'.format(hash, message))
+                fp.write('\n')
+
+
+V = "2.35"
+
+
+def getch():
+    fd = sys.stdin.fileno()
+    old_settings = termios.tcgetattr(fd)
+    try:
+        tty.setcbreak(fd)
+        ch = sys.stdin.read(1)
+    finally:
+        termios.tcsetattr(fd, termios.TCSADRAIN, old_settings)
+    return ch
+
+
+def getoption(prompt, keymap):
+    orig = keymap
+    sys.stdout.write(prompt)
+    sys.stdout.flush()
+    while True:
+        c = getch()
+        try:
+            keymap = keymap[c]
+        except KeyError:
+            keymap = orig
+        else:
+            if not isinstance(keymap, dict):
+                return keymap
+
+
+def getupdown():
+    prompt = '[(u)p (d)own (c)ancel]: '
+    keymap = {'u': 'up', 'd': 'down', 'c': 'cancel'}
+    return getoption(prompt, keymap)
+
+
+def git(cmd):
+    env = os.environ.copy()
+    env['LESS'] = 'RX'
+    try:
+        subprocess.check_call(['git'] + cmd, cwd=SOURCE_DIR, env=env)
+    except subprocess.CalledProcessError as e:
+        if e.returncode == -signal.SIGPIPE:
+            return
+        raise
+
+
+def git_output(cmd):
+    return subprocess.check_output(
+        ['git'] + cmd, cwd=SOURCE_DIR, encoding='utf-8')
+
+
+cmds = {}
+
+
+def command(name=None):
+    def w(func):
+        if name is None:
+            cmds[func.__name__] = func
+        else:
+            cmds[name] = func
+        return func
+    return w
+
+
+@command("import")
+def import_(state):
+    # Update state with new commits on release branch.
+    seen_hashes = set()
+    for patchset in state._patchsets:
+        for hash in patchset.hashes:
+            seen_hashes.add(hash)
+
+    output = git_output([
+        'log', '--reverse', '--format=%H %ct %s',
+        # If I'd written this script before 2.35 got uploaded, this line would
+        # be:
+        # f'glibc-{V}..origin/release/{V}/master'
+        # but here we hard code the last revision that became part of
+        # debian/patches/git-updates.diff:
+        f'e30c1c73da3f220f5bf0063a1d0344f8280311e7..origin/release/{V}/master'
+        ])
+    imported = 0
+    limit = 0
+    hashes = []
+    messages = []
+    for line in output.splitlines():
+        hash, timestamp, message = line.split(None, 2)
+        if hash in seen_hashes:
+            continue
+        timestamp = int(timestamp)
+        if timestamp <= limit:
+            hashes.append(hash)
+            messages.append(message)
+        else:
+            if hashes:
+                state.add(PatchSet(hashes=hashes, messages=messages))
+                imported = imported + 1
+            hashes = [hash]
+            messages = [message]
+        limit = timestamp + 60
+    if hashes:
+        state.add(PatchSet(hashes=hashes, messages=messages))
+        imported = imported + 1
+    print("Imported patch sets: {}".format(imported))
+
+
+review_opts = {}
+review_keymap = {}
+keys = {
+    'up': '\033[A',
+    'down': '\033[B',
+    }
+
+
+def opt(shortcut=None):
+    def w(func):
+        if shortcut is not None:
+            s = shortcut
+        else:
+            s = func.__name__[0]
+        review_opts[s] = func.__name__.replace('_', ' ')
+        review_keymap[keys.get(s, s)] = func
+        return staticmethod(func)
+    return w
+
+
+class ReviewOpts:
+
+    @opt()
+    def diff(patchset):
+        git(['show'] + patchset.hashes)
+
+    @opt()
+    def log(patchset):
+        git(['show', '--no-patch'] + patchset.hashes)
+
+    @opt('up')
+    def prev(patchset):
+        return patchset.index - 1
+
+    @opt('down')
+    def next(patchset):
+        return patchset.index + 1
+
+    @opt('N')
+    def next_unreviewed(patchset):
+        for ps in patchset._state[patchset.index+1:]:
+            if ps.review_state == ReviewState.NEW:
+                return ps.index
+        return None
+
+    @opt()
+    def first(patchset):
+        return 0
+
+    @opt()
+    def end(patchset):
+        return len(patchset._state) - 1
+
+    @opt('/')
+    def find(patchset):
+        needle = input('search for: ')
+        if not needle:
+            return
+        for ps in patchset._state[patchset.index+1:]:
+            for message in ps.messages:
+                if needle in message:
+                    return ps.index
+
+    @opt()
+    def comment(patchset):
+        with tempfile.NamedTemporaryFile('w') as fp:
+            fp.write(patchset.comment)
+            fp.flush()
+            subprocess.run(['vim', fp.name])
+            with open(fp.name) as fp2:
+                patchset.comment = fp2.read()
+
+    @opt('b')
+    def edit_bugs(patchset):
+        with tempfile.NamedTemporaryFile('w') as fp:
+            for bug in patchset.bugs:
+                fp.write(bug + "\n")
+            fp.flush()
+            subprocess.run(['vim', fp.name])
+            with open(fp.name) as fp2:
+                patchset.bugs = [line.strip() for line in fp2]
+
+    @opt()
+    def no(patchset):
+        patchset.review_state = ReviewState.NO
+        return patchset.index + 1
+
+    @opt('?')
+    def new(patchset):
+        patchset.review_state = ReviewState.NEW
+        return patchset.index + 1
+
+    @opt()
+    def yes(patchset):
+        patchset.review_state = ReviewState.YES
+        return patchset.index + 1
+
+    @opt()
+    def later(patchset):
+        patchset.review_state = ReviewState.LATER
+        return patchset.index + 1
+
+    @opt()
+    def split(patchset):
+        if len(patchset.hashes) <= 1:
+            return
+        if len(patchset.hashes) > 2:
+            subprocess.run('clear')
+            print()
+            log(patchset, SPLIT_FORMAT)
+            while True:
+                at = input("Split after: ")
+                if not at:
+                    return
+                try:
+                    at = int(at)
+                except ValueError:
+                    continue
+                break
+        else:
+            at = 1
+        if at <= 0 or at >= len(patchset.hashes):
+            return
+        new_hashes = patchset.hashes[at:]
+        del patchset.hashes[at:]
+        new_messages = patchset.messages[at:]
+        del patchset.messages[at:]
+        patchset._state.add(
+            PatchSet(
+                hashes=new_hashes,
+                messages=new_messages,
+                review_state=patchset.review_state),
+            patchset.index+1)
+
+    @opt()
+    def join(patchset):
+        dir = getupdown()
+        if dir == 'cancel':
+            return
+        elif dir == 'down':
+            patchset = patchset.next()
+            r = None
+        else:
+            r = patchset.index - 1
+        patchset.prev().hashes += patchset.hashes
+        patchset.prev().messages += patchset.messages
+        patchset._state.remove(patchset)
+        return r
+
+    @opt()
+    def move(patchset):
+        i = patchset.index
+        ps = patchset._state._patchsets
+        dir = getupdown()
+        if dir == 'cancel':
+            return
+        elif dir == 'up':
+            r = patchset.index - 1
+            d = -1
+        elif dir == 'down':
+            r = None
+            d = 1
+        other = ps[i + d]
+        other.index, patchset.index = patchset.index, other.index
+        ps[i], ps[i + d] = ps[i + d], ps[i]
+        return r
+
+    @opt()
+    def quit(patchset):
+        patchset._state.save()
+        sys.exit()
+
+    @opt('S')
+    def save(patchset):
+        patchset._state.save()
+
+    @opt('x')
+    def exit_no_save(patchset):
+        sys.exit()
+
+    @opt()
+    def help(patchset):
+        for k in sorted(review_opts):
+            print(k, '-', review_opts[k])
+        getch()
+
+
+def compile_keymap(keymap):
+    r = {}
+    for key, value in keymap.items():
+        first = key[:1]
+        r.setdefault(first, {})[key[1:]] = value
+    for key, value in r.items():
+        if '' in value:
+            if len(value) != 1:
+                raise Exception(
+                      "key definitions for %s clash" % (value.values(),))
+            else:
+                r[key] = value['']
+        else:
+            r[key] = compile_keymap(value)
+    return r
+
+
+review_prompt = '[' + ','.join(sorted(review_opts)) + ']: '
+review_keymap = compile_keymap(review_keymap)
+
+
+def _cc(r, g, b):
+    return '8;2;{};{};{}'.format(r, g, b)
+
+
+def _sgr(param):
+    return '\x1b[0;3{}m'.format(param)
+
+
+YELLOW = _sgr(_cc(255, 255, 0))
+DIM = _sgr(_cc(128, 128, 128))
+DEFAULT = _sgr(9)
+
+
+DIM_FORMAT = '%s{status[0]} {hash} {message}%s' % (DIM, DEFAULT)
+DEFAULT_FORMAT = '{status[0]} %s{hash}%s {message}' % (YELLOW, DEFAULT)
+SPLIT_FORMAT = '{i} %s{hash}%s {message}' % (YELLOW, DEFAULT)
+
+
+def log(patchset, format):
+    if patchset is None:
+        return
+    for i, (hash, message) in enumerate(
+            zip(patchset.hashes, patchset.messages), 1):
+        print(format.format(
+            i=i, status=patchset.review_state.value,
+            hash=hash[:7], message=message))
+
+
+@command()
+def review(state):
+    for index, patchset in enumerate(state):
+        if patchset.review_state == ReviewState.NEW:
+            break
+    else:
+        index = 0
+    while True:
+        patchset = state._patchsets[index]
+        subprocess.run('clear')
+        print()
+        log(patchset.prev(), DIM_FORMAT)
+        log(patchset, DEFAULT_FORMAT)
+        log(patchset.next(), DIM_FORMAT)
+        print()
+        print('current state: ', patchset.review_state)
+        if patchset.comment:
+            print('comment:')
+            print(patchset.comment)
+        if patchset.bugs:
+            print('bugs:', ','.join(patchset.bugs))
+        print()
+        meth = getoption(review_prompt, review_keymap)
+        print()
+        next = meth(patchset)
+        if next is not None:
+            if next < 0:
+                next = 0
+            if next >= len(state) - 1:
+                next = len(state) - 1
+            index = next
+
+
+@command()
+def export(state):
+    # sync the state with debian/patches/upstream-updates
+    series = SOURCE_DIR.joinpath('debian/patches/series')
+    new_series = []
+    with series.open() as fp:
+        for line in fp:
+            if not line.startswith('upstream-updates/'):
+                new_series.append(line)
+
+    updates = SOURCE_DIR.joinpath('debian/patches/upstream-updates')
+    if updates.is_dir():
+        shutil.rmtree(updates)
+    updates.mkdir()
+
+    to_export = state.with_state(ReviewState.YES)
+
+    new_patches = []
+
+    for index1, ps in enumerate(to_export, 1):
+        for index2, hash in enumerate(ps.hashes, 1):
+            with tempfile.TemporaryDirectory() as tdir:
+                tdir = pathlib.Path(tdir)
+                git(['format-patch', '--quiet', '-1', hash, '-o', tdir])
+                patch = list(tdir.iterdir())[0]
+                prefix = f'{index1:04}'
+                if len(ps.hashes) > 1:
+                    prefix += f'-{index2:02}'
+                new_name = f'{prefix}{patch.name[4:]}'
+                patch = patch.rename(updates.joinpath(new_name))
+                print('generated', patch.relative_to(SOURCE_DIR))
+            new_patches.append(f'upstream-updates/{new_name}\n')
+            if index2 == 1:
+                ps.first_patch_name = new_name
+
+    with series.open('w') as fp:
+        fp.write(''.join(new_patches))
+        if new_series[0].strip():
+            fp.write('\n')
+        fp.write(''.join(new_series))
+
+
+@command()
+def dch(state):
+    u = str(uuid.uuid4())
+    subprocess.run(['dch', u], cwd=SOURCE_DIR)
+    updates = SOURCE_DIR.joinpath('debian/patches/upstream-updates')
+    patches = {patch.name for patch in updates.iterdir()}
+    changelog_lines = []
+    target_line = 0
+    with SOURCE_DIR.joinpath('debian/changelog').open() as fp:
+        for i, line in enumerate(fp):
+            for p in patches:
+                if p in line:
+                    patches.remove(p)
+                    break
+            if u in line:
+                target_line = i
+            changelog_lines.append(line)
+    if not patches:
+        return
+    content = '  * Cherry-pick patches from upstream maintenance branch:\n'
+    by_patch_name = {
+        ps.first_patch_name: ps for ps in state if ps.first_patch_name
+        }
+    for patch in sorted(patches):
+        suffix = ''
+        bugs = getattr(by_patch_name.get(patch), 'bugs', None)
+        if bugs:
+            suffix = ' (LP: {})'.format(",".join("#" + bug for bug in bugs))
+        content += '    - ' + patch + suffix + '\n'
+    changelog_lines[target_line] = content
+    with SOURCE_DIR.joinpath('debian/changelog').open('w') as fp:
+        fp.write(''.join(changelog_lines))
+
+
+if len(sys.argv) != 2 or sys.argv[1] not in cmds:
+    print("review import|review|export|dch")
+    sys.exit(1)
+cmd = cmds[sys.argv[1]]
+global_state = State()
+global_state.load(STATE_FILE)
+cmd(global_state)
+global_state.save()
diff --git a/debian/maint/state.txt b/debian/maint/state.txt
new file mode 100644
index 0000000..2d77e9c
--- /dev/null
+++ b/debian/maint/state.txt
@@ -0,0 +1,209 @@
+YES
+LP#1971612
+6583d534458e7f8beec8d0766b6db0bdaae6749c S390: Add new s390 platform z16.
+
+YES
+LP#1978130
+0a1572b8bb880a63d50a63b2afe4bb67704ac23e powerpc: Fix VSX register number on __strncpy_power9 [BZ #29197]
+
+LATER
+3149f47b808288ccfbf4e56234bc07bdae139708 io: Add fsync call in tst-stat
+
+LATER
+c54c5cd8e30ef82041b525ca4880685c673357ee nss: Do not mention NSS test modules in <gnu/lib-names.h>
+
+LATER
+123bd1ec66d2d7ea4683e9563bd94adc67f41544 nss: Protect against errno changes in function lookup (bug 28953)
+
+NO
+# lol hppa
+01d5214bb44990323fa8474b7e4119949ac9733f hppa: Implement swapcontext in assembler (bug 28960)
+9be62976af04f4166a2c1cc5a842ef07bf223860 hppa: Use END instead of PSEUDO_END in swapcontext.S
+
+LATER
+db03235895150a91fb5bd84dd3f49b4d8ec8bc72 NEWS: Move PLT tracking slowdown to glibc 2.35.
+
+LATER
+cc9a4a664faac44fe62b6300b878cf5be514658b elf: Fix memory leak in _dl_find_object_update (bug 29062)
+
+LATER
+ba9c42ac0e265bf1e4ec1075fa20e7166fda8bfc nptl: Handle spurious EINTR when thread cancellation is disabled (BZ#29029)
+68d3a9a69696b46f2e552330dd0de5512c36302d nptl: Fix pthread_cancel cancelhandling atomic operations
+
+NO
+bd415684df590b14d4970acc93ad28719fffe4c1 hurd: Fix arbitrary error code
+
+NO
+8e8d46d59809824054dde501b0ba0e331a747078 mips: Fix mips64n32 64 bit time_t stat support (BZ#29069)
+
+NO
+d3feff2232ec27f05ca619ca8b314155d9018224 m68k: Handle fewer relocations for RTLD_BOOTSTRAP (#BZ29071)
+
+LATER
+70f1eecdc12dbfc742f29844be215eacf51c5014 scripts: Add glibcelf.py module
+499a60179657d2945c6ad01bdac90e8427a6310e Default to --with-default-link=no (bug 25812)
+e5cf8ccca655c0eb831574785a6087f3950852eb INSTALL: Rephrase -with-default-link documentation
+cb4d670d8f0f6ef4725094ea18a62729d852ce67 scripts/glibcelf.py: Mark as UNSUPPORTED on Python 3.5 and earlier
+
+LATER
+c8ee1c85c07b3c9eaef46355cb1095300855e8fa misc: Fix rare fortify crash on wchar funcs. [BZ 29030]
+
+LATER
+106b7e0e45b258672a9c6f0e1de96baeb17a513f dlfcn: Do not use rtld_active () to determine ld.so state (bug 29078)
+
+LATER
+10fe3cd309b32c003a6b98e08928e7d6007caecf elf: Fix DFS sorting algorithm for LD_TRACE_LOADED_OBJECTS with missing libraries (BZ #28868)
+
+LATER
+ef875993483a1fa5253f98f8341f717ea5e53f53 linux: Fix missing internal 64 bit time_t stat usage
+
+LATER
+14b1e32a4d366efacd6c54e7be8c2bfcc088dd6f i386: Regenerate ulps
+
+LATER
+7d96aa2d7dba5a7d9c80334f1860445bd76fdc7b linux: Fix fchmodat with AT_SYMLINK_NOFOLLOW for 64 bit time_t (BZ#29097)
+
+LATER
+dde291ab531010d604e8cda4483a2e94fc5d606d posix/glob.c: update from gnulib
+
+LATER
+edc06fdd62331d400553675b79c30ce77bef4357 Update syscall lists for Linux 5.17
+e72c363a15402ea2714d3519f2e126a416d1123b Update kernel version to 5.16 in tst-mman-consts.py
+eed29011f9b29317a4025b2a6e04a531663a1023 Update kernel version to 5.17 in tst-mman-consts.py
+95759abbf3c33e66e1e2663f80406eae3dd66587 Add SOL_MPTCP, SOL_MCTP from Linux 5.16 to bits/socket.h
+0bcba53020b8f4363acefb1697cf6f026cbaa170 Add HWCAP2_AFP, HWCAP2_RPRES from Linux 5.17 to AArch64 bits/hwcap.h
+
+LATER
+ec5b79aac7688bb1ff807376acfcc9b9afd4dcbf manual: Clarify that abbreviations of long options are allowed
+
+NO
+# Maybe it's cowardly but I don't really want to backport a bunch of performance
+# optimizations that too a few goes to get right unless someone asks for them
+# specifically...
+b68e782f8e16fc3f45ab967c291cfb9628e59f6e x86: Optimize strcmp-avx2.S
+34ef8109458ff5d7263892f330cc06ad3e19d6a7 x86: Optimize strcmp-evex.S
+250e277797b8e368ce55e0101c76864f52d2b29e x86-64: Fix strcmp-avx2.S
+36766c02afa5255fbd8676e5d25eaa9ca07141de x86-64: Fix strcmp-evex.S
[phone]ade4cacb76f4144117c40ab28e823b03 x86: Improve vec generation in memset-vec-unaligned-erms.S
+0bf9c8b5feb8c73517ab4dbf47533875021e7c1c x86: Remove SSSE3 instruction for broadcast in memset.S (SSE2 Only)
+de0cd691b2095912f9128fabfb572d835938d655 x86-64: Optimize bzero
+c394d7e11a2cc5d99dc1ba3833727c37536d4838 x86: Set .text section in memset-vec-unaligned-erms
+676f7bcf11ad0bdae098a45fd7d48c1040cde4e1 x86: Fix bug in strncmp-evex and strncmp-avx2 [BZ #28895]
+059e36d9ed5f5c3c6fc1ab8e12cd0cf226dd3e0a x86: Fix fallback for wcsncmp_avx2 in strcmp-avx2.S [BZ #28896]
+
+LATER
+5c0d94d780598a298c9e8685fd811fab9664c368 linux: Fix posix_spawn return code if clone fails (BZ#29109)
+bbb017a2bb2983de297f3d443c59221fbff92e30 NEWS: Add a bug fix entry for BZ #29109
+
+NO
+78f82ab4ef839b52df022234aff63e2d4d7f264f manual: Document the dlinfo function
+28ea43f8d64f0dd1f2de75525157730e1532e600 dlfcn: Implement the RTLD_DI_PHDR request type for dlinfo
+
+LATER
+58947e1fa593cff7b5513d5e8e0c81b0131984b4 fortify: Ensure that __glibc_fortify condition is a constant [BZ #29141]
+
+NO
+d422197a6974390f7f46ffdd64df72e778bb4ae7 x86: Improve L to support L(XXX_SYMBOL (YYY, ZZZ))
+
+NO
+18baf86f51dc34bcdd1f4b26018795908dd46477 x86_64/multiarch: Sort sysdep_routines and put one entry per line
+
+NO
+a1336230489a2ff4ff3e8da9c96227de69ba19e5 x86-64: Remove bzero weak alias in SS2 memset
+
+NO
+f0a53588da7d6b642eeabdbd934d799ed0df2b8f x86-64: Define __memcmpeq in ld.so
+
+NO
+0a10b8b181d0ad84c5f8a7c42f4932528b2964bc x86_64: Remove bcopy optimizations
+
+NO
+# more string optimizations that can wait for explicit request
+424bbd4d2502c43cf36372d588cbca161cafea43 x86: Code cleanup in strchr-avx2 and comment justifying branch
+ff9772ac190c101a5f6e68f4fb7ce852326ffe27 x86: Code cleanup in strchr-evex and comment justifying branch
+3214c878f2a4546f296d9892169c06b3676c3133 x86: Optimize strcspn and strpbrk in strcspn-c.c
+1ed2813eb14526934091ecf65184747b4b5582dc x86: Optimize strspn in strspn-c.c
+2fef1961a7ba992c51df04dc6c5bffdfd5adb41b x86: Remove strcspn-sse2.S and use the generic implementation
+4b61d7652164786786c4b154e2903929281fd09e x86: Remove strpbrk-sse2.S and use the generic implementation
+420cd6f155bf3dd4ff252843991ebe896e35c7ec x86: Remove strspn-sse2.S and use the generic implementation
+283982b36211e694755ef74592f2a1d70369aff3 x86: Optimize str{n}casecmp TOLOWER logic in strcmp.S
+3496d64d6934ba34d636864a550dcf1828b5a987 x86: Optimize str{n}casecmp TOLOWER logic in strcmp-sse42.S
+33fcf8344fe037dab408d2fe057a9d5f9abb05b7 x86: Add AVX2 optimized str{n}casecmp
+fc5d42bf826b37e56b3a4f41e63e31c6d4ea5f8e x86: Add EVEX optimized str{n}casecmp
+3b710e32d8381809c69a6d9b2a1ee9c8afb2c3c2 x86: Remove AVX str{n}casecmp
+af0865571a973d72da8cec29001ed411e12556b0 x86: Small improvements for wcslen
+5a8df6485c584e2b0e957ec6b9070437a724911a x86: Optimize memcmp SSE2 in memcmp.S
+0909286ffabddd7e59cf85a539e8d43406819952 x86: Remove memcmp-sse4.S
+cee9939f67607483110bad9db84c62ce9d71721b x86: Cleanup page cross code in memcmp-avx2-movbe.S
+4d1841deb740f23ab063a65fd875e53934b65883 x86: Fix missing __wmemcmp def for disable-multiarch build
+bc35e22be4ca69f3e2c2e1403ac30d028e092a38 x86-64: Fix SSE2 memcmp and SSSE3 memmove for x32
+b05c0c8b285f3531aa48e9cef9d507804c6db77e x86: Optimize {str|wcs}rchr-sse2
+fdbc8439acfd42149fdad411df7f74dcb1b3a168 x86: Optimize {str|wcs}rchr-avx2
+2c4fc8e5ca742c6a3a1933799495bb0b00a807f0 x86: Optimize {str|wcs}rchr-evex
+ac87df8d750b0734e20ffb82d1d0d0efbe4b6212 x86: Fallback {str|wcs}cmp RTM in the ncmp overflow case [BZ #29127]
+
+NO
+# seems like a minor optimization
+756d583c9eca5aa494822963a5063cfa214d1e11 elf: Merge dl-sysdep.c into the Linux version
+1695c5e0f66d2714b1f4bf0e38b20ebebbc6d1d2 Linux: Remove HAVE_AUX_SECURE, HAVE_AUX_XID, HAVE_AUX_PAGESIZE
+29f833f5abe03f89cc830e362474b389545aa139 Linux: Remove DL_FIND_ARG_COMPONENTS
+3948c6ca896bdbf4d1ce08afac8a477d990c03cd Linux: Assume that NEED_DL_SYSINFO_DSO is always defined
+150039ff07d19d2566c9d91b2a1368fb05451639 Linux: Consolidate auxiliary vector parsing
+788eb21ff0deb0ef7cb203de5e4df7898ca1d82c Revert "Linux: Consolidate auxiliary vector parsing"
+76304dfdaf0b979fdb2797787ec75e46aea0e8b4 Linux: Include <dl-auxv.h> in dl-sysdep.c only for SHARED
+0a5c6c9d99073c0772a9753600f0d8885efa9163 Linux: Consolidate auxiliary vector parsing (redo)
+
+NO
+58bb3aeaae711d2229bacfc784b7879af2e4f771 elf: Remove __libc_init_secure
+
+NO
+d1772c937680eac35256434eca70f6d396f4b7f5 i386: Remove OPTIMIZE_FOR_GCC_5 from Linux libc-do-syscall.S
+a7b122a7b45d0cffebbe94e7aedf8634f74d84b9 i386: Honor I386_USE_SYSENTER for 6-argument Linux system calls
+d66cca3fbb12539aa72a4c24c2f5b2bb0197b306 Linux: Define MMAP_CALL_INTERNAL
+55ee3afa0d1d09ea1b3eeba9b59281c7e3fc3e17 ia64: Always define IA64_USE_NEW_STUB as a flag macro
+2d05ba7f8ef979947e910a37ae8115a816eb4d08 Linux: Implement a useful version of _startup_fatal
+b5ddf33c6e63d89658450da4c85362349c7fe522 Linux: Introduce __brk_call for invoking the brk system call
+72d9dcfd16468ed143a2800288476835f7a8c2a4 csu: Implement and use _dl_early_allocate during static startup
+
+NO
+# doesn't really seem appropriate for a LTS update to me
+04892c543e08a8974ffc14f53e24e2b00810978c S390: Enable static PIE
+
+LATER
+f5f7144dfcbf2a11fd2c17316c213928307c1db3 rtld: Use generic argv adjustment in ld.so [BZ #23293]
+2b128a7d30f5f808c5246034f71d249010521f1b linux: Add a getauxval test [BZ #23293]
+
+LATER
+478cd506eaa5bbc81e3de6593a5064fa5f36fea9 string.h: fix __fortified_attr_access macro call [BZ #29162]
+
+LATER
+6abb4002df97df668f40b0da84ab6261498a8541 Fix deadlock when pthread_atfork handler calls pthread_atfork or dlclose
+
+LATER
+cb49c141838d34b653389d60c857dca91bceaf5d misc: Use 64 bit stat for daemon (BZ# 29203)
+37c94dc999dbd624cf6ecc3fd6e823cd442858d1 misc: Use 64 bit stat for getusershell (BZ# 29204)
+45e5d0f533c90d40914aa8d737695e5bd5ccae5e posix: Use 64 bit stat for posix_fallocate fallback (BZ# 29207)
+9bcf5b12f8254ca118304e4e5c3fe82a42df8823 posix: Use 64 bit stat for fpathconf (_PC_ASYNC_IO) (BZ# 29208)
+6ea3c0aba4e8b70344a134224ac29f18063a0e61 socket: Use 64 bit stat for isfdtype (BZ# 29209)
+e4296958051874e2987719341f1a739642b9e8c7 inet: Use 64 bit stat for ruserpass (BZ# 29210)
+c5a75ecec8d7a54da7e53c7e64ba00d8673fe619 catgets: Use 64 bit stat for __open_catalog (BZ# 29211)
+d7d1eebd4d5806be55ffacbf18917ad68d4ae7fd iconv: Use 64 bit stat for gconv_parseconfdir (BZ# 29213)
+fe9ca732ace94cb49e4d4846a4492db40cde34e4 socket: Fix mistyped define statement in socket/sys/socket.h (BZ #29225)
+
+LATER
+97dd8b3f705b23de1f84713082b631189084a33b nptl: Fix __libc_cleanup_pop_restore asynchronous restore (BZ#29214)
+
+LATER
+99978cd42c55ee427fb512de69638045f6d525c7 NEWS: Add a bug fix entry for BZ #29225
+
+NO
+8468be8433c8c4cc0c17a1811a9b0f439043644a hppa: Remove _dl_skip_args usage (BZ# 29165)
+9d8ae95604feff154a92e1963d3c08d715407e26 nios2: Remove _dl_skip_args usage (BZ# 29187)
+
+LATER
+ccac2d6d95600e790e0411eab0511493ae409c1f nss: add assert to DB_LOOKUP_FCT (BZ #28752)
+b6aade18a7e5719c942aa2da6cf3157aca993fa4 nss: handle stat failure in check_reload_and_get (BZ #28752)
+
+LATER
+cd4f43be3d60384009e9a928d82db815f77ef9b7 linux: Fix mq_timereceive check for 32 bit fallback code (BZ 29304)
+
diff --git a/debian/patches/series b/debian/patches/series
index ed891b5..c543961 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,6 @@
+upstream-updates/0001-S390-Add-new-s390-platform-z16.patch
+upstream-updates/0002-powerpc-Fix-VSX-register-number-on-__strncpy_power9-.patch
+
 git-updates.diff
 
 locale/check-unknown-symbols.diff
diff --git a/debian/patches/upstream-updates/0001-S390-Add-new-s390-platform-z16.patch b/debian/patches/upstream-updates/0001-S390-Add-new-s390-platform-z16.patch
new file mode 100644
index 0000000..4d224e4
--- /dev/null
+++ b/debian/patches/upstream-updates/0001-S390-Add-new-s390-platform-z16.patch
@@ -0,0 +1,250 @@
+From 6583d534458e7f8beec8d0766b6db0bdaae6749c Mon Sep 17 00:00:00 2001
+From: Stefan Liebler <[e-mail]>
+Date: Wed, 13 Apr 2022 14:36:09 +0200
+Subject: [PATCH] S390: Add new s390 platform z16.
+
+The new IBM z16 is added to platform string array.
+The macro _DL_PLATFORMS_COUNT is incremented.
+
+_dl_hwcaps_subdir is extended by "z16" if HWCAP_S390_VXRS_PDE2
+is set. HWCAP_S390_NNPA is not tested in _dl_hwcaps_subdirs_active
+as those instructions may be replaced or removed in future.
+
+tst-glibc-hwcaps.c is extended in order to test z16 via new marker5.
+
+A fatal glibc error is dumped if glibc was build with architecture
+level set for z16, but run on an older machine. (See dl-hwcap-check.h)
+
+(cherry picked from commit 2376944b9e5c0364b9fb473e4d8dabca31b57167)
+---
+ elf/Makefile                             |  8 ++++++++
+ elf/tst-glibc-hwcaps-cache.script        |  6 ++++++
+ sysdeps/s390/dl-procinfo.c               |  5 +++--
+ sysdeps/s390/dl-procinfo.h               |  2 +-
+ sysdeps/s390/s390-64/Makefile            | 25 ++++++++++++++++++++++--
+ sysdeps/s390/s390-64/dl-hwcap-check.h    |  6 +++++-
+ sysdeps/s390/s390-64/dl-hwcaps-subdirs.c | 11 +++++++++--
+ sysdeps/s390/s390-64/tst-glibc-hwcaps.c  |  8 ++++++--
+ 8 files changed, 61 insertions(+), 10 deletions(-)
+
+diff --git a/elf/Makefile b/elf/Makefile
+index b2bd03a9f6..21527c67b3 100644
+--- a/elf/Makefile
++++ b/elf/Makefile
+@@ -613,6 +613,11 @@ modules-names = \
+   libmarkermod4-2 \
+   libmarkermod4-3 \
+   libmarkermod4-4 \
++  libmarkermod5-1 \
++  libmarkermod5-2 \
++  libmarkermod5-3 \
++  libmarkermod5-4 \
++  libmarkermod5-5 \
+   ltglobmod1 \
+   ltglobmod2 \
+   neededobj1 \
+@@ -2509,6 +2514,7 @@ LDFLAGS-libmarkermod1-1.so += -Wl,-soname,libmarkermod1.so
+ LDFLAGS-libmarkermod2-1.so += -Wl,-soname,libmarkermod2.so
+ LDFLAGS-libmarkermod3-1.so += -Wl,-soname,libmarkermod3.so
+ LDFLAGS-libmarkermod4-1.so += -Wl,-soname,libmarkermod4.so
++LDFLAGS-libmarkermod5-1.so += -Wl,-soname,libmarkermod5.so
+ $(objpfx)libmarkermod%.os : markermodMARKER-VALUE.c
+ 	$(compile-command.c) \
+ 	  -DMARKER=marker$(firstword $(subst -, ,$*)) \
+@@ -2521,6 +2527,8 @@ $(objpfx)libmarkermod3.so: $(objpfx)libmarkermod3-1.so
+ 	cp $< $@
+ $(objpfx)libmarkermod4.so: $(objpfx)libmarkermod4-1.so
+ 	cp $< $@
++$(objpfx)libmarkermod5.so: $(objpfx)libmarkermod5-1.so
++	cp $< $@
+ 
+ # tst-glibc-hwcaps-prepend checks that --glibc-hwcaps-prepend is
+ # preferred over auto-detected subdirectories.
+diff --git a/elf/tst-glibc-hwcaps-cache.script b/elf/tst-glibc-hwcaps-cache.script
+index c3271f61f9..d58fc8c5de 100644
+--- a/elf/tst-glibc-hwcaps-cache.script
++++ b/elf/tst-glibc-hwcaps-cache.script
+@@ -4,6 +4,7 @@
+ cp $B/elf/libmarkermod2-1.so $L/libmarkermod2.so
+ cp $B/elf/libmarkermod3-1.so $L/libmarkermod3.so
+ cp $B/elf/libmarkermod4-1.so $L/libmarkermod4.so
++cp $B/elf/libmarkermod5-1.so $L/libmarkermod5.so
+ 
+ mkdirp 0770 $L/glibc-hwcaps/power9
+ cp $B/elf/libmarkermod2-2.so $L/glibc-hwcaps/power9/libmarkermod2.so
+@@ -20,6 +21,11 @@ mkdirp 0770 $L/glibc-hwcaps/z15
+ cp $B/elf/libmarkermod4-2.so $L/glibc-hwcaps/z13/libmarkermod4.so
+ cp $B/elf/libmarkermod4-3.so $L/glibc-hwcaps/z14/libmarkermod4.so
+ cp $B/elf/libmarkermod4-4.so $L/glibc-hwcaps/z15/libmarkermod4.so
++mkdirp 0770 $L/glibc-hwcaps/z16
++cp $B/elf/libmarkermod5-2.so $L/glibc-hwcaps/z13/libmarkermod5.so
++cp $B/elf/libmarkermod5-3.so $L/glibc-hwcaps/z14/libmarkermod5.so
++cp $B/elf/libmarkermod5-4.so $L/glibc-hwcaps/z15/libmarkermod5.so
++cp $B/elf/libmarkermod5-5.so $L/glibc-hwcaps/z16/libmarkermod5.so
+ 
+ mkdirp 0770 $L/glibc-hwcaps/x86-64-v2
+ cp $B/elf/libmarkermod2-2.so $L/glibc-hwcaps/x86-64-v2/libmarkermod2.so
+diff --git a/sysdeps/s390/dl-procinfo.c b/sysdeps/s390/dl-procinfo.c
+index 2cdb3c8b5e..f142221a17 100644
+--- a/sysdeps/s390/dl-procinfo.c
++++ b/sysdeps/s390/dl-procinfo.c
+@@ -63,11 +63,12 @@ PROCINFO_CLASS const char _dl_s390_cap_flags[23][9]
+ #if !defined PROCINFO_DECL && defined SHARED
+   ._dl_s390_platforms
+ #else
+-PROCINFO_CLASS const char _dl_s390_platforms[10][7]
++PROCINFO_CLASS const char _dl_s390_platforms[11][7]
+ #endif
+ #ifndef PROCINFO_DECL
+ = {
+-    "g5", "z900", "z990", "z9-109", "z10", "z196", "zEC12", "z13", "z14", "z15"
++    "g5", "z900", "z990", "z9-109", "z10", "z196", "zEC12", "z13", "z14", "z15",
++    "z16"
+   }
+ #endif
+ #if !defined SHARED || defined PROCINFO_DECL
+diff --git a/sysdeps/s390/dl-procinfo.h b/sysdeps/s390/dl-procinfo.h
+index 03d7e94379..1f4e3875ba 100644
+--- a/sysdeps/s390/dl-procinfo.h
++++ b/sysdeps/s390/dl-procinfo.h
+@@ -22,7 +22,7 @@
+ 
+ #define _DL_HWCAP_COUNT 23
+ 
+-#define _DL_PLATFORMS_COUNT	10
++#define _DL_PLATFORMS_COUNT	11
+ 
+ /* The kernel provides up to 32 capability bits with elf_hwcap.  */
+ #define _DL_FIRST_PLATFORM	32
+diff --git a/sysdeps/s390/s390-64/Makefile b/sysdeps/s390/s390-64/Makefile
+index e5da26871c..66ed844e68 100644
+--- a/sysdeps/s390/s390-64/Makefile
++++ b/sysdeps/s390/s390-64/Makefile
+@@ -7,8 +7,11 @@ CFLAGS-rtld.c += -Wno-uninitialized -Wno-unused
+ CFLAGS-dl-load.c += -Wno-unused
+ CFLAGS-dl-reloc.c += -Wno-unused
+ 
+-$(objpfx)tst-glibc-hwcaps: $(objpfx)libmarkermod2-1.so \
+-  $(objpfx)libmarkermod3-1.so $(objpfx)libmarkermod4-1.so
++$(objpfx)tst-glibc-hwcaps: \
++  $(objpfx)libmarkermod2-1.so \
++  $(objpfx)libmarkermod3-1.so \
++  $(objpfx)libmarkermod4-1.so \
++  $(objpfx)libmarkermod5-1.so
+ $(objpfx)tst-glibc-hwcaps.out: \
+   $(objpfx)libmarkermod2.so \
+     $(objpfx)glibc-hwcaps/z13/libmarkermod2.so \
+@@ -19,6 +22,11 @@ $(objpfx)tst-glibc-hwcaps.out: \
+     $(objpfx)glibc-hwcaps/z13/libmarkermod4.so \
+     $(objpfx)glibc-hwcaps/z14/libmarkermod4.so \
+     $(objpfx)glibc-hwcaps/z15/libmarkermod4.so \
++  $(objpfx)libmarkermod5.so \
++    $(objpfx)glibc-hwcaps/z13/libmarkermod5.so \
++    $(objpfx)glibc-hwcaps/z14/libmarkermod5.so \
++    $(objpfx)glibc-hwcaps/z15/libmarkermod5.so \
++    $(objpfx)glibc-hwcaps/z16/libmarkermod5.so
+ 
+ $(objpfx)glibc-hwcaps/z13/libmarkermod2.so: $(objpfx)libmarkermod2-2.so
+ 	$(make-target-directory)
+@@ -38,6 +46,19 @@ $(objpfx)glibc-hwcaps/z14/libmarkermod4.so: $(objpfx)libmarkermod4-3.so
+ $(objpfx)glibc-hwcaps/z15/libmarkermod4.so: $(objpfx)libmarkermod4-4.so
+ 	$(make-target-directory)
+ 	cp $< $@
++$(objpfx)glibc-hwcaps/z13/libmarkermod5.so: $(objpfx)libmarkermod5-2.so
++	$(make-target-directory)
++	cp $< $@
++$(objpfx)glibc-hwcaps/z14/libmarkermod5.so: $(objpfx)libmarkermod5-3.so
++	$(make-target-directory)
++	cp $< $@
++$(objpfx)glibc-hwcaps/z15/libmarkermod5.so: $(objpfx)libmarkermod5-4.so
++	$(make-target-directory)
++	cp $< $@
++$(objpfx)glibc-hwcaps/z16/libmarkermod5.so: $(objpfx)libmarkermod5-5.so
++	$(make-target-directory)
++	cp $< $@
++
+ 
+ ifeq (no,$(build-hardcoded-path-in-tests))
+ # This is an ld.so.cache test, and RPATH/RUNPATH in the executable
+diff --git a/sysdeps/s390/s390-64/dl-hwcap-check.h b/sysdeps/s390/s390-64/dl-hwcap-check.h
+index f769932325..efe204a3f3 100644
+--- a/sysdeps/s390/s390-64/dl-hwcap-check.h
++++ b/sysdeps/s390/s390-64/dl-hwcap-check.h
+@@ -26,7 +26,11 @@ static inline void
+ dl_hwcap_check (void)
+ {
+ #if defined __ARCH__
+-# if GCCMACRO__ARCH__ >= 13
++# if GCCMACRO__ARCH__ >= 14
++  if (!(GLRO(dl_hwcap) & HWCAP_S390_VXRS_PDE2))
++    _dl_fatal_printf ("\
++Fatal glibc error: CPU lacks VXRS_PDE2 support (z16 or later required)\n");
++# elif GCCMACRO__ARCH__ >= 13
+   if (!(GLRO(dl_hwcap) & HWCAP_S390_VXRS_EXT2))
+     _dl_fatal_printf ("\
+ Fatal glibc error: CPU lacks VXRS_EXT2 support (z15 or later required)\n");
+diff --git a/sysdeps/s390/s390-64/dl-hwcaps-subdirs.c b/sysdeps/s390/s390-64/dl-hwcaps-subdirs.c
+index 9447a6cf4e..39f4948152 100644
+--- a/sysdeps/s390/s390-64/dl-hwcaps-subdirs.c
++++ b/sysdeps/s390/s390-64/dl-hwcaps-subdirs.c
+@@ -19,8 +19,8 @@
+ #include <dl-hwcaps.h>
+ #include <ldsodefs.h>
+ 
+-const char _dl_hwcaps_subdirs[] = "z15:z14:z13";
+-enum { subdirs_count = 3 }; /* Number of components in _dl_hwcaps_subdirs.  */
++const char _dl_hwcaps_subdirs[] = "z16:z15:z14:z13";
++enum { subdirs_count = 4 }; /* Number of components in _dl_hwcaps_subdirs.  */
+ 
+ uint32_t
+ _dl_hwcaps_subdirs_active (void)
+@@ -50,5 +50,12 @@ _dl_hwcaps_subdirs_active (void)
+     return _dl_hwcaps_subdirs_build_bitmask (subdirs_count, active);
+   ++active;
+ 
++  /* z16.
++   Note: We do not list HWCAP_S390_NNPA here as, according to the Principles of
++   Operation, those instructions may be replaced or removed in future.  */
++  if (!(GLRO (dl_hwcap) & HWCAP_S390_VXRS_PDE2))
++    return _dl_hwcaps_subdirs_build_bitmask (subdirs_count, active);
++  ++active;
++
+   return _dl_hwcaps_subdirs_build_bitmask (subdirs_count, active);
+ }
+diff --git a/sysdeps/s390/s390-64/tst-glibc-hwcaps.c b/sysdeps/s390/s390-64/tst-glibc-hwcaps.c
+index cf3b765b5d..a29891bdc1 100644
+--- a/sysdeps/s390/s390-64/tst-glibc-hwcaps.c
++++ b/sysdeps/s390/s390-64/tst-glibc-hwcaps.c
+@@ -25,6 +25,7 @@
+ extern int marker2 (void);
+ extern int marker3 (void);
+ extern int marker4 (void);
++extern int marker5 (void);
+ 
+ /* Return the arch level, 10 for the baseline libmarkermod*.so's.  */
+ static int
+@@ -63,9 +64,11 @@ compute_level (void)
+     return 12;
+   if (strcmp (platform, "z15") == 0)
+     return 13;
++  if (strcmp (platform, "z16") == 0)
++    return 14;
+   printf ("warning: unrecognized AT_PLATFORM value: %s\n", platform);
+-  /* Assume that the new platform supports z15.  */
+-  return 13;
++  /* Assume that the new platform supports z16.  */
++  return 14;
+ }
+ 
+ static int
+@@ -76,6 +79,7 @@ do_test (void)
+   TEST_COMPARE (marker2 (), MIN (level - 9, 2));
+   TEST_COMPARE (marker3 (), MIN (level - 9, 3));
+   TEST_COMPARE (marker4 (), MIN (level - 9, 4));
++  TEST_COMPARE (marker5 (), MIN (level - 9, 5));
+   return 0;
+ }
+ 
+-- 
+2.34.1
+
diff --git a/debian/patches/upstream-updates/0002-powerpc-Fix-VSX-register-number-on-__strncpy_power9-.patch b/debian/patches/upstream-updates/0002-powerpc-Fix-VSX-register-number-on-__strncpy_power9-.patch
new file mode 100644
index 0000000..e6e57e2
--- /dev/null
+++ b/debian/patches/upstream-updates/0002-powerpc-Fix-VSX-register-number-on-__strncpy_power9-.patch
@@ -0,0 +1,48 @@
+From 0a1572b8bb880a63d50a63b2afe4bb67704ac23e Mon Sep 17 00:00:00 2001
+From: Matheus Castanho <[e-mail]>
+Date: Tue, 7 Jun 2022 10:27:26 -0300
+Subject: [PATCH] powerpc: Fix VSX register number on __strncpy_power9 [BZ
+ #29197]
+
+__strncpy_power9 initializes VR 18 with zeroes to be used throughout the
+code, including when zero-padding the destination string. However, the
+v18 reference was mistakenly being used for stxv and stxvl, which take a
+VSX vector as operand. The code ended up using the uninitialized VSR 18
+register by mistake.
+
+Both occurrences have been changed to use the proper VSX number for VR 18
+(i.e. VSR 50).
+
+Tested on powerpc, powerpc64 and powerpc64le.
+
+Signed-off-by: Kewen Lin <[e-mail]>
+(cherry picked from commit 0218463dd8265ed937622f88ac68c7d984fe0cfc)
+---
+ sysdeps/powerpc/powerpc64/le/power9/strncpy.S | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sysdeps/powerpc/powerpc64/le/power9/strncpy.S b/sysdeps/powerpc/powerpc64/le/power9/strncpy.S
+index ae23161316..deb94671cc 100644
+--- a/sysdeps/powerpc/powerpc64/le/power9/strncpy.S
++++ b/sysdeps/powerpc/powerpc64/le/power9/strncpy.S
+@@ -352,7 +352,7 @@ L(zero_padding_loop):
+ 	cmpldi	cr6,r5,16	/* Check if length was reached.  */
+ 	ble	cr6,L(zero_padding_end)
+ 
+-	stxv	v18,0(r11)
++	stxv	32+v18,0(r11)
+ 	addi	r11,r11,16
+ 	addi	r5,r5,-16
+ 
+@@ -360,7 +360,7 @@ L(zero_padding_loop):
+ 
+ L(zero_padding_end):
+ 	sldi	r10,r5,56	/* stxvl wants size in top 8 bits  */
+-	stxvl	v18,r11,r10	/* Partial store  */
++	stxvl	32+v18,r11,r10	/* Partial store  */
+ 	blr
+ 
+ 	.align	4
+-- 
+2.34.1
+