debian/changelog

 glibc (2.34-0experimental2) UNRELEASED; urgency=medium
   * debian/patches/git-updates.diff: update from upstream stable branch.
+  * debhelper.in/libc.lintian-overrides, debhelper.in/libc.lintian-overrides,
+    debhelper.in/libc-otherbuild.lintian-overrides: use wildcards to match the
+    dynamic linker name. This changes the overrides files to be identical on
+    all architectures and make them multiarch installable.  Closes: #1001967.
+  * debian/libc-dev.lintian-overrides, debian/libc-dev-alt.lintian-overrides:
+    add lintian overrides for now empty libpthread.a, libdl.a, libutil.a,
+    and libanl.a.
  -- Aurelien Jarno <aurel32@debian.org>  Sun, 19 Dec 2021 00:24:07 +0100

debian/debhelper.in/libc-alt.lintian-overrides

 # ld.so must be executable, otherwise the system will not work
-LIBC-FLAVOR: shared-library-is-executable */RTLD_SO 0755
+LIBC-FLAVOR: shared-library-is-executable */ld*.so.* 0755
 
 # It is normal that the ELF dynamic linker does not need any other 
 # library
-LIBC-FLAVOR: shared-lib-without-dependency-information */RTLD_SO
+LIBC-FLAVOR: shared-lib-without-dependency-information */ld*.so.*

debian/debhelper.in/libc-dev-alt.lintian-overrides

 # Those file are actually .o files not package in a ar archive, and
 # thus should not be stripped
 LIBC-dev-FLAVOR: unstripped-binary-or-object */libmcheck.a
+
+# All functionality formerly implemented in the libraries libpthread,
+# libdl, libutil, libanl has been integrated into libc. For backwards
+# compatibility, empty static archives libpthread.a, libdl.a, libutil.a,
+# libanl.a are provided, so that the linker options keep working.
+LIBC-dev-FLAVOR: no-code-sections [*/libanl.a]
+LIBC-dev-FLAVOR: no-code-sections [*/libdl.a]
+LIBC-dev-FLAVOR: no-code-sections [*/libpthread.a]
+LIBC-dev-FLAVOR: no-code-sections [*/libpthread_nonshared.a]
+LIBC-dev-FLAVOR: no-code-sections [*/librt.a]
+LIBC-dev-FLAVOR: no-code-sections [*/libutil.a]

debian/debhelper.in/libc-dev.lintian-overrides

 # Those file are actually .o files not package in a ar archive, and
 # thus should not be stripped
 LIBC-dev: unstripped-binary-or-object */libmcheck.a
+
+# All functionality formerly implemented in the libraries libpthread, libdl,
+# libutil, libanl has been integrated into libc. For backwards compatibility,
+# empty static archives libpthread.a, libdl.a, libutil.a, libanl.a are
+# provided, so that the linker options keep working.
+LIBC-dev: no-code-sections [*/libanl.a]
+LIBC-dev: no-code-sections [*/libdl.a]
+LIBC-dev: no-code-sections [*/libpthread.a]
+LIBC-dev: no-code-sections [*/libpthread_nonshared.a]
+LIBC-dev: no-code-sections [*/librt.a]
+LIBC-dev: no-code-sections [*/libutil.a]

debian/debhelper.in/libc-otherbuild.lintian-overrides

 # ld.so must be executable, otherwise the system will not work
-LIBC-FLAVOR: shared-library-is-executable */RTLD_SO 0755
+LIBC-FLAVOR: shared-library-is-executable */ld*.so.* 0755
 
 # It is normal that the ELF dynamic linker does not need any other 
 # library
-LIBC-FLAVOR: shared-lib-without-dependency-information */RTLD_SO
+LIBC-FLAVOR: shared-lib-without-dependency-information */ld*.so.*
 
 # The libraries are installed in an hwcap directory, which contrary
 # to what lintian thinks, is controlled by ldconfig

debian/debhelper.in/libc.lintian-overrides

 # ld.so must be executable, otherwise the system will not work
-LIBC: shared-library-is-executable */RTLD_SO 0755
+LIBC: shared-library-is-executable */ld*.so.* 0755
 
 # It is normal that the ELF dynamic linker does not need any other 
 # library
-LIBC: shared-lib-without-dependency-information */RTLD_SO
+LIBC: shared-lib-without-dependency-information */ld*.so.*
 
 # dependency on debconf is not needed, as glibc has a fallback to tty 
 LIBC: missing-debconf-dependency-for-preinst

debian/patches/git-updates.diff

@@ -4484,6 +4484,70 @@ index b481b4f9f8..45db6b6ffb 100644
    };
  #endif
  
+diff --git a/sysdeps/unix/sysv/linux/sparc/brk.c b/sysdeps/unix/sysv/linux/sparc/brk.c
+new file mode 100644
+index 0000000000..aafe9673e3
+--- /dev/null
++++ b/sysdeps/unix/sysv/linux/sparc/brk.c
+@@ -0,0 +1,58 @@
++/* Change data segment.  Linux SPARC version.
++   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 <errno.h>
++#include <unistd.h>
++#include <sysdep.h>
++
++/* This must be initialized data because commons can't have aliases.  */
++void *__curbrk = 0;
++
++#if HAVE_INTERNAL_BRK_ADDR_SYMBOL
++/* Old braindamage in GCC's crtstuff.c requires this symbol in an attempt
++   to work around different old braindamage in the old Linux ELF dynamic
++   linker.  */
++weak_alias (__curbrk, ___brk_addr)
++#endif
++
++#ifdef __arch64__
++# define SYSCALL_NUM "0x6d"
++#else
++# define SYSCALL_NUM "0x10"
++#endif
++
++int
++__brk (void *addr)
++{
++  register long int g1 asm ("g1") = __NR_brk;
++  register long int o0 asm ("o0") = (long int) addr;
++  asm volatile ("ta " SYSCALL_NUM
++		: "=r"(o0)
++		: "r"(g1), "0"(o0)
++		: "cc");
++  __curbrk = (void *) o0;
++
++  if (__curbrk < addr)
++    {
++      __set_errno (ENOMEM);
++      return -1;
++    }
++
++  return 0;
++}
++weak_alias (__brk, brk)
 diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/arch-syscall.h b/sysdeps/unix/sysv/linux/sparc/sparc32/arch-syscall.h
 index 380cddb2d8..35221a707e 100644
 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/arch-syscall.h