diff -pruN 1:19.1.7-10/debian/changelog 1:19.1.7-10ubuntu1/debian/changelog
--- 1:19.1.7-10/debian/changelog	2025-10-28 21:02:28.000000000 +0000
+++ 1:19.1.7-10ubuntu1/debian/changelog	2025-10-29 19:37:40.000000000 +0000
@@ -1,3 +1,11 @@
+llvm-toolchain-19 (1:19.1.7-10ubuntu1) resolute; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Unset BD_ALT_HELLO.
+    - Regenerate the control file.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 29 Oct 2025 20:37:40 +0100
+
 llvm-toolchain-19 (1:19.1.7-10) unstable; urgency=medium
 
   * d/rules: Add dependencies for various build targets. Closes: #1105541.
@@ -45,6 +53,46 @@ llvm-toolchain-19 (1:19.1.7-8) unstable;
 
  -- Matthias Klose <doko@debian.org>  Mon, 27 Oct 2025 17:29:37 +0100
 
+llvm-toolchain-19 (1:19.1.7-7ubuntu3) resolute; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Regenerate the control file.
+    - Unset BD_ALT_HELLO.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 26 Oct 2025 13:47:57 +0100
+
+llvm-toolchain-19 (1:19.1.7-8) UNRELEASED; urgency=medium
+
+  [ Matthias Klose ]
+  * Define -DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=ON on all architectures for correct
+    cross compilers. Except on ppc64, where it thinks it has this feature
+    also on the host.
+  * Drop the build dependency on binutils-gold.
+  * Build using lld on some architecture, use the BFD linker elsewhere.
+  * Always build the LLVMgold plugin, independent of the linker used for
+    the build.
+  * Update libomp symbols file.
+  * Introduce the Ubuntu Questing and Resolute distros.
+  * d/rules: Factor out LIBUNWIND_ARCHS macro.
+  * Limit architecture of binary packages to the ones supported by LLVM.
+  * d/rules: Make grep a bit more quiet.
+
+  [ Gianfranco Costamagna ]
+  * Cherry-pick PR: #137403, #137440 and #149140 to fix sanitizer build
+    in glibc-2.42 (termio/termios issues).
+
+ -- Matthias Klose <doko@debian.org>  Sun, 26 Oct 2025 13:45:19 +0100
+
+llvm-toolchain-19 (1:19.1.7-7ubuntu1) resolute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+   - Unset BD_ALT_HELLO.
+   - Regenerate the control file.
+   - Cherry-pick PR: #137403, #137440 and #149140 to fix some
+     termio/termios new glibc build failures
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 18 Oct 2025 10:57:46 +0200
+
 llvm-toolchain-19 (1:19.1.7-7) unstable; urgency=medium
 
   [ John Paul Adrian Glaubitz ]
@@ -62,6 +110,21 @@ llvm-toolchain-19 (1:19.1.7-7) unstable;
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 28 Sep 2025 16:59:15 +0200
 
+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 ]
diff -pruN 1:19.1.7-10/debian/control 1:19.1.7-10ubuntu1/debian/control
--- 1:19.1.7-10/debian/control	2025-10-28 19:27:02.000000000 +0000
+++ 1:19.1.7-10ubuntu1/debian/control	2025-10-29 19:37:40.000000000 +0000
@@ -15,20 +15,20 @@ Build-Depends: debhelper (>= 11.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-python, 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>,
@@ -43,7 +43,7 @@ Vcs-Browser: https://salsa.debian.org/pk
 # ------------- clang -------------
 
 Package: clang-19
-Architecture: amd64 arm64 armel armhf hurd-amd64 hurd-i386 i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc sparc64 x32
+Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
  ${dep:devlibs-objc},
  libllvm19 (= ${binary:Version}),
@@ -63,7 +63,7 @@ Description: C, C++ and Objective-C comp
  provides most of the support of C++20.
 
 Package: clang-tools-19
-Architecture: amd64 arm64 armel armhf hurd-amd64 hurd-i386 i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc sparc64 x32
+Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, clang-19 (= ${binary:Version}),
  python3
 Description: clang-based tools for C/C++ developments
@@ -77,7 +77,7 @@ Description: clang-based tools for C/C++
  This package contains some clang-based tools like scan-build, clang-cl, etc.
 
 Package: clang-format-19
-Architecture: amd64 arm64 armel armhf hurd-amd64 hurd-i386 i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc sparc64 x32
+Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
  libllvm19 (= ${binary:Version})
 Description: Tool to format C/C++/Obj-C code
@@ -93,7 +93,7 @@ Description: Tool to format C/C++/Obj-C
  This package also provides vim and emacs plugins.
 
 Package: clang-tidy-19
-Architecture: amd64 arm64 armel armhf hurd-amd64 hurd-i386 i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc sparc64 x32
+Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
  libllvm19 (= ${binary:Version}),
  libclang-common-19-dev (= ${binary:Version}),
@@ -105,7 +105,7 @@ Description: clang-based C++ linter tool
  for writing new checks.
 
 Package: clangd-19
-Architecture: amd64 arm64 armel armhf hurd-amd64 hurd-i386 i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc sparc64 x32
+Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libllvm19 (= ${binary:Version}),
  libclang-common-19-dev (= ${binary:Version}),
@@ -137,7 +137,7 @@ Description: C, C++ and Objective-C comp
 Package: libclang1-19
 Provides: ${t64:Provides}
 Section: libs
-Architecture: amd64 arm64 armel armhf hurd-amd64 hurd-i386 i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc sparc64 x32
+Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Description: C interface to the Clang library
@@ -157,7 +157,7 @@ Description: C interface to the Clang li
  Clang-based development tools.
 
 Package: libclang-19-dev
-Architecture: amd64 arm64 armel armhf hurd-amd64 hurd-i386 i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc sparc64 x32
+Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
  ${dep:devlibs-objc}, libclang1-19 (= ${binary:Version}),
@@ -174,7 +174,7 @@ Description: Clang library - Development
  libclang1-19.
 
 Package: libclang-common-19-dev
-Architecture: amd64 arm64 armel armhf hurd-amd64 hurd-i386 i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc sparc64 x32
+Architecture: any
 Multi-Arch: same
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends},
@@ -192,7 +192,7 @@ Description: Clang library - Common deve
 # ------------- compiler-rt -------------
 
 Package: libclang-rt-19-dev
-Architecture: amd64 arm64 armel armhf hurd-amd64 hurd-i386 i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc sparc64 x32
+Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Compiler-rt - development package
@@ -225,7 +225,7 @@ Description: Compiler-rt - wasm64 builti
 # ------------- polly -------------
 
 Package: libpolly-19-dev
-Architecture: amd64 arm64 armel armhf hurd-amd64 hurd-i386 i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc sparc64 x32
+Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: High-level loop and data-locality optimizer
@@ -237,7 +237,7 @@ Description: High-level loop and data-lo
 Package: libclang-cpp19
 Provides: ${t64:Provides}
 Section: libs
-Architecture: amd64 arm64 armel armhf hurd-amd64 hurd-i386 i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc sparc64 x32
+Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm19 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Description: C++ interface to the Clang library
@@ -257,7 +257,7 @@ Description: C++ interface to the Clang
  Clang-based development tools.
 
 Package: libclang-cpp19-dev
-Architecture: amd64 arm64 armel armhf hurd-amd64 hurd-i386 i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc sparc64 x32
+Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
  libclang-cpp19 (= ${binary:Version})
@@ -305,7 +305,7 @@ Description: Library for coverage-guided
 
 Package: python3-clang-19
 Section: python
-Architecture: amd64 arm64 armel armhf hurd-amd64 hurd-i386 i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc sparc64 x32
+Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, libclang-19-dev
 Replaces: python-clang-x.y,
 Conflicts: python-clang-x.y
@@ -339,7 +339,7 @@ Description: Clang examples
 
 Package: libllvm19
 Provides: ${t64:Provides}
-Architecture: amd64 arm64 armel armhf hurd-amd64 hurd-i386 i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc sparc64 x32
+Architecture: any
 Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -354,7 +354,7 @@ Description: Modular compiler and toolch
  This package contains the LLVM runtime library.
 
 Package: llvm-19-linker-tools
-Architecture: amd64 arm64 armel armhf hurd-amd64 hurd-i386 i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc sparc64 x32
+Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Modular compiler and toolchain technologies - Plugins
  LLVM is a collection of libraries and tools that make it easy to build
@@ -364,7 +364,7 @@ Description: Modular compiler and toolch
  This package contains the LLVMgold and LLVMPolly linker plugins.
 
 Package: llvm-19
-Architecture: amd64 arm64 armel armhf hurd-amd64 hurd-i386 i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc sparc64 x32
+Architecture: any
 Suggests: llvm-19-doc
 Depends: llvm-19-runtime (= ${binary:Version}),
  llvm-19-linker-tools (= ${binary:Version}),
@@ -394,7 +394,7 @@ Description: Modular compiler and toolch
  generate code for X96, SparcV10, PowerPC or many other architectures.
 
 Package: llvm-19-runtime
-Architecture: amd64 arm64 armel armhf hurd-amd64 hurd-i386 i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc sparc64 x32
+Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: binfmt-support | systemd
 Description: Modular compiler and toolchain technologies, IR interpreter
@@ -414,11 +414,11 @@ Description: Modular compiler and toolch
  format.
 
 Package: llvm-19-dev
-Architecture: amd64 arm64 armel armhf hurd-amd64 hurd-i386 i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc sparc64 x32
+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
@@ -438,7 +438,7 @@ Description: Modular compiler and toolch
  using llvm.
 
 Package: llvm-19-tools
-Architecture: amd64 arm64 armel armhf hurd-amd64 hurd-i386 i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc sparc64 x32
+Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
  python3-pygments, python3-yaml,
 # Because of yaml-bench
@@ -658,7 +658,7 @@ Description: LLVM OpenMP runtime - Docum
 
 Package: libc++1-19
 Section: libs
-Architecture: amd64 arm64 armel armhf hurd-amd64 hurd-i386 i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc sparc64 x32
+Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: clang
@@ -680,7 +680,7 @@ Description: LLVM C++ Standard library
 
 Package: libc++-19-dev
 Section: libdevel
-Architecture: amd64 arm64 armel armhf hurd-amd64 hurd-i386 i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc sparc64 x32
+Architecture: any
 Depends: libc++1-19 (= ${binary:Version}), ${misc:Depends},
  libc++abi-19-dev (= ${binary:Version}),
  libunwind-19-dev [amd64 arm64 armhf i386 loong64 ppc64 ppc64el riscv64]
@@ -727,7 +727,7 @@ Description: LLVM C++ Standard library (
 
 Package: libc++abi1-19
 Section: libs
-Architecture: amd64 arm64 armel armhf hurd-amd64 hurd-i386 i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc sparc64 x32
+Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Provides: ${t64:Provides}, libc++abi-x.y
@@ -744,7 +744,7 @@ Description: LLVM low level support for
 
 Package: libc++abi-19-dev
 Section: libdevel
-Architecture: amd64 arm64 armel armhf hurd-amd64 hurd-i386 i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc sparc64 x32
+Architecture: any
 Depends: libc++abi1-19 (= ${binary:Version}), ${misc:Depends}
 Breaks: libc++abi-dev (<= 44)
 Provides: libc++abi-x.y-dev
@@ -853,7 +853,7 @@ Description: production-quality unwinder
 # ------------- mlir -------------
 
 Package: mlir-19-tools
-Architecture: amd64 arm64 armel armhf hurd-amd64 hurd-i386 i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc sparc64 x32
+Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Multi-Level Intermediate Representation tools
  Novel approach to building reusable and extensible compiler infrastructure.
@@ -865,7 +865,7 @@ Description: Multi-Level Intermediate Re
 
 Package: libmlir-19
 Section: libs
-Architecture: amd64 arm64 armel armhf hurd-amd64 hurd-i386 i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc sparc64 x32
+Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Provides: ${t64:Provides}, libmlir-x.y
@@ -880,7 +880,7 @@ Description: Multi-Level Intermediate Re
 
 Package: libmlir-19-dev
 Section: libdevel
-Architecture: amd64 arm64 armel armhf hurd-amd64 hurd-i386 i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc sparc64 x32
+Architecture: any
 Depends:
  ${misc:Depends},
  libmlir-19 (= ${binary:Version})
diff -pruN 1:19.1.7-10/debian/rules 1:19.1.7-10ubuntu1/debian/rules
--- 1:19.1.7-10/debian/rules	2025-10-28 12:01:09.000000000 +0000
+++ 1:19.1.7-10ubuntu1/debian/rules	2025-10-29 19:37:40.000000000 +0000
@@ -74,7 +74,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
