diff -pruN 1:19.1.7-6/debian/changelog 1:19.1.7-6ubuntu3/debian/changelog
--- 1:19.1.7-6/debian/changelog	2025-09-12 12:30:06.000000000 +0000
+++ 1:19.1.7-6ubuntu3/debian/changelog	2025-09-15 14:02:03.000000000 +0000
@@ -1,3 +1,18 @@
+llvm-toolchain-19 (1:19.1.7-6ubuntu3) questing; urgency=medium
+
+  * Cherry-pick PR: #137403 and #137440 to fix some
+    termio/termios new glibc build failures
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 15 Sep 2025 16:02:03 +0200
+
+llvm-toolchain-19 (1:19.1.7-6ubuntu1) questing; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+   - Unset BD_ALT_HELLO.
+   - Regenerate the control file.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 15 Sep 2025 09:33:58 +0200
+
 llvm-toolchain-19 (1:19.1.7-6) unstable; urgency=medium
 
   [ Matthias Klose ]
@@ -11,6 +26,21 @@ llvm-toolchain-19 (1:19.1.7-6) unstable;
 
  -- Matthias Klose <doko@debian.org>  Fri, 12 Sep 2025 14:30:06 +0200
 
+llvm-toolchain-19 (1:19.1.7-5ubuntu2) questing; urgency=medium
+
+  * Rebuild against new OCAML ABIs.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 19 Jun 2025 08:50:51 +0200
+
+llvm-toolchain-19 (1:19.1.7-5ubuntu1) questing; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+   - Unset BD_ALT_HELLO.
+   - Regenerate the control file.
+  * On ppc64el configure --with-long-double-format=ieee for upcoming distros.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 03 Jun 2025 12:33:05 +0200
+
 llvm-toolchain-19 (1:19.1.7-5) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -25,6 +55,20 @@ llvm-toolchain-19 (1:19.1.7-4) unstable;
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 26 Apr 2025 22:36:24 +0200
 
+llvm-toolchain-19 (1:19.1.7-3ubuntu2) questing; urgency=medium
+
+  * No-change rebuild for libxml2 soname change.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 20 May 2025 12:21:23 +0200
+
+llvm-toolchain-19 (1:19.1.7-3ubuntu1) plucky; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+   - Unset BD_ALT_HELLO.
+   - Regenerate the control file.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 19 Mar 2025 09:27:35 +0100
+
 llvm-toolchain-19 (1:19.1.7-3) unstable; urgency=medium
 
   * conditionalize the binutils-gold build-dep
@@ -51,6 +95,20 @@ llvm-toolchain-19 (1:19.1.7-2) unstable;
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 25 Feb 2025 18:05:48 +0100
 
+llvm-toolchain-19 (1:19.1.7-1ubuntu2) plucky; urgency=medium
+
+  * Rebuild against new OCAML ABI.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 30 Jan 2025 21:44:21 +0100
+
+llvm-toolchain-19 (1:19.1.7-1ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian; remaining changes:
+   - Unset BD_ALT_HELLO.
+   - Regenerate the control file.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 16 Jan 2025 14:32:51 +0100
+
 llvm-toolchain-19 (1:19.1.7-1) unstable; urgency=medium
 
   [ Matthias Klose ]
@@ -65,6 +123,14 @@ llvm-toolchain-19 (1:19.1.7-1) unstable;
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 14 Jan 2025 14:16:47 +0100
 
+llvm-toolchain-19 (1:19.1.6-1ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian; remaining changes:
+   - Unset BD_ALT_HELLO.
+   - Regenerate the control file.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 18 Dec 2024 19:16:32 +0100
+
 llvm-toolchain-19 (1:19.1.6-1) unstable; urgency=medium
 
   [ Sylvestre Ledru ]
@@ -82,6 +148,18 @@ llvm-toolchain-19 (1:19.1.6-1) unstable;
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 18 Dec 2024 10:01:43 +0100
 
+llvm-toolchain-19 (1:19.1.5-1ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian; remaining changes:
+   - Unset BD_ALT_HELLO.
+   - Regenerate the control file.
+
+   [ Sylvestre Ledru ]
+   * Remove the capability to be able to disable C++ Exceptions in libc++
+   * Bring back C++ exceptions on s390x for libc++ (LP: #2086782)
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 13 Dec 2024 10:40:30 +0100
+
 llvm-toolchain-19 (1:19.1.5-1) unstable; urgency=medium
 
   [ Matthias Klose ]
@@ -95,6 +173,15 @@ llvm-toolchain-19 (1:19.1.5-1) unstable;
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 04 Dec 2024 13:11:08 +0100
 
+llvm-toolchain-19 (1:19.1.4-1ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian; remaining changes:
+   - Unset BD_ALT_HELLO.
+   - Regenerate the control file.
+  * Better correct than less cryptic. Fix BD_ALT_HELLO substitutions.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 27 Nov 2024 10:34:52 +0100
+
 llvm-toolchain-19 (1:19.1.4-1) unstable; urgency=medium
 
   [ Sylvestre Ledru ]
@@ -109,6 +196,15 @@ llvm-toolchain-19 (1:19.1.4-1) unstable;
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 26 Nov 2024 10:14:24 +0100
 
+llvm-toolchain-19 (1:19.1.3-2ubuntu2) plucky; urgency=medium
+
+  [ Matthias Klose ]
+  * d/rules: Add a BD_ALT_HELLO macro. Set it to anything else than "yes" to avoid
+    generating alternative build dependencies on hello in the control file.
+  * Unset BD_ALT_HELLO.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 13 Nov 2024 11:41:00 +0100
+
 llvm-toolchain-19 (1:19.1.3-2) unstable; urgency=medium
 
   * enable OpenMP (without offloading) on riscv64 (and mips64el and loong64)
@@ -2067,7 +2163,6 @@ llvm-toolchain-snapshot (1:14~++20220123
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 23 Jan 2022 20:48:09 +0100
 
-
 llvm-toolchain-snapshot (1:14~++20220107114130+3a604fdbcd5f-1~exp1) experimental; urgency=medium
 
   * New snapshot release
@@ -5078,6 +5173,38 @@ llvm-toolchain-7 (1:7.0.1-4) unstable; u
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 02 Jan 2019 12:37:45 +0100
 
+llvm-toolchain-snapshot (1:8~svn346586-1~exp1) experimental; urgency=medium
+
+  * New snapshot release
+  * Also install libOptRemarks.so
+  * Merge all the recent 7 changes into snapshot
+    (Closes: #913058) the co install issue with libc++ & openmp
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 10 Nov 2018 15:14:15 +0100
+
+llvm-toolchain-snapshot (1:8~svn345569-1~exp1) experimental; urgency=medium
+
+  [ Sylvestre Ledru ]
+  * Remove bat files https://bugs.llvm.org/show_bug.cgi?id=30755
+  * Fix the autopkgtest script (no gcc in the test)
+  * remove dep from lld to llvm-8-dev because lld
+    doesn't use LLVM LTO
+  * remove old Replaces/Breaks
+  * Standards-Version: 4.2.1
+  * Backport a fix to improve scan-build code error.
+    Thanks to Roman Lebedev for the fix(Closes: #909662)
+  * Remove bat files https://bugs.llvm.org/show_bug.cgi?id=30755
+  * Install bash-completion for clang
+  * Disable ocaml on armel
+
+  [ Gianfranco Costamagna ]
+  * Take option two in bug #877567 to fix FTBFS on mips and mipsel
+
+  [ Sylvestre Ledru ]
+  * New snapshot release
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 30 Oct 2018 08:31:14 +0100
+
 llvm-toolchain-7 (1:7.0.1-4) unstable; urgency=medium
 
   * New snapshot release
diff -pruN 1:19.1.7-6/debian/control 1:19.1.7-6ubuntu3/debian/control
--- 1:19.1.7-6/debian/control	2025-09-11 18:06:38.000000000 +0000
+++ 1:19.1.7-6ubuntu3/debian/control	2025-09-12 17:44:56.000000000 +0000
@@ -16,20 +16,20 @@ Build-Depends: debhelper (>= 10.0), cmak
     libipt-dev [amd64 i386],
     lcov, procps, help2man,
     zlib1g-dev, libzstd-dev,
-    g++-multilib [amd64 i386 mips64 mips64el mipsel powerpc ppc64 s390x sparc sparc64 x32] | hello [amd64 i386 mips64 mips64el mipsel powerpc ppc64 s390x sparc sparc64 x32],
+    g++-multilib [amd64 i386 mips64 mips64el mipsel powerpc ppc64 sparc sparc64 x32],
     libjs-mathjax, python3-myst-parser | python3-recommonmark, python3-pexpect,
     doxygen, time,
     ocaml-base [amd64 arm64 ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 ppc64el riscv64 s390x],
     ocaml-findlib [amd64 arm64 ppc64el riscv64 s390x],
     libctypes-ocaml-dev [amd64 arm64 ppc64el riscv64 s390x],
     dh-exec, dh-ocaml [amd64 arm64 ppc64el riscv64 s390x],
-    libpfm4-dev [linux-any], python3-setuptools, libz3-dev [!sh4],
+    libpfm4-dev [linux-any], python3-setuptools, 
 # "| hello" is for older buster/bionic distros without spirv support
 # We need to keep the constraints coherent between the two alternatives, otherwise
 # hello would get installed unexpectedly and prevent e.g. wasi-libc from getting pulled
-    llvm-spirv-19 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] <!stage1> | hello [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] <!stage1>,
-    spirv-tools [linux-any] <!stage1> | hello [linux-any] <!stage1>,
-    wasi-libc | hello,
+    llvm-spirv-19 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] <!stage1>,
+    spirv-tools [linux-any] <!stage1>,
+    wasi-libc,
     libcurl4-openssl-dev <!stage1> | libcurl-dev <!stage1>,
     libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] <!stage1>,
     protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] <!stage1>,
@@ -418,7 +418,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, libffi-dev, ${misc:Depends},
  llvm-19 (= ${binary:Version}), libllvm19 (= ${binary:Version}), libncurses-dev,
  llvm-19-tools (= ${binary:Version}), libclang-cpp19 (= ${binary:Version}),
- libxml2-dev, libz3-dev [!sh4],
+ libxml2-dev, 
 Breaks: libllvm19 (<< 1:19.1.0-4)
 Replaces: libllvm19 (<< 1:19.1.0-4)
 Description: Modular compiler and toolchain technologies, libraries and headers
diff -pruN 1:19.1.7-6/debian/patches/137403.patch 1:19.1.7-6ubuntu3/debian/patches/137403.patch
--- 1:19.1.7-6/debian/patches/137403.patch	1970-01-01 00:00:00.000000000 +0000
+++ 1:19.1.7-6ubuntu3/debian/patches/137403.patch	2025-09-15 14:02:03.000000000 +0000
@@ -0,0 +1,64 @@
+From 83bf10fffd7065317d50f19e138c9e9fd6adc064 Mon Sep 17 00:00:00 2001
+From: Tom Stellard <tstellar@redhat.com>
+Date: Fri, 25 Apr 2025 14:49:34 -0700
+Subject: [PATCH] [sanitizer_common] Remove interceptors for deprecated struct
+ termio
+
+This struct will be removed from glibc-2.42 and has been deprecated for
+a very long time.
+
+Fixes #137321
+---
+ .../sanitizer_common_interceptors_ioctl.inc               | 8 --------
+ .../sanitizer_common/sanitizer_platform_limits_posix.cpp  | 3 ---
+ .../sanitizer_common/sanitizer_platform_limits_posix.h    | 1 -
+ 3 files changed, 12 deletions(-)
+
+diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+index f88f914b1d149..bc8f02826c614 100644
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+@@ -342,17 +342,9 @@ static void ioctl_table_fill() {
+   _(SOUND_PCM_WRITE_CHANNELS, WRITE, sizeof(int));
+   _(SOUND_PCM_WRITE_FILTER, WRITE, sizeof(int));
+   _(TCFLSH, NONE, 0);
+-#if SANITIZER_GLIBC
+-  _(TCGETA, WRITE, struct_termio_sz);
+-#endif
+   _(TCGETS, WRITE, struct_termios_sz);
+   _(TCSBRK, NONE, 0);
+   _(TCSBRKP, NONE, 0);
+-#if SANITIZER_GLIBC
+-  _(TCSETA, READ, struct_termio_sz);
+-  _(TCSETAF, READ, struct_termio_sz);
+-  _(TCSETAW, READ, struct_termio_sz);
+-#endif
+   _(TCSETS, READ, struct_termios_sz);
+   _(TCSETSF, READ, struct_termios_sz);
+   _(TCSETSW, READ, struct_termios_sz);
+#diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+#index b4d87ab6228e5..7a89bf1c74985 100644
+#--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+#+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+#@@ -494,9 +494,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+#   unsigned struct_input_id_sz = sizeof(struct input_id);
+#   unsigned struct_mtpos_sz = sizeof(struct mtpos);
+#   unsigned struct_rtentry_sz = sizeof(struct rtentry);
+#-#if SANITIZER_GLIBC || SANITIZER_ANDROID
+#-  unsigned struct_termio_sz = sizeof(struct termio);
+#-#endif
+#   unsigned struct_vt_consize_sz = sizeof(struct vt_consize);
+#   unsigned struct_vt_sizes_sz = sizeof(struct vt_sizes);
+#   unsigned struct_vt_stat_sz = sizeof(struct vt_stat);
+diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+index 348bb4f27aec3..fdc52aa56c493 100644
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+@@ -1063,7 +1063,6 @@ extern unsigned struct_hd_geometry_sz;
+ extern unsigned struct_input_absinfo_sz;
+ extern unsigned struct_input_id_sz;
+ extern unsigned struct_mtpos_sz;
+-extern unsigned struct_termio_sz;
+ extern unsigned struct_vt_consize_sz;
+ extern unsigned struct_vt_sizes_sz;
+ extern unsigned struct_vt_stat_sz;
diff -pruN 1:19.1.7-6/debian/patches/137440.patch 1:19.1.7-6ubuntu3/debian/patches/137440.patch
--- 1:19.1.7-6/debian/patches/137440.patch	1970-01-01 00:00:00.000000000 +0000
+++ 1:19.1.7-6ubuntu3/debian/patches/137440.patch	2025-09-15 14:02:03.000000000 +0000
@@ -0,0 +1,31 @@
+From 24484779287c4493d9a53dd94e0d94ed92250ba4 Mon Sep 17 00:00:00 2001
+From: cqwrteur <100043421+trcrsired@users.noreply.github.com>
+Date: Sat, 26 Apr 2025 11:16:49 +0800
+Subject: [PATCH] [compiler-rt] Remove struct_termio_sz from
+ sanitizer_platform_limits_posix.cpp
+
+The `struct termio` and its associated code have been removed from glibc as they are considered obsolete. This change removes the corresponding code in compiler-rt to maintain compatibility.
+
+Additionally, the check for `struct_termio_sz` specific to Android has been removed. There is no guarantee that the Linux kernel or Google will continue supporting `struct termio`, and its removal aligns with the deprecation in glibc.
+
+Reference: glibc commit e04afb71771710cdc6025fe95908f5f17de7b72d
+
+https://github.com/bminor/glibc/commit/e04afb71771710cdc6025fe95908f5f17de7b72d
+---
+ .../lib/sanitizer_common/sanitizer_platform_limits_posix.cpp   | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+index b4d87ab6228e5..7a89bf1c74985 100644
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+@@ -479,9 +479,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned struct_input_id_sz = sizeof(struct input_id);
+   unsigned struct_mtpos_sz = sizeof(struct mtpos);
+   unsigned struct_rtentry_sz = sizeof(struct rtentry);
+-#if SANITIZER_GLIBC || SANITIZER_ANDROID
+-  unsigned struct_termio_sz = sizeof(struct termio);
+-#endif
+   unsigned struct_vt_consize_sz = sizeof(struct vt_consize);
+   unsigned struct_vt_sizes_sz = sizeof(struct vt_sizes);
+   unsigned struct_vt_stat_sz = sizeof(struct vt_stat);
diff -pruN 1:19.1.7-6/debian/patches/149140.patch 1:19.1.7-6ubuntu3/debian/patches/149140.patch
--- 1:19.1.7-6/debian/patches/149140.patch	1970-01-01 00:00:00.000000000 +0000
+++ 1:19.1.7-6ubuntu3/debian/patches/149140.patch	2025-09-15 14:02:03.000000000 +0000
@@ -0,0 +1,115 @@
+From 56a222fb580609085cf39209da8f1057267eef27 Mon Sep 17 00:00:00 2001
+From: trcrsired <uwgghhbcad@gmail.com>
+Date: Thu, 17 Jul 2025 12:18:30 +0800
+Subject: [PATCH] [sanitizer] Remove usage of termios ioctl constants for glibc
+
+glibc 2.42 made all usage of termios ioctl constants strictly internal.
+
+Therefore, we remove all usage for those removed constants for glibc.
+
+We keep a pesudo definition for PowerPC to make bots happy.
+
+[sanitizer] avoid using ioctl constants for glibc above 2.41
+
+[compiler-rt] code formatting to make CI happy
+
+[compiler-rt] fix a missing #endif
+---
+ .../sanitizer_common_interceptors_ioctl.inc       |  4 ++++
+ .../lib/sanitizer_common/sanitizer_platform.h     | 15 +++++++++++++++
+ .../sanitizer_platform_limits_posix.cpp           |  4 ++++
+ .../sanitizer_platform_limits_posix.h             |  4 +++-
+ 4 files changed, 26 insertions(+), 1 deletion(-)
+
+diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+index 08c2be47f5358..673f284b6a043 100644
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+@@ -344,12 +344,16 @@ static void ioctl_table_fill() {
+   _(SOUND_PCM_WRITE_CHANNELS, WRITE, sizeof(int));
+   _(SOUND_PCM_WRITE_FILTER, WRITE, sizeof(int));
+   _(TCFLSH, NONE, 0);
++#    if SANITIZER_TERMIOS_IOCTL_CONSTANTS
+   _(TCGETS, WRITE, struct_termios_sz);
++#    endif
+   _(TCSBRK, NONE, 0);
+   _(TCSBRKP, NONE, 0);
++#    if SANITIZER_TERMIOS_IOCTL_CONSTANTS
+   _(TCSETS, READ, struct_termios_sz);
+   _(TCSETSF, READ, struct_termios_sz);
+   _(TCSETSW, READ, struct_termios_sz);
++#    endif
+   _(TCXONC, NONE, 0);
+   _(TIOCGLCKTRMIOS, WRITE, struct_termios_sz);
+   _(TIOCGSOFTCAR, WRITE, sizeof(int));
+diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
+index 196c0a988478e..13099fe84b0aa 100644
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
+@@ -482,4 +482,19 @@
+ #  define SANITIZER_START_BACKGROUND_THREAD_IN_ASAN_INTERNAL 0
+ #endif
+ 
++#if SANITIZER_LINUX
++#  if SANITIZER_GLIBC
++// Workaround for
++// glibc/commit/3d3572f59059e2b19b8541ea648a6172136ec42e
++// Linux: Keep termios ioctl constants strictly internal
++#    if __GLIBC_PREREQ(2, 41)
++#      define SANITIZER_TERMIOS_IOCTL_CONSTANTS 0
++#    else
++#      define SANITIZER_TERMIOS_IOCTL_CONSTANTS 1
++#    endif
++#  else
++#    define SANITIZER_TERMIOS_IOCTL_CONSTANTS 1
++#  endif
++#endif
++
+ #endif  // SANITIZER_PLATFORM_H
+diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+index 7a89bf1c74985..ef4b8a85d6634 100644
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+@@ -780,15 +780,19 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+ #endif // SOUND_VERSION
+   unsigned IOCTL_TCFLSH = TCFLSH;
+   unsigned IOCTL_TCGETA = TCGETA;
++#    if SANITIZER_TERMIOS_IOCTL_CONSTANTS
+   unsigned IOCTL_TCGETS = TCGETS;
++#    endif
+   unsigned IOCTL_TCSBRK = TCSBRK;
+   unsigned IOCTL_TCSBRKP = TCSBRKP;
+   unsigned IOCTL_TCSETA = TCSETA;
+   unsigned IOCTL_TCSETAF = TCSETAF;
+   unsigned IOCTL_TCSETAW = TCSETAW;
++#    if SANITIZER_TERMIOS_IOCTL_CONSTANTS
+   unsigned IOCTL_TCSETS = TCSETS;
+   unsigned IOCTL_TCSETSF = TCSETSF;
+   unsigned IOCTL_TCSETSW = TCSETSW;
++#    endif
+   unsigned IOCTL_TCXONC = TCXONC;
+   unsigned IOCTL_TIOCGLCKTRMIOS = TIOCGLCKTRMIOS;
+   unsigned IOCTL_TIOCGSOFTCAR = TIOCGSOFTCAR;
+diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+index 0d1273821d655..d3aec40b525e6 100644
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+@@ -1315,15 +1315,17 @@ extern unsigned IOCTL_SNDCTL_COPR_WCODE;
+ extern unsigned IOCTL_SNDCTL_COPR_WDATA;
+ extern unsigned IOCTL_TCFLSH;
+ extern unsigned IOCTL_TCGETA;
+-extern unsigned IOCTL_TCGETS;
+ extern unsigned IOCTL_TCSBRK;
+ extern unsigned IOCTL_TCSBRKP;
+ extern unsigned IOCTL_TCSETA;
+ extern unsigned IOCTL_TCSETAF;
+ extern unsigned IOCTL_TCSETAW;
++#    if SANITIZER_TERMIOS_IOCTL_CONSTANTS
++extern unsigned IOCTL_TCGETS;
+ extern unsigned IOCTL_TCSETS;
+ extern unsigned IOCTL_TCSETSF;
+ extern unsigned IOCTL_TCSETSW;
++#    endif
+ extern unsigned IOCTL_TCXONC;
+ extern unsigned IOCTL_TIOCGLCKTRMIOS;
+ extern unsigned IOCTL_TIOCGSOFTCAR;
diff -pruN 1:19.1.7-6/debian/patches/series 1:19.1.7-6ubuntu3/debian/patches/series
--- 1:19.1.7-6/debian/patches/series	2025-09-05 19:35:23.000000000 +0000
+++ 1:19.1.7-6ubuntu3/debian/patches/series	2025-09-15 14:02:03.000000000 +0000
@@ -141,3 +141,6 @@ ubuntu-plucky.patch
 bolt-disable-proc-check.diff
 python3.13-quote.diff
 gcc-15.diff
+137440.patch
+137403.patch
+149140.patch
diff -pruN 1:19.1.7-6/debian/rules 1:19.1.7-6ubuntu3/debian/rules
--- 1:19.1.7-6/debian/rules	2025-09-04 09:38:37.000000000 +0000
+++ 1:19.1.7-6ubuntu3/debian/rules	2025-09-12 17:44:56.000000000 +0000
@@ -68,7 +68,7 @@ endif
 
 # set this macro to anything else than "yes" to avoid generating alternative
 # build dependencies on hello in the control file.
-BD_ALT_HELLO = yes
+#BD_ALT_HELLO = yes
 ifeq ($(BD_ALT_HELLO),yes)
   BD_ALT_HELLO_SUBST = 's/@BEGIN_OPTIONAL_HELLO@//g;s/@END_OPTIONAL_HELLO@//g'
 else
