import UBI llvm-21.1.8-1.module+el8.10.0+23969+c061985f

2026-05-13 16:39:36 -04:00
18 changed files with 4252 additions and 1290 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,2 @@
-SOURCES/llvm-project-20.1.8.src.tar.xz
-SOURCES/llvm-project-20.1.8.src.tar.xz.sig
+SOURCES/llvm-project-21.1.8.src.tar.xz
+SOURCES/llvm-project-21.1.8.src.tar.xz.sig
--- a/.llvm.metadata
+++ b/.llvm.metadata
@ -1,2 +1,2 @@
-f148d196711cf7cfa0850717a4fd2c4c795d9abe SOURCES/llvm-project-20.1.8.src.tar.xz
-3663169aeb9c255bd11d3fa6bbb2c750b52b6fd3 SOURCES/llvm-project-20.1.8.src.tar.xz.sig
+a02f43a68bf59be15a61d6ddd0d99bd4973244f4 SOURCES/llvm-project-21.1.8.src.tar.xz
+c10b9d8ebce251f8be51eb71378122300fd37de3 SOURCES/llvm-project-21.1.8.src.tar.xz.sig
--- a/SOURCES/0001-22-polly-shared-libs.patch
+++ b/SOURCES/0001-22-polly-shared-libs.patch
@ -0,0 +1,59 @@
+From daf5077c8ce848b39239879369679c9fea7041b1 Mon Sep 17 00:00:00 2001
+From: Konrad Kleine <kkleine@redhat.com>
+Date: Tue, 28 Jan 2025 08:34:09 +0000
+Subject: [PATCH] shared libs
+
+---
+ polly/cmake/polly_macros.cmake    | 5 ++++-
+ polly/lib/CMakeLists.txt          | 1 +
+ polly/lib/External/CMakeLists.txt | 1 +
+ 3 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/polly/cmake/polly_macros.cmake b/polly/cmake/polly_macros.cmake
+index 9bd7b0b0ea59..fc2c3a76901f 100644
+--- a/polly/cmake/polly_macros.cmake
+++ b/polly/cmake/polly_macros.cmake
+@@ -1,5 +1,5 @@
+ macro(add_polly_library name)
+-  cmake_parse_arguments(ARG "" "" "" ${ARGN})
+  cmake_parse_arguments(ARG "SHARED" "" "" ${ARGN})
+   set(srcs ${ARG_UNPARSED_ARGUMENTS})
+   if(MSVC_IDE OR XCODE)
+     file( GLOB_RECURSE headers *.h *.td *.def)
+@@ -17,6 +17,9 @@ macro(add_polly_library name)
+   else()
+     set(libkind)
+   endif()
+  if (ARG_SHARED)
+    set(libkind SHARED)
+  endif()
+   add_library( ${name} ${libkind} ${srcs} )
+   set_target_properties(${name} PROPERTIES FOLDER "Polly/Libraries")
+ 
+diff --git a/polly/lib/CMakeLists.txt b/polly/lib/CMakeLists.txt
+index 0ed673815ff3..e156dcb31655 100644
+--- a/polly/lib/CMakeLists.txt
+++ b/polly/lib/CMakeLists.txt
+@@ -41,6 +41,7 @@ set(POLLY_COMPONENTS
+ # the sources them to be recompiled for each of them.
+ add_llvm_pass_plugin(Polly
+   NO_MODULE
+  SHARED
+   SUBPROJECT Polly
+   Analysis/DependenceInfo.cpp
+   Analysis/ScopDetection.cpp
+diff --git a/polly/lib/External/CMakeLists.txt b/polly/lib/External/CMakeLists.txt
+index ab5cba93cdcf..fdfd06864bc7 100644
+--- a/polly/lib/External/CMakeLists.txt
+++ b/polly/lib/External/CMakeLists.txt
+@@ -284,6 +284,7 @@ if (POLLY_BUNDLED_ISL)
+     )
+ 
+   add_polly_library(PollyISL
+    SHARED
+     ${ISL_FILES}
+     )
+ 
+-- 
+2.50.1
+
--- a/SOURCES/0001-BPF-Support-Jump-Table-149715.patch
+++ b/SOURCES/0001-BPF-Support-Jump-Table-149715.patch
--- a/SOURCES/0001-CGP-Bail-out-if-Base-Scaled-Reg-does-not-dominate-in.patch
+++ b/SOURCES/0001-CGP-Bail-out-if-Base-Scaled-Reg-does-not-dominate-in.patch
@ -0,0 +1,131 @@
+From dde30a47313bf52fef02bbcb1de931a8d725659f Mon Sep 17 00:00:00 2001
+From: Florian Hahn <flo@fhahn.com>
+Date: Fri, 6 Jun 2025 12:38:30 +0100
+Subject: [PATCH] [CGP] Bail out if (Base|Scaled)Reg does not dominate insert
+ point. (#142949)
+
+(Base|Scaled)Reg may not dominate the chosen insert point, if there are
+multiple uses of the address. Bail out if that's the case, otherwise we
+will generate invalid IR.
+
+In some cases, we could probably adjust the insert point or hoist the
+(Base|Scaled)Reg.
+
+Fixes https://github.com/llvm/llvm-project/issues/142830.
+
+PR: https://github.com/llvm/llvm-project/pull/142949
+---
+ llvm/lib/CodeGen/CodeGenPrepare.cpp           | 13 +++-
+ .../X86/sink-addrmode-reg-does-not-geps.ll    | 76 +++++++++++++++++++
+ 2 files changed, 87 insertions(+), 2 deletions(-)
+ create mode 100644 llvm/test/Transforms/CodeGenPrepare/X86/sink-addrmode-reg-does-not-geps.ll
+
+diff --git a/llvm/lib/CodeGen/CodeGenPrepare.cpp b/llvm/lib/CodeGen/CodeGenPrepare.cpp
+index 822ed6283117..32348a899683 100644
+--- a/llvm/lib/CodeGen/CodeGenPrepare.cpp
+++ b/llvm/lib/CodeGen/CodeGenPrepare.cpp
+@@ -5945,8 +5945,17 @@ bool CodeGenPrepare::optimizeMemoryInst(Instruction *MemoryInst, Value *Addr,
+   // The current BB may be optimized multiple times, we can't guarantee the
+   // reuse of Addr happens later, call findInsertPos to find an appropriate
+   // insert position.
+-  IRBuilder<> Builder(MemoryInst->getParent(),
+-                      findInsertPos(Addr, MemoryInst, SunkAddr));
+  auto InsertPos = findInsertPos(Addr, MemoryInst, SunkAddr);
+
+  // TODO: Adjust insert point considering (Base|Scaled)Reg if possible.
+  if (!SunkAddr) {
+    auto &DT = getDT(*MemoryInst->getFunction());
+    if ((AddrMode.BaseReg && !DT.dominates(AddrMode.BaseReg, &*InsertPos)) ||
+        (AddrMode.ScaledReg && !DT.dominates(AddrMode.ScaledReg, &*InsertPos)))
+      return Modified;
+  }
+
+  IRBuilder<> Builder(MemoryInst->getParent(), InsertPos);
+ 
+   if (SunkAddr) {
+     LLVM_DEBUG(dbgs() << "CGP: Reusing nonlocal addrmode: " << AddrMode
+diff --git a/llvm/test/Transforms/CodeGenPrepare/X86/sink-addrmode-reg-does-not-geps.ll b/llvm/test/Transforms/CodeGenPrepare/X86/sink-addrmode-reg-does-not-geps.ll
+new file mode 100644
+index 000000000000..1640bafbd0bf
+--- /dev/null
+++ b/llvm/test/Transforms/CodeGenPrepare/X86/sink-addrmode-reg-does-not-geps.ll
+@@ -0,0 +1,76 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
+; RUN: opt -S -passes='require<profile-summary>,function(codegenprepare)' %s | FileCheck %s
+
+target triple = "x86_64-unknown-linux"
+
+declare i1 @cond(float)
+
+define void @scaled_reg_does_not_dominate_insert_point(ptr %src) {
+; CHECK-LABEL: define void @scaled_reg_does_not_dominate_insert_point(
+; CHECK-SAME: ptr [[SRC:%.*]]) {
+; CHECK-NEXT:  [[BB:.*]]:
+; CHECK-NEXT:    br label %[[LOOP:.*]]
+; CHECK:       [[LOOP]]:
+; CHECK-NEXT:    [[IV:%.*]] = phi i64 [ 0, %[[BB]] ], [ [[IV_NEXT:%.*]], %[[LOOP]] ]
+; CHECK-NEXT:    [[IV_NEXT]] = add i64 [[IV]], 1
+; CHECK-NEXT:    [[SUNKADDR2:%.*]] = mul i64 [[IV_NEXT]], 2
+; CHECK-NEXT:    [[SUNKADDR3:%.*]] = getelementptr i8, ptr [[SRC]], i64 [[SUNKADDR2]]
+; CHECK-NEXT:    [[SUNKADDR4:%.*]] = getelementptr i8, ptr [[SUNKADDR3]], i64 6
+; CHECK-NEXT:    [[L_0:%.*]] = load float, ptr [[SUNKADDR4]], align 4
+; CHECK-NEXT:    [[SUNKADDR:%.*]] = mul i64 [[IV]], 2
+; CHECK-NEXT:    [[SUNKADDR1:%.*]] = getelementptr i8, ptr [[SRC]], i64 [[SUNKADDR]]
+; CHECK-NEXT:    [[L_1:%.*]] = load float, ptr [[SUNKADDR1]], align 4
+; CHECK-NEXT:    [[TMP0:%.*]] = call i1 @cond(float [[L_0]])
+; CHECK-NEXT:    [[C:%.*]] = call i1 @cond(float [[L_1]])
+; CHECK-NEXT:    br i1 [[C]], label %[[LOOP]], label %[[EXIT:.*]]
+; CHECK:       [[EXIT]]:
+; CHECK-NEXT:    ret void
+;
+bb:
+  %gep.base = getelementptr i8, ptr %src, i64 8
+  br label %loop
+
+loop:
+  %iv = phi i64 [ 0, %bb ], [ %iv.next, %loop ]
+  %iv.shl = shl i64 %iv, 1
+  %gep.shl = getelementptr i8, ptr %gep.base, i64 %iv.shl
+  %gep.sub = getelementptr i8, ptr %gep.shl, i64 -8
+  %iv.next = add i64 %iv, 1
+  %l.0 = load float, ptr %gep.shl, align 4
+  %l.1 = load float, ptr %gep.sub, align 4
+  call i1 @cond(float %l.0)
+  %c = call i1 @cond(float %l.1)
+  br i1 %c, label %loop, label %exit
+
+exit:
+  ret void
+}
+
+define void @check_dt_after_modifying_cfg(ptr %dst, i64 %x, i8 %y, i8 %z) {
+; CHECK-LABEL: define void @check_dt_after_modifying_cfg(
+; CHECK-SAME: ptr [[DST:%.*]], i64 [[X:%.*]], i8 [[Y:%.*]], i8 [[Z:%.*]]) {
+; CHECK-NEXT:  [[ENTRY:.*]]:
+; CHECK-NEXT:    [[OFFSET:%.*]] = lshr i64 [[X]], 2
+; CHECK-NEXT:    [[SEL_FROZEN:%.*]] = freeze i8 [[Z]]
+; CHECK-NEXT:    [[CMP:%.*]] = icmp slt i8 [[SEL_FROZEN]], 0
+; CHECK-NEXT:    br i1 [[CMP]], label %[[SELECT_END:.*]], label %[[SELECT_FALSE_SINK:.*]]
+; CHECK:       [[SELECT_FALSE_SINK]]:
+; CHECK-NEXT:    [[SMIN:%.*]] = tail call i8 @llvm.smin.i8(i8 [[Y]], i8 0)
+; CHECK-NEXT:    br label %[[SELECT_END]]
+; CHECK:       [[SELECT_END]]:
+; CHECK-NEXT:    [[SEL:%.*]] = phi i8 [ 0, %[[ENTRY]] ], [ [[SMIN]], %[[SELECT_FALSE_SINK]] ]
+; CHECK-NEXT:    [[SUNKADDR:%.*]] = getelementptr i8, ptr [[DST]], i64 [[OFFSET]]
+; CHECK-NEXT:    store i8 [[SEL]], ptr [[SUNKADDR]], align 1
+; CHECK-NEXT:    ret void
+;
+entry:
+  %offset = lshr i64 %x, 2
+  %gep.dst = getelementptr i8, ptr %dst, i64 %offset
+  %smin = tail call i8 @llvm.smin.i8(i8 %y, i8 0)
+  %cmp = icmp slt i8 %z, 0
+  %sel = select i1 %cmp, i8 0, i8 %smin
+  store i8 %sel, ptr %gep.dst, align 1
+  ret void
+}
+
+declare i8 @llvm.smin.i8(i8, i8) #0
+-- 
+2.50.1
+
--- a/SOURCES/0001-PowerPC-Add-check-for-cast-when-shufflevector-172443.patch
+++ b/SOURCES/0001-PowerPC-Add-check-for-cast-when-shufflevector-172443.patch
@ -0,0 +1,137 @@
+From 98b82f90dfb7865ae4dbfcb5a83a9e817e7894a1 Mon Sep 17 00:00:00 2001
+From: Kevin Per <kevin.per@protonmail.com>
+Date: Thu, 18 Dec 2025 10:14:01 +0100
+Subject: [PATCH] [PowerPC]: Add check for cast when shufflevector (#172443)
+
+The crash happens because the cast for `Mask =
+cast<ShuffleVectorSDNode>(Res)->getMask();` fails for node `t197: v16i8
+= vector_shuffle<16,17,18,19,4,5,6,7,8,9,10,11,u,u,u,u> t196, t196`.
+However, both `LHS` and `RHS` are the same node, so
+`DAG.getCommutedVectorShuffle` doesn't return a `ShuffleVectorSDNode`
+and crashes. The fix is to add a check before the cast is performed.
+
+Closes https://github.com/llvm/llvm-project/issues/172265
+---
+ llvm/lib/Target/PowerPC/PPCISelLowering.cpp   |  4 +
+ .../test/CodeGen/PowerPC/vec_shuffle_le_be.ll | 94 +++++++++++++++++++
+ 2 files changed, 98 insertions(+)
+ create mode 100644 llvm/test/CodeGen/PowerPC/vec_shuffle_le_be.ll
+
+diff --git a/llvm/lib/Target/PowerPC/PPCISelLowering.cpp b/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
+index 5b1d9f814806..21297b812968 100644
+--- a/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
+++ b/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
+@@ -16886,6 +16886,10 @@ SDValue PPCTargetLowering::combineVectorShuffle(ShuffleVectorSDNode *SVN,
+       RHS.getOpcode() != ISD::VECTOR_SHUFFLE) {
+     std::swap(LHS, RHS);
+     Res = DAG.getCommutedVectorShuffle(*SVN);
+
+    if (!isa<ShuffleVectorSDNode>(Res))
+      return Res;
+
+     Mask = cast<ShuffleVectorSDNode>(Res)->getMask();
+   }
+ 
+diff --git a/llvm/test/CodeGen/PowerPC/vec_shuffle_le_be.ll b/llvm/test/CodeGen/PowerPC/vec_shuffle_le_be.ll
+new file mode 100644
+index 000000000000..24c1e54dd952
+--- /dev/null
+++ b/llvm/test/CodeGen/PowerPC/vec_shuffle_le_be.ll
+@@ -0,0 +1,94 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
+; RUN: llc -verify-machineinstrs < %s -mtriple=powerpc64le-unknown-linux-gnu | FileCheck -check-prefix=CHECK-LE %s
+; RUN: llc -verify-machineinstrs < %s -mtriple=powerpc64-unknown-linux-gnu | FileCheck -check-prefix=CHECK-BE %s
+
+define <32 x i32> @issue_172265(<32 x i32> %BS_ARG_1, <3 x i32> %0) {
+; CHECK-LABEL: issue_172265:
+; CHECK:       # %bb.0: # %entry
+; CHECK-NEXT:    addis 3, 2, .LCPI18_0@toc@ha
+; CHECK-NEXT:    vspltw 3, 10, 1
+; CHECK-NEXT:    addi 3, 3, .LCPI18_0@toc@l
+; CHECK-NEXT:    vmr 7, 3
+; CHECK-NEXT:    lvx 4, 0, 3
+; CHECK-NEXT:    addis 3, 2, .LCPI18_1@toc@ha
+; CHECK-NEXT:    addi 3, 3, .LCPI18_1@toc@l
+; CHECK-NEXT:    vmr 8, 3
+; CHECK-NEXT:    vmr 9, 3
+; CHECK-NEXT:    vperm 4, 3, 3, 4
+; CHECK-NEXT:    lvx 1, 0, 3
+; CHECK-NEXT:    addis 3, 2, .LCPI18_2@toc@ha
+; CHECK-NEXT:    addi 3, 3, .LCPI18_2@toc@l
+; CHECK-NEXT:    lvx 5, 0, 3
+; CHECK-NEXT:    addis 3, 2, .LCPI18_3@toc@ha
+; CHECK-NEXT:    addi 3, 3, .LCPI18_3@toc@l
+; CHECK-NEXT:    lvx 6, 0, 3
+; CHECK-NEXT:    addis 3, 2, .LCPI18_4@toc@ha
+; CHECK-NEXT:    addi 3, 3, .LCPI18_4@toc@l
+; CHECK-NEXT:    vperm 4, 2, 4, 1
+; CHECK-NEXT:    lvx 2, 0, 3
+; CHECK-NEXT:    vperm 0, 3, 3, 5
+; CHECK-NEXT:    vperm 5, 3, 3, 6
+; CHECK-NEXT:    vperm 6, 3, 3, 2
+; CHECK-NEXT:    vmr 2, 0
+; CHECK-NEXT:    blr
+; CHECK-LE-LABEL: issue_172265:
+; CHECK-LE:       # %bb.0: # %entry
+; CHECK-LE-NEXT:    addis 3, 2, .LCPI0_0@toc@ha
+; CHECK-LE-NEXT:    xxspltw 35, 42, 1
+; CHECK-LE-NEXT:    addi 3, 3, .LCPI0_0@toc@l
+; CHECK-LE-NEXT:    vmr 7, 3
+; CHECK-LE-NEXT:    vmr 8, 3
+; CHECK-LE-NEXT:    vmr 9, 3
+; CHECK-LE-NEXT:    lxvd2x 0, 0, 3
+; CHECK-LE-NEXT:    addis 3, 2, .LCPI0_1@toc@ha
+; CHECK-LE-NEXT:    addi 3, 3, .LCPI0_1@toc@l
+; CHECK-LE-NEXT:    lxvd2x 1, 0, 3
+; CHECK-LE-NEXT:    addis 3, 2, .LCPI0_2@toc@ha
+; CHECK-LE-NEXT:    addi 3, 3, .LCPI0_2@toc@l
+; CHECK-LE-NEXT:    lxvd2x 2, 0, 3
+; CHECK-LE-NEXT:    addis 3, 2, .LCPI0_3@toc@ha
+; CHECK-LE-NEXT:    addi 3, 3, .LCPI0_3@toc@l
+; CHECK-LE-NEXT:    xxswapd 36, 0
+; CHECK-LE-NEXT:    lxvd2x 0, 0, 3
+; CHECK-LE-NEXT:    vperm 4, 2, 3, 4
+; CHECK-LE-NEXT:    xxswapd 37, 1
+; CHECK-LE-NEXT:    vperm 2, 3, 3, 5
+; CHECK-LE-NEXT:    xxswapd 32, 2
+; CHECK-LE-NEXT:    vperm 5, 3, 3, 0
+; CHECK-LE-NEXT:    xxswapd 33, 0
+; CHECK-LE-NEXT:    vperm 6, 3, 3, 1
+; CHECK-LE-NEXT:    blr
+;
+; CHECK-BE-LABEL: issue_172265:
+; CHECK-BE:       # %bb.0: # %entry
+; CHECK-BE-NEXT:    addis 3, 2, .LCPI0_0@toc@ha
+; CHECK-BE-NEXT:    vspltw 3, 10, 2
+; CHECK-BE-NEXT:    addi 3, 3, .LCPI0_0@toc@l
+; CHECK-BE-NEXT:    vmr 7, 3
+; CHECK-BE-NEXT:    lvx 4, 0, 3
+; CHECK-BE-NEXT:    addis 3, 2, .LCPI0_2@toc@ha
+; CHECK-BE-NEXT:    addi 3, 3, .LCPI0_2@toc@l
+; CHECK-BE-NEXT:    lvx 5, 0, 3
+; CHECK-BE-NEXT:    addis 3, 2, .LCPI0_3@toc@ha
+; CHECK-BE-NEXT:    addi 3, 3, .LCPI0_3@toc@l
+; CHECK-BE-NEXT:    vperm 0, 3, 3, 5
+; CHECK-BE-NEXT:    lvx 5, 0, 3
+; CHECK-BE-NEXT:    addis 3, 2, .LCPI0_1@toc@ha
+; CHECK-BE-NEXT:    addi 3, 3, .LCPI0_1@toc@l
+; CHECK-BE-NEXT:    lvx 1, 0, 3
+; CHECK-BE-NEXT:    addis 3, 2, .LCPI0_4@toc@ha
+; CHECK-BE-NEXT:    addi 3, 3, .LCPI0_4@toc@l
+; CHECK-BE-NEXT:    vperm 4, 3, 3, 4
+; CHECK-BE-NEXT:    vperm 4, 4, 2, 1
+; CHECK-BE-NEXT:    lvx 2, 0, 3
+; CHECK-BE-NEXT:    vperm 5, 3, 3, 5
+; CHECK-BE-NEXT:    vperm 6, 3, 3, 2
+; CHECK-BE-NEXT:    vmr 2, 0
+; CHECK-BE-NEXT:    vmr 8, 3
+; CHECK-BE-NEXT:    vmr 9, 3
+; CHECK-BE-NEXT:    blr
+entry:
+  %vecinit37 = shufflevector <3 x i32> %0, <3 x i32> zeroinitializer, <32 x i32> <i32 2, i32 2, i32 2, i32 2, i32 2, i32 2, i32 2, i32 2, i32 2, i32 2, i32 poison, i32 poison, i32 poison, i32 poison, i32 poison, i32 poison, i32 2, i32 poison, i32 poison, i32 poison, i32 poison, i32 poison, i32 poison, i32 poison, i32 poison, i32 poison, i32 poison, i32 poison, i32 poison, i32 poison, i32 poison, i32 poison>
+  %shuffle56 = shufflevector <32 x i32> %vecinit37, <32 x i32> %BS_ARG_1, <32 x i32> <i32 4, i32 9, i32 3, i32 3, i32 4, i32 1, i32 1, i32 0, i32 16, i32 5, i32 5, i32 34, i32 3, i32 0, i32 8, i32 2, i32 8, i32 1, i32 0, i32 0, i32 0, i32 1, i32 0, i32 0, i32 7, i32 5, i32 3, i32 6, i32 0, i32 3, i32 4, i32 7>
+  ret <32 x i32> %shuffle56
+}
+-- 
+2.52.0
+
--- a/SOURCES/0001-SystemZ-Fix-ICE-with-i128-i64-uaddo-carry-chain.patch
+++ b/SOURCES/0001-SystemZ-Fix-ICE-with-i128-i64-uaddo-carry-chain.patch
@ -1,81 +0,0 @@
-From 6d5697f7cb4e933d2f176c46b7ac05a9cbaeb8b6 Mon Sep 17 00:00:00 2001
-From: Ulrich Weigand <ulrich.weigand@de.ibm.com>
-Date: Thu, 23 Jan 2025 19:11:18 +0100
-Subject: [PATCH] [SystemZ] Fix ICE with i128->i64 uaddo carry chain
-
-We can only optimize a uaddo_carry via specialized instruction
-if the carry was produced by another uaddo(_carry) instruction;
-there is already a check for that.
-
-However, i128 uaddo(_carry) use a completely different mechanism;
-they indicate carry in a vector register instead of the CC flag.
-Thus, we must also check that we don't mix those two - that check
-has been missing.
-
-Fixes: https://github.com/llvm/llvm-project/issues/124001
---
- .../Target/SystemZ/SystemZISelLowering.cpp    | 12 ++++++----
- llvm/test/CodeGen/SystemZ/pr124001.ll         | 23 +++++++++++++++++++
- 2 files changed, 31 insertions(+), 4 deletions(-)
- create mode 100644 llvm/test/CodeGen/SystemZ/pr124001.ll
-
-diff --git a/llvm/lib/Target/SystemZ/SystemZISelLowering.cpp b/llvm/lib/Target/SystemZ/SystemZISelLowering.cpp
-index 4040ab6d4510..1fb31c26e20d 100644
--- a/llvm/lib/Target/SystemZ/SystemZISelLowering.cpp
-+++ b/llvm/lib/Target/SystemZ/SystemZISelLowering.cpp
-@@ -4708,15 +4708,19 @@ SDValue SystemZTargetLowering::lowerXALUO(SDValue Op,
- }
- 
- static bool isAddCarryChain(SDValue Carry) {
-  while (Carry.getOpcode() == ISD::UADDO_CARRY)
-+  while (Carry.getOpcode() == ISD::UADDO_CARRY &&
-+         Carry->getValueType(0) != MVT::i128)
-     Carry = Carry.getOperand(2);
-  return Carry.getOpcode() == ISD::UADDO;
-+  return Carry.getOpcode() == ISD::UADDO &&
-+         Carry->getValueType(0) != MVT::i128;
- }
- 
- static bool isSubBorrowChain(SDValue Carry) {
-  while (Carry.getOpcode() == ISD::USUBO_CARRY)
-+  while (Carry.getOpcode() == ISD::USUBO_CARRY &&
-+         Carry->getValueType(0) != MVT::i128)
-     Carry = Carry.getOperand(2);
-  return Carry.getOpcode() == ISD::USUBO;
-+  return Carry.getOpcode() == ISD::USUBO &&
-+         Carry->getValueType(0) != MVT::i128;
- }
- 
- // Lower UADDO_CARRY/USUBO_CARRY nodes.
-diff --git a/llvm/test/CodeGen/SystemZ/pr124001.ll b/llvm/test/CodeGen/SystemZ/pr124001.ll
-new file mode 100644
-index 000000000000..9cf630a55dd6
--- /dev/null
-+++ b/llvm/test/CodeGen/SystemZ/pr124001.ll
-@@ -0,0 +1,23 @@
-+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 5
-+; RUN: llc < %s -mtriple=s390x-linux-gnu -mcpu=z13 | FileCheck %s
-+
-+define i64 @test(i128 %in) {
-+; CHECK-LABEL: test:
-+; CHECK:       # %bb.0:
-+; CHECK-NEXT:    larl %r1, .LCPI0_0
-+; CHECK-NEXT:    vl %v0, 0(%r2), 3
-+; CHECK-NEXT:    vl %v1, 0(%r1), 3
-+; CHECK-NEXT:    vaccq %v0, %v0, %v1
-+; CHECK-NEXT:    vlgvg %r1, %v0, 1
-+; CHECK-NEXT:    la %r2, 1(%r1)
-+; CHECK-NEXT:    br %r14
-+  %1 = tail call { i128, i1 } @llvm.uadd.with.overflow.i128(i128 %in, i128 1)
-+  %2 = extractvalue { i128, i1 } %1, 1
-+  %3 = zext i1 %2 to i64
-+  %4 = add i64 %3, 1
-+  ret i64 %4
-+}
-+
-+declare { i128, i1 } @llvm.uadd.with.overflow.i128(i128, i128) #0
-+
-+attributes #0 = { nocallback nofree nosync nounwind speculatable willreturn memory(none) }
-- 
-2.48.1
-
--- a/SOURCES/0001-SystemZ-Fix-code-in-widening-vector-multiplication-1.patch
+++ b/SOURCES/0001-SystemZ-Fix-code-in-widening-vector-multiplication-1.patch
@ -0,0 +1,191 @@
+From fc12fc635b96e9fa521a33eb31336c539eed1918 Mon Sep 17 00:00:00 2001
+From: sujianIBM <98488060+sujianIBM@users.noreply.github.com>
+Date: Thu, 31 Jul 2025 13:18:23 -0400
+Subject: [PATCH] [SystemZ] Fix code in widening vector multiplication
+ (#150836)
+
+Commit cdc7864 has an error which would wrongly fold widening
+multiplications into an even/odd widening operation.
+This PR fixes it and adds tests to check scenarios which should not be
+folded into an even/odd widening operation are actually not.
+---
+ .../Target/SystemZ/SystemZISelLowering.cpp    |   2 +-
+ llvm/test/CodeGen/SystemZ/vec-mul-07.ll       | 114 ++++++++++++++++++
+ 2 files changed, 115 insertions(+), 1 deletion(-)
+
+diff --git a/llvm/lib/Target/SystemZ/SystemZISelLowering.cpp b/llvm/lib/Target/SystemZ/SystemZISelLowering.cpp
+index e30d7235b81b..fb0a47dc9dc4 100644
+--- a/llvm/lib/Target/SystemZ/SystemZISelLowering.cpp
+++ b/llvm/lib/Target/SystemZ/SystemZISelLowering.cpp
+@@ -9044,7 +9044,7 @@ static unsigned detectEvenOddMultiplyOperand(const SelectionDAG &DAG,
+         if (unsigned(ShuffleMask[Elt]) != 2 * Elt)
+           CanUseEven = false;
+         if (unsigned(ShuffleMask[Elt]) != 2 * Elt + 1)
+-          CanUseEven = true;
+          CanUseOdd = false;
+       }
+       Op = Op.getOperand(0);
+       if (CanUseEven)
+diff --git a/llvm/test/CodeGen/SystemZ/vec-mul-07.ll b/llvm/test/CodeGen/SystemZ/vec-mul-07.ll
+index 73c7a8dec5df..583561625cfc 100644
+--- a/llvm/test/CodeGen/SystemZ/vec-mul-07.ll
+++ b/llvm/test/CodeGen/SystemZ/vec-mul-07.ll
+@@ -3,6 +3,23 @@
+ ;
+ ; RUN: llc < %s -mtriple=s390x-linux-gnu -mcpu=z13 | FileCheck %s
+ 
+; Test a v16i8 -> v8i16 unsigned widening multiplication
+; which is not folded into an even/odd widening operation.
+define <8 x i16> @f1_not(<16 x i8> %val1, <16 x i8> %val2) {
+; CHECK-LABEL: f1_not:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    vuplhb %v0, %v24
+; CHECK-NEXT:    vuplhb %v1, %v26
+; CHECK-NEXT:    vmlhw %v24, %v0, %v1
+; CHECK-NEXT:    br %r14
+  %shuf1 = shufflevector <16 x i8> %val1, <16 x i8> poison, <8 x i32> <i32 0, i32 1, i32 2, i32 3, i32 4, i32 5, i32 6, i32 7>
+  %zext1 = zext <8 x i8> %shuf1 to <8 x i16>
+  %shuf2 = shufflevector <16 x i8> %val2, <16 x i8> poison, <8 x i32> <i32 0, i32 1, i32 2, i32 3, i32 4, i32 5, i32 6, i32 7>
+  %zext2 = zext <8 x i8> %shuf2 to <8 x i16>
+  %ret = mul <8 x i16> %zext1, %zext2
+  ret <8 x i16> %ret
+}
+
+ ; Test a v16i8 (even) -> v8i16 unsigned widening multiplication.
+ define <8 x i16> @f1(<16 x i8> %val1, <16 x i8> %val2) {
+ ; CHECK-LABEL: f1:
+@@ -31,6 +48,23 @@ define <8 x i16> @f2(<16 x i8> %val1, <16 x i8> %val2) {
+   ret <8 x i16> %ret
+ }
+ 
+; Test a v16i8 -> v8i16 signed widening multiplication
+; which is not folded into an even/odd widening operation.
+define <8 x i16> @f3_not(<16 x i8> %val1, <16 x i8> %val2) {
+; CHECK-LABEL: f3_not:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    vuphb %v0, %v26
+; CHECK-NEXT:    vuphb %v1, %v24
+; CHECK-NEXT:    vmlhw %v24, %v1, %v0
+; CHECK-NEXT:    br %r14
+  %shuf1 = shufflevector <16 x i8> %val1, <16 x i8> poison, <8 x i32> <i32 0, i32 1, i32 2, i32 3, i32 4, i32 5, i32 6, i32 7>
+  %sext1 = sext <8 x i8> %shuf1 to <8 x i16>
+  %shuf2 = shufflevector <16 x i8> %val2, <16 x i8> poison, <8 x i32> <i32 0, i32 1, i32 2, i32 3, i32 4, i32 5, i32 6, i32 7>
+  %sext2 = sext <8 x i8> %shuf2 to <8 x i16>
+  %ret = mul <8 x i16> %sext1, %sext2
+  ret <8 x i16> %ret
+}
+
+ ; Test a v16i8 (even) -> v8i16 signed widening multiplication.
+ define <8 x i16> @f3(<16 x i8> %val1, <16 x i8> %val2) {
+ ; CHECK-LABEL: f3:
+@@ -59,6 +93,23 @@ define <8 x i16> @f4(<16 x i8> %val1, <16 x i8> %val2) {
+   ret <8 x i16> %ret
+ }
+ 
+; Test a v8i16 -> v4i32 unsigned widening multiplication
+; which is not folded into an even/odd widening operation.
+define <4 x i32> @f5_not(<8 x i16> %val1, <8 x i16> %val2) {
+; CHECK-LABEL: f5_not:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    vuplhh %v0, %v24
+; CHECK-NEXT:    vuplhh %v1, %v26
+; CHECK-NEXT:    vmlf %v24, %v0, %v1
+; CHECK-NEXT:    br %r14
+  %shuf1 = shufflevector <8 x i16> %val1, <8 x i16> poison, <4 x i32> <i32 0, i32 1, i32 2, i32 3>
+  %zext1 = zext <4 x i16> %shuf1 to <4 x i32>
+  %shuf2 = shufflevector <8 x i16> %val2, <8 x i16> poison, <4 x i32> <i32 0, i32 1, i32 2, i32 3>
+  %zext2 = zext <4 x i16> %shuf2 to <4 x i32>
+  %ret = mul <4 x i32> %zext1, %zext2
+  ret <4 x i32> %ret
+}
+
+ ; Test a v8i16 (even) -> v4i32 unsigned widening multiplication.
+ define <4 x i32> @f5(<8 x i16> %val1, <8 x i16> %val2) {
+ ; CHECK-LABEL: f5:
+@@ -87,6 +138,23 @@ define <4 x i32> @f6(<8 x i16> %val1, <8 x i16> %val2) {
+   ret <4 x i32> %ret
+ }
+ 
+; Test a v8i16 -> v4i32 signed widening multiplication
+; which is not folded into an even/odd widening operation.
+define <4 x i32> @f7_not(<8 x i16> %val1, <8 x i16> %val2) {
+; CHECK-LABEL: f7_not:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    vuphh %v0, %v26
+; CHECK-NEXT:    vuphh %v1, %v24
+; CHECK-NEXT:    vmlf %v24, %v1, %v0
+; CHECK-NEXT:    br %r14
+  %shuf1 = shufflevector <8 x i16> %val1, <8 x i16> poison, <4 x i32> <i32 0, i32 1, i32 2, i32 3>
+  %sext1 = sext <4 x i16> %shuf1 to <4 x i32>
+  %shuf2 = shufflevector <8 x i16> %val2, <8 x i16> poison, <4 x i32> <i32 0, i32 1, i32 2, i32 3>
+  %sext2 = sext <4 x i16> %shuf2 to <4 x i32>
+  %ret = mul <4 x i32> %sext1, %sext2
+  ret <4 x i32> %ret
+}
+
+ ; Test a v8i16 (even) -> v4i32 signed widening multiplication.
+ define <4 x i32> @f7(<8 x i16> %val1, <8 x i16> %val2) {
+ ; CHECK-LABEL: f7:
+@@ -115,6 +183,29 @@ define <4 x i32> @f8(<8 x i16> %val1, <8 x i16> %val2) {
+   ret <4 x i32> %ret
+ }
+ 
+; Test a v4i32 -> v2i64 unsigned widening multiplication
+; which is not folded into an even/odd widening operation.
+define <2 x i64> @f9_not(<4 x i32> %val1, <4 x i32> %val2) {
+; CHECK-LABEL: f9_not:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    vuplhf %v0, %v24
+; CHECK-NEXT:    vuplhf %v1, %v26
+; CHECK-NEXT:    vlgvg %r0, %v1, 1
+; CHECK-NEXT:    vlgvg %r1, %v0, 1
+; CHECK-NEXT:    msgr %r1, %r0
+; CHECK-NEXT:    vlgvg %r0, %v1, 0
+; CHECK-NEXT:    vlgvg %r2, %v0, 0
+; CHECK-NEXT:    msgr %r2, %r0
+; CHECK-NEXT:    vlvgp %v24, %r2, %r1
+; CHECK-NEXT:    br %r14
+  %shuf1 = shufflevector <4 x i32> %val1, <4 x i32> poison, <2 x i32> <i32 0, i32 1>
+  %zext1 = zext <2 x i32> %shuf1 to <2 x i64>
+  %shuf2 = shufflevector <4 x i32> %val2, <4 x i32> poison, <2 x i32> <i32 0, i32 1>
+  %zext2 = zext <2 x i32> %shuf2 to <2 x i64>
+  %ret = mul <2 x i64> %zext1, %zext2
+  ret <2 x i64> %ret
+}
+
+ ; Test a v4i32 (even) -> v2i64 unsigned widening multiplication.
+ define <2 x i64> @f9(<4 x i32> %val1, <4 x i32> %val2) {
+ ; CHECK-LABEL: f9:
+@@ -143,6 +234,29 @@ define <2 x i64> @f10(<4 x i32> %val1, <4 x i32> %val2) {
+   ret <2 x i64> %ret
+ }
+ 
+; Test a v4i32 -> v2i64 signed widening multiplication
+; which is not folded into an even/odd widening operation.
+define <2 x i64> @f11_not(<4 x i32> %val1, <4 x i32> %val2) {
+; CHECK-LABEL: f11_not:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    vuphf %v0, %v24
+; CHECK-NEXT:    vuphf %v1, %v26
+; CHECK-NEXT:    vlgvg %r0, %v1, 1
+; CHECK-NEXT:    vlgvg %r1, %v0, 1
+; CHECK-NEXT:    msgr %r1, %r0
+; CHECK-NEXT:    vlgvg %r0, %v1, 0
+; CHECK-NEXT:    vlgvg %r2, %v0, 0
+; CHECK-NEXT:    msgr %r2, %r0
+; CHECK-NEXT:    vlvgp %v24, %r2, %r1
+; CHECK-NEXT:    br %r14
+  %shuf1 = shufflevector <4 x i32> %val1, <4 x i32> poison, <2 x i32> <i32 0, i32 1>
+  %sext1 = sext <2 x i32> %shuf1 to <2 x i64>
+  %shuf2 = shufflevector <4 x i32> %val2, <4 x i32> poison, <2 x i32> <i32 0, i32 1>
+  %sext2 = sext <2 x i32> %shuf2 to <2 x i64>
+  %ret = mul <2 x i64> %sext1, %sext2
+  ret <2 x i64> %ret
+}
+
+ ; Test a v4i32 (even) -> v2i64 signed widening multiplication.
+ define <2 x i64> @f11(<4 x i32> %val1, <4 x i32> %val2) {
+ ; CHECK-LABEL: f11:
+-- 
+2.52.0
+
--- a/SOURCES/0001-clang-Add-a-hack-to-fix-the-offload-build-with-the-m.patch
+++ b/SOURCES/0001-clang-Add-a-hack-to-fix-the-offload-build-with-the-m.patch
@ -0,0 +1,27 @@
+From f028fc042ef2875a13c6abf3828626a313e4a8e6 Mon Sep 17 00:00:00 2001
+From: Tom Stellard <tstellar@redhat.com>
+Date: Fri, 1 Aug 2025 15:38:22 +0000
+Subject: [PATCH] clang: Add a hack to fix the offload build with the
+ mtls-dialect option
+
+---
+ clang/lib/Driver/ToolChains/CommonArgs.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp
+index 097d186ad8ea..0dc9e60f8428 100644
+--- a/clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp
+@@ -920,6 +920,9 @@ bool tools::isTLSDESCEnabled(const ToolChain &TC,
+   } else if (Triple.isX86()) {
+     SupportedArgument = V == "gnu" || V == "gnu2";
+     EnableTLSDESC = V == "gnu2";
+  } else if( Triple.isGPU()) {
+    // HACK To fix the offload build.
+    return false;
+   } else {
+     Unsupported = true;
+   }
+-- 
+2.49.0
+
--- a/SOURCES/0001-lld-Adjust-compressed-debug-level-test-for-s390x-wit.patch
+++ b/SOURCES/0001-lld-Adjust-compressed-debug-level-test-for-s390x-wit.patch
@ -0,0 +1,29 @@
+From 4fbbdb4f6b95158b87e1b072b3a246722ccf3b7d Mon Sep 17 00:00:00 2001
+From: Nikita Popov <npopov@redhat.com>
+Date: Fri, 19 Dec 2025 17:02:24 +0100
+Subject: [PATCH] [lld] Adjust compressed-debug-level test for s390x with
+ DFLTCC (#172972)
+
+After enabling DFLTCC in zlib-ng for s390x this test starts failing,
+because slightly better compression is produced at level 1. Add 1c as a
+permissible output.
+---
+ lld/test/ELF/compressed-debug-level.test | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lld/test/ELF/compressed-debug-level.test b/lld/test/ELF/compressed-debug-level.test
+index 5a4d37e31eca..7d64298e518f 100644
+--- a/lld/test/ELF/compressed-debug-level.test
+++ b/lld/test/ELF/compressed-debug-level.test
+@@ -18,7 +18,7 @@
+ # RUN: llvm-readelf --sections %t.6 | FileCheck -check-prefixes=HEADER,LEVEL6 %s
+ 
+ # HEADER: [Nr] Name        Type     Address  Off    Size
+-# LEVEL1: [ 1] .debug_info PROGBITS 00000000 000094 0000{{1[def]|21}}
+# LEVEL1: [ 1] .debug_info PROGBITS 00000000 000094 0000{{1[cdef]|21}}
+ # LEVEL6: [ 1] .debug_info PROGBITS 00000000 000094 00001{{[abc]}}
+ 
+ ## A little arbitrary debug section which has a different size after
+-- 
+2.50.1
+
--- a/SOURCES/0001-sanitizer_common-Disable-termio-ioctls-on-PowerPC.patch
+++ b/SOURCES/0001-sanitizer_common-Disable-termio-ioctls-on-PowerPC.patch
@ -1,51 +0,0 @@
-From be7b1ef7c8e58b454e20f7f70d0e316528e2c823 Mon Sep 17 00:00:00 2001
-From: Tom Stellard <tstellar@redhat.com>
-Date: Tue, 29 Apr 2025 21:35:57 +0000
-Subject: [PATCH] [sanitizer_common] Disable termio ioctls on PowerPC
-
-glibc-2.42 removed the termio.h header, but there are refrences to it
-still in the kernel's ioctl.h, so we need disable these ioctls to fix
-this build.
---
- .../sanitizer_platform_limits_posix.cpp            | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 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 7a89bf1c7498..7b81951f82ae 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
-+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
-@@ -182,6 +182,12 @@ typedef struct user_fpregs elf_fpregset_t;
- #include <sys/ioctl.h>
- #endif
- 
-+// Work around struct termio usage in ioctl.h on ppc64le.
-+#if SANITIZER_GLIBC && !__has_include(<termio.h>) &&  defined(__powerpc64__)
-+  #define DISABLE_TERMIO_IOCTLS 1
-+#endif
-+
-+
- // Include these after system headers to avoid name clashes and ambiguities.
- #  include "sanitizer_common.h"
- #  include "sanitizer_internal_defs.h"
-@@ -779,13 +785,15 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
-   unsigned IOCTL_SOUND_PCM_WRITE_FILTER = SOUND_PCM_WRITE_FILTER;
- #endif // SOUND_VERSION
-   unsigned IOCTL_TCFLSH = TCFLSH;
-+#if !defined(DISABLE_TERMIO_IOCTLS)
-   unsigned IOCTL_TCGETA = TCGETA;
-  unsigned IOCTL_TCGETS = TCGETS;
-  unsigned IOCTL_TCSBRK = TCSBRK;
-  unsigned IOCTL_TCSBRKP = TCSBRKP;
-   unsigned IOCTL_TCSETA = TCSETA;
-   unsigned IOCTL_TCSETAF = TCSETAF;
-   unsigned IOCTL_TCSETAW = TCSETAW;
-+#endif
-+  unsigned IOCTL_TCGETS = TCGETS;
-+  unsigned IOCTL_TCSBRK = TCSBRK;
-+  unsigned IOCTL_TCSBRKP = TCSBRKP;
-   unsigned IOCTL_TCSETS = TCSETS;
-   unsigned IOCTL_TCSETSF = TCSETSF;
-   unsigned IOCTL_TCSETSW = TCSETSW;
-- 
-2.48.1
-
--- a/SOURCES/0001-sanitizer_common-Disable-termio-ioctls-on-PowerPC.patch.20
+++ b/SOURCES/0001-sanitizer_common-Disable-termio-ioctls-on-PowerPC.patch.20
@ -1,56 +0,0 @@
-From 1e49835cc5737b2dffff5923e09546b70a54f90d Mon Sep 17 00:00:00 2001
-From: Tom Stellard <tstellar@redhat.com>
-Date: Tue, 29 Apr 2025 21:35:57 +0000
-Subject: [PATCH] [sanitizer_common] Disable termio ioctls on PowerPC
-
-glibc-2.42 removed the termio.h header, but there are refrences to it
-still in the kernel's ioctl.h, so we need disable these ioctls to fix
-this build.
---
- .../sanitizer_platform_limits_posix.cpp       | 19 ++++++++++++++++---
- 1 file changed, 16 insertions(+), 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 10b6535499de..303c82783528 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
-+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
-@@ -173,6 +173,17 @@ typedef struct user_fpregs elf_fpregset_t;
- #include <sys/sockio.h>
- #endif
- 
-+#if SANITIZER_HAIKU
-+#include <sys/sockio.h>
-+#include <sys/ioctl.h>
-+#endif
-+
-+// Work around struct termio usage in ioctl.h on ppc64le.
-+#if SANITIZER_GLIBC && !__has_include(<termio.h>) &&  defined(__powerpc64__)
-+  #define DISABLE_TERMIO_IOCTLS 1
-+#endif
-+
-+
- // Include these after system headers to avoid name clashes and ambiguities.
- #  include "sanitizer_common.h"
- #  include "sanitizer_internal_defs.h"
-@@ -764,13 +775,15 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
-   unsigned IOCTL_SOUND_PCM_WRITE_FILTER = SOUND_PCM_WRITE_FILTER;
- #endif // SOUND_VERSION
-   unsigned IOCTL_TCFLSH = TCFLSH;
-+#if !defined(DISABLE_TERMIO_IOCTLS)
-   unsigned IOCTL_TCGETA = TCGETA;
-  unsigned IOCTL_TCGETS = TCGETS;
-  unsigned IOCTL_TCSBRK = TCSBRK;
-  unsigned IOCTL_TCSBRKP = TCSBRKP;
-   unsigned IOCTL_TCSETA = TCSETA;
-   unsigned IOCTL_TCSETAF = TCSETAF;
-   unsigned IOCTL_TCSETAW = TCSETAW;
-+#endif
-+  unsigned IOCTL_TCGETS = TCGETS;
-+  unsigned IOCTL_TCSBRK = TCSBRK;
-+  unsigned IOCTL_TCSBRKP = TCSBRKP;
-   unsigned IOCTL_TCSETS = TCSETS;
-   unsigned IOCTL_TCSETSF = TCSETSF;
-   unsigned IOCTL_TCSETSW = TCSETSW;
-- 
-2.48.1
-
--- a/SOURCES/0002-BPF-Remove-unused-weak-symbol-__bpf_trap-166003.patch
+++ b/SOURCES/0002-BPF-Remove-unused-weak-symbol-__bpf_trap-166003.patch
@ -0,0 +1,130 @@
+From be4fa19ecf95d94d3ef46be183d3d4b4ebb6bb47 Mon Sep 17 00:00:00 2001
+From: yonghong-song <yhs@fb.com>
+Date: Mon, 3 Nov 2025 11:11:47 -0800
+Subject: [PATCH] [BPF] Remove unused weak symbol __bpf_trap (#166003)
+
+Nikita Popov reported an issue ([1]) where a dangling weak symbol
+__bpf_trap is in the final binary and this caused libbpf failing like
+below:
+
+  $ veristat -v ./t.o
+  Processing 't.o'...
+  libbpf: elf: skipping unrecognized data section(4) .eh_frame
+  libbpf: elf: skipping relo section(5) .rel.eh_frame for section(4) .eh_frame
+  libbpf: failed to find BTF for extern '__bpf_trap': -3
+  Failed to open './t.o': -3
+
+In llvm, the dag selection phase generates __bpf_trap in code. Later the
+UnreachableBlockElim pass removed __bpf_trap from the code, but
+__bpf_trap symbol survives in the symbol table.
+
+Having a dangling __bpf_trap weak symbol is not good for old kernels as
+seen in the above veristat failure. Although users could use compiler
+flag `-mllvm -bpf-disable-trap-unreachable` to workaround the issue,
+this patch fixed the issue by removing the dangling __bpf_trap.
+
+  [1] https://github.com/llvm/llvm-project/issues/165696
+
+(cherry picked from commit 8fd1bf2f8c9e6e7c4bc5f6915a9d52bb3672601b)
+---
+ llvm/lib/Target/BPF/BPFAsmPrinter.cpp | 24 ++++++++++++++++++++
+ llvm/lib/Target/BPF/BPFAsmPrinter.h   |  1 +
+ llvm/test/CodeGen/BPF/bpf_trap.ll     | 32 +++++++++++++++++++++++++++
+ 3 files changed, 57 insertions(+)
+ create mode 100644 llvm/test/CodeGen/BPF/bpf_trap.ll
+
+diff --git a/llvm/lib/Target/BPF/BPFAsmPrinter.cpp b/llvm/lib/Target/BPF/BPFAsmPrinter.cpp
+index 77dc4a75a7d6..b2a82040ee82 100644
+--- a/llvm/lib/Target/BPF/BPFAsmPrinter.cpp
+++ b/llvm/lib/Target/BPF/BPFAsmPrinter.cpp
+@@ -88,6 +88,16 @@ bool BPFAsmPrinter::doFinalization(Module &M) {
+     }
+   }
+ 
+  for (GlobalObject &GO : M.global_objects()) {
+    if (!GO.hasExternalWeakLinkage())
+      continue;
+
+    if (!SawTrapCall && GO.getName() == BPF_TRAP) {
+      GO.eraseFromParent();
+      break;
+    }
+  }
+
+   return AsmPrinter::doFinalization(M);
+ }
+ 
+@@ -160,6 +170,20 @@ bool BPFAsmPrinter::PrintAsmMemoryOperand(const MachineInstr *MI,
+ }
+ 
+ void BPFAsmPrinter::emitInstruction(const MachineInstr *MI) {
+  if (MI->isCall()) {
+    for (const MachineOperand &Op : MI->operands()) {
+      if (Op.isGlobal()) {
+        if (const GlobalValue *GV = Op.getGlobal())
+          if (GV->getName() == BPF_TRAP)
+            SawTrapCall = true;
+      } else if (Op.isSymbol()) {
+        if (const MCSymbol *Sym = Op.getMCSymbol())
+          if (Sym->getName() == BPF_TRAP)
+            SawTrapCall = true;
+      }
+    }
+  }
+
+   BPF_MC::verifyInstructionPredicates(MI->getOpcode(),
+                                       getSubtargetInfo().getFeatureBits());
+ 
+diff --git a/llvm/lib/Target/BPF/BPFAsmPrinter.h b/llvm/lib/Target/BPF/BPFAsmPrinter.h
+index 0cfb2839c8ff..60a285ea2b7d 100644
+--- a/llvm/lib/Target/BPF/BPFAsmPrinter.h
+++ b/llvm/lib/Target/BPF/BPFAsmPrinter.h
+@@ -39,6 +39,7 @@ public:
+ private:
+   BTFDebug *BTF;
+   TargetMachine &TM;
+  bool SawTrapCall = false;
+ 
+   const BPFTargetMachine &getBTM() const;
+ };
+diff --git a/llvm/test/CodeGen/BPF/bpf_trap.ll b/llvm/test/CodeGen/BPF/bpf_trap.ll
+new file mode 100644
+index 000000000000..ab8df5ff7cb0
+--- /dev/null
+++ b/llvm/test/CodeGen/BPF/bpf_trap.ll
+@@ -0,0 +1,32 @@
+; RUN: llc < %s | FileCheck %s
+;
+target triple = "bpf"
+
+define i32 @test(i8 %x) {
+entry:
+  %0 = and i8 %x, 3
+  switch i8 %0, label %default.unreachable4 [
+    i8 0, label %return
+    i8 1, label %sw.bb1
+    i8 2, label %sw.bb2
+    i8 3, label %sw.bb3
+  ]
+
+sw.bb1:                                           ; preds = %entry
+  br label %return
+
+sw.bb2:                                           ; preds = %entry
+  br label %return
+
+sw.bb3:                                           ; preds = %entry
+  br label %return
+
+default.unreachable4:                             ; preds = %entry
+  unreachable
+
+return:                                           ; preds = %entry, %sw.bb3, %sw.bb2, %sw.bb1
+  %retval.0 = phi i32 [ 12, %sw.bb1 ], [ 43, %sw.bb2 ], [ 54, %sw.bb3 ], [ 32, %entry ]
+  ret i32 %retval.0
+}
+
+; CHECK-NOT: __bpf_trap
+-- 
+2.50.1
+
--- a/SOURCES/0003-BPF-Remove-dead-code-related-to-__bpf_trap-global-va.patch
+++ b/SOURCES/0003-BPF-Remove-dead-code-related-to-__bpf_trap-global-va.patch
@ -0,0 +1,34 @@
+From ac5b6151976c70c8b676d3bc6ff82895fe0e1d01 Mon Sep 17 00:00:00 2001
+From: yonghong-song <yhs@fb.com>
+Date: Tue, 4 Nov 2025 15:15:33 -0800
+Subject: [PATCH] [BPF] Remove dead code related to __bpf_trap global var
+ (#166440)
+
+In [1], the symbol __bpf_trap (macro BPF_TRAP) is removed if it is not
+used in the code. In the discussion in [1], it is found that the branch
+"if (Op.isSymbol())" is actually always false. Remove it to avoid
+confusion.
+
+  [1] https://github.com/llvm/llvm-project/pull/166003
+---
+ llvm/lib/Target/BPF/BPFAsmPrinter.cpp | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/llvm/lib/Target/BPF/BPFAsmPrinter.cpp b/llvm/lib/Target/BPF/BPFAsmPrinter.cpp
+index 378a72ab27dd..abe081c0c76f 100644
+--- a/llvm/lib/Target/BPF/BPFAsmPrinter.cpp
+++ b/llvm/lib/Target/BPF/BPFAsmPrinter.cpp
+@@ -176,10 +176,6 @@ void BPFAsmPrinter::emitInstruction(const MachineInstr *MI) {
+         if (const GlobalValue *GV = Op.getGlobal())
+           if (GV->getName() == BPF_TRAP)
+             SawTrapCall = true;
+-      } else if (Op.isSymbol()) {
+-        if (const MCSymbol *Sym = Op.getMCSymbol())
+-          if (Sym->getName() == BPF_TRAP)
+-            SawTrapCall = true;
+       }
+     }
+   }
+-- 
+2.50.1
+
--- a/SOURCES/43cb4631c1f42dbfce78288b8ae30b5840ed59b3.patch
+++ b/SOURCES/43cb4631c1f42dbfce78288b8ae30b5840ed59b3.patch
@ -0,0 +1,276 @@
+From 43cb4631c1f42dbfce78288b8ae30b5840ed59b3 Mon Sep 17 00:00:00 2001
+From: Ebuka Ezike <yerimyah1@gmail.com>
+Date: Thu, 8 Jan 2026 18:46:03 +0000
+Subject: [PATCH] [lldb] Fix typed commands not shown on the screen (#174216)
+
+The cause is that in `python3.14`, `fcntl.ioctl` now throws a buffer
+overflow error
+when the buffer is too small or too large (see
+https://github.com/python/cpython/pull/132919). This caused the Python
+interpreter to fail terminal detection and not properly echo user
+commands back to the screen.
+
+Fix by dropping the custom terminal size check entirely and using the
+built-in `sys.stdin.isatty()` instead.
+
+Fixes #173302
+---
+ .../Python/lldbsuite/test/lldbpexpect.py      |  1 +
+ .../Interpreter/embedded_interpreter.py       | 59 +++---------------
+ .../python_api/file_handle/TestFileHandle.py  | 48 +++++++++++++-
+ .../API/terminal/TestPythonInterpreterEcho.py | 62 +++++++++++++++++++
+ .../Shell/ScriptInterpreter/Python/io.test    | 12 ++++
+ 5 files changed, 131 insertions(+), 51 deletions(-)
+ create mode 100644 lldb/test/API/terminal/TestPythonInterpreterEcho.py
+ create mode 100644 lldb/test/Shell/ScriptInterpreter/Python/io.test
+
+diff --git a/lldb/packages/Python/lldbsuite/test/lldbpexpect.py b/lldb/packages/Python/lldbsuite/test/lldbpexpect.py
+index 3279e1fd39f8c..03b2500fbda52 100644
+--- a/lldb/packages/Python/lldbsuite/test/lldbpexpect.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbpexpect.py
+@@ -10,6 +10,7 @@
+ 
+ 
+ @skipIfRemote
+@skipIfWindows
+ @add_test_categories(["pexpect"])
+ class PExpectTest(TestBase):
+     NO_DEBUG_INFO_TESTCASE = True
+diff --git a/lldb/source/Interpreter/embedded_interpreter.py b/lldb/source/Interpreter/embedded_interpreter.py
+index 42a9ab5fc367a..12c47bd712816 100644
+--- a/lldb/source/Interpreter/embedded_interpreter.py
+++ b/lldb/source/Interpreter/embedded_interpreter.py
+@@ -32,18 +32,6 @@ def is_libedit():
+ g_run_one_line_str = None
+ 
+ 
+-def get_terminal_size(fd):
+-    try:
+-        import fcntl
+-        import termios
+-        import struct
+-
+-        hw = struct.unpack("hh", fcntl.ioctl(fd, termios.TIOCGWINSZ, "1234"))
+-    except:
+-        hw = (0, 0)
+-    return hw
+-
+-
+ class LLDBExit(SystemExit):
+     pass
+ 
+@@ -74,50 +62,21 @@ def readfunc_stdio(prompt):
+ def run_python_interpreter(local_dict):
+     # Pass in the dictionary, for continuity from one session to the next.
+     try:
+-        fd = sys.stdin.fileno()
+-        interacted = False
+-        if get_terminal_size(fd)[1] == 0:
+-            try:
+-                import termios
+-
+-                old = termios.tcgetattr(fd)
+-                if old[3] & termios.ECHO:
+-                    # Need to turn off echoing and restore
+-                    new = termios.tcgetattr(fd)
+-                    new[3] = new[3] & ~termios.ECHO
+-                    try:
+-                        termios.tcsetattr(fd, termios.TCSADRAIN, new)
+-                        interacted = True
+-                        code.interact(
+-                            banner="Python Interactive Interpreter. To exit, type 'quit()', 'exit()'.",
+-                            readfunc=readfunc_stdio,
+-                            local=local_dict,
+-                        )
+-                    finally:
+-                        termios.tcsetattr(fd, termios.TCSADRAIN, old)
+-            except:
+-                pass
+-            # Don't need to turn off echoing
+-            if not interacted:
+-                code.interact(
+-                    banner="Python Interactive Interpreter. To exit, type 'quit()', 'exit()' or Ctrl-D.",
+-                    readfunc=readfunc_stdio,
+-                    local=local_dict,
+-                )
+-        else:
+-            # We have a real interactive terminal
+-            code.interact(
+-                banner="Python Interactive Interpreter. To exit, type 'quit()', 'exit()' or Ctrl-D.",
+-                readfunc=readfunc,
+-                local=local_dict,
+-            )
+        banner = "Python Interactive Interpreter. To exit, type 'quit()', 'exit()'."
+        input_func = readfunc_stdio
+
+        is_atty = sys.stdin.isatty()
+        if is_atty:
+            banner = "Python Interactive Interpreter. To exit, type 'quit()', 'exit()' or Ctrl-D."
+            input_func = readfunc
+
+        code.interact(banner=banner, readfunc=input_func, local=local_dict)
+     except LLDBExit:
+         pass
+     except SystemExit as e:
+         if e.code:
+             print("Script exited with code %s" % e.code)
+ 
+-
+ def run_one_line(local_dict, input_string):
+     global g_run_one_line_str
+     try:
+diff --git a/lldb/test/API/python_api/file_handle/TestFileHandle.py b/lldb/test/API/python_api/file_handle/TestFileHandle.py
+index b38585577f6f6..707044a3afb0f 100644
+--- a/lldb/test/API/python_api/file_handle/TestFileHandle.py
+++ b/lldb/test/API/python_api/file_handle/TestFileHandle.py
+@@ -111,10 +111,11 @@ def setUp(self):
+         super(FileHandleTestCase, self).setUp()
+         self.out_filename = self.getBuildArtifact("output")
+         self.in_filename = self.getBuildArtifact("input")
+        self.err_filename = self.getBuildArtifact("error")
+ 
+     def tearDown(self):
+         super(FileHandleTestCase, self).tearDown()
+-        for name in (self.out_filename, self.in_filename):
+        for name in (self.out_filename, self.in_filename, self.err_filename):
+             if os.path.exists(name):
+                 os.unlink(name)
+ 
+@@ -679,6 +680,51 @@ def test_stdout_file(self):
+             lines = [x for x in f.read().strip().split() if x != "7"]
+             self.assertEqual(lines, ["foobar"])
+ 
+    def test_stdout_file_interactive(self):
+        """Ensure when we read stdin from a file, outputs from python goes to the right I/O stream."""
+        with open(self.in_filename, "w") as f:
+            f.write(
+                "script --language python --\nvalue = 250 + 5\nprint(value)\nprint(vel)"
+            )
+
+        with open(self.out_filename, "w") as outf, open(
+            self.in_filename, "r"
+        ) as inf, open(self.err_filename, "w") as errf:
+            status = self.dbg.SetOutputFile(lldb.SBFile(outf))
+            self.assertSuccess(status)
+            status = self.dbg.SetErrorFile(lldb.SBFile(errf))
+            self.assertSuccess(status)
+            status = self.dbg.SetInputFile(lldb.SBFile(inf))
+            self.assertSuccess(status)
+            auto_handle_events = True
+            spawn_thread = False
+            num_errs = 0
+            quit_requested = False
+            stopped_for_crash = False
+            opts = lldb.SBCommandInterpreterRunOptions()
+            self.dbg.RunCommandInterpreter(
+                auto_handle_events,
+                spawn_thread,
+                opts,
+                num_errs,
+                quit_requested,
+                stopped_for_crash,
+            )
+            self.dbg.GetOutputFile().Flush()
+        expected_out_text = "255"
+        expected_err_text = "NameError"
+        # check stdout
+        with open(self.out_filename, "r") as f:
+            out_text = f.read()
+            self.assertIn(expected_out_text, out_text)
+            self.assertNotIn(expected_err_text, out_text)
+
+        # check stderr
+        with open(self.err_filename, "r") as f:
+            err_text = f.read()
+            self.assertIn(expected_err_text, err_text)
+            self.assertNotIn(expected_out_text, err_text)
+
+     def test_identity(self):
+         f = io.StringIO()
+         sbf = lldb.SBFile(f)
+diff --git a/lldb/test/API/terminal/TestPythonInterpreterEcho.py b/lldb/test/API/terminal/TestPythonInterpreterEcho.py
+new file mode 100644
+index 0000000000000..758a4f9cede5a
+--- /dev/null
+++ b/lldb/test/API/terminal/TestPythonInterpreterEcho.py
+@@ -0,0 +1,62 @@
+"""
+Test that typing python expression in the terminal is echoed back to stdout.
+"""
+
+from lldbsuite.test.decorators import skipIfAsan
+from lldbsuite.test.lldbpexpect import PExpectTest
+
+
+@skipIfAsan
+class PythonInterpreterEchoTest(PExpectTest):
+    PYTHON_PROMPT = ">>> "
+
+    def verify_command_echo(
+        self, command: str, expected_output: str = "", is_regex: bool = False
+    ):
+        assert self.child != None
+        child = self.child
+        self.assertIsNotNone(self.child, "expected a running lldb process.")
+
+        child.sendline(command)
+
+        # Build pattern list: match whichever comes first (output or prompt).
+        # This prevents waiting for a timeout if there's no match.
+        pattern = []
+        match_expected = expected_output and len(expected_output) > 0
+
+        if match_expected:
+            pattern.append(expected_output)
+        pattern.append(self.PYTHON_PROMPT)
+
+        expect_func = child.expect if is_regex else child.expect_exact
+        match_idx = expect_func(pattern)
+        if match_expected:
+            self.assertEqual(
+                match_idx, 0, "Expected output `{expected_output}` in stdout."
+            )
+
+        self.assertIsNotNone(self.child.before, "Expected output before prompt")
+        self.assertIsInstance(self.child.before, bytes)
+        echoed_text: str = self.child.before.decode("ascii").strip()
+        self.assertEqual(
+            command, echoed_text, f"Command '{command}' should be echoed to stdout."
+        )
+
+        if match_expected:
+            child.expect_exact(self.PYTHON_PROMPT)
+
+    def test_python_interpreter_echo(self):
+        """Test that that the user typed commands is echoed to stdout"""
+
+        self.launch(use_colors=False, dimensions=(100, 100))
+
+        # Enter the python interpreter.
+        self.verify_command_echo(
+            "script --language python --", expected_output="Python.*\\.", is_regex=True
+        )
+        self.child_in_script_interpreter = True
+
+        self.verify_command_echo("val = 300")
+        self.verify_command_echo(
+            "print('result =', 300)", expected_output="result = 300"
+        )
+diff --git a/lldb/test/Shell/ScriptInterpreter/Python/io.test b/lldb/test/Shell/ScriptInterpreter/Python/io.test
+new file mode 100644
+index 0000000000000..25e3de41724e0
+--- /dev/null
+++ b/lldb/test/Shell/ScriptInterpreter/Python/io.test
+@@ -0,0 +1,12 @@
+# RUN: rm -rf %t.stdout %t.stderr
+# RUN: cat %s | %lldb --script-language python > %t.stdout 2> %t.stderr
+# RUN: cat %t.stdout | FileCheck %s --check-prefix STDOUT
+# RUN: cat %t.stderr | FileCheck %s --check-prefix STDERR
+script
+variable = 300
+print(variable)
+print(not_value)
+quit
+
+# STDOUT: 300
+# STDERR: NameError{{.*}}is not defined
--- a/SOURCES/changelog
+++ b/SOURCES/changelog
--- a/SOURCES/release-keys.asc
+++ b/SOURCES/release-keys.asc
@ -102,3 +102,29 @@ yWfeofTJ7PhKzoXM2Y/rRFoM5gNh1RVA19ngLT5Jwiof8fPZvHJ/9ZkHn+O7eMNm
 m5++gYza3pnn2/PoGpGGAKok+sfJiq5Tb7RUefyJTeZiyTZ/XJrA
 =tMzl
 -----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEaMgtRhYJKwYBBAHaRw8BAQdA4NRjJPhVd56sOM+QmTbZKkRT3bYbgg6+Bxed
+CELeGp+0JUN1bGxlbiBSaG9kZXMgPGN1bGxlbi5yaG9kZXNAYXJtLmNvbT6IkwQT
+FgoAOxYhBHEEbR6cZla91hFxhz6Dur9KT56FBQJoyC1GAhsDBQsJCAcCAiICBhUK
+CQgLAgQWAgMBAh4HAheAAAoJED6Dur9KT56FkVwA/RLNMBHrjXoAKpRm1iIjiC6w
+gLRqGOnj1qAqPqgntMmmAQCQ2lGpw46rvh88ng84IGsRF0JlTAYb6SR/YYNsQyah
+Arg4BGjILUYSCisGAQQBl1UBBQEBB0B48hCLw13kduwibGDGoIax0BIa+f66IUC+
+HhNlucsjbgMBCAeIeAQYFgoAIBYhBHEEbR6cZla91hFxhz6Dur9KT56FBQJoyC1G
+AhsMAAoJED6Dur9KT56FVssBAO1lL/S2cU65XFHgbjc6crwljDrD7PYbxBA7hDpi
+pC4ZAP98rK1hGQ5wxpeiJ0heZ8zhpdUwEeymIDBaIcwgrJRFBQ==
+=HcEB
+-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEaMg2hBYJKwYBBAHaRw8BAQdA2J814YnhPQSdsyjwx8VxZ7AitqCnns9lzvkx
+HX9lWMW0JERvdWdsYXMgWXVuZyA8ZG91Z2xhcy55dW5nQHNvbnkuY29tPoiTBBMW
+CgA7FiEE/7M2iYDz5rtXNxRaMWxW0GTKy6UFAmjINoQCGwMFCwkIBwICIgIGFQoJ
+CAsCBBYCAwECHgcCF4AACgkQMWxW0GTKy6XjYgEApJ7p+o7EAeaaOdO2f440KDfg
+t7haaBLaxr5fiaSKjkYA+gLDxWOh39Y84upf23qMmpSTZ3SK5LvJtBTVtV7AEX0B
+uDgEaMg2hBIKKwYBBAGXVQEFAQEHQL3CL6jHZAakhtLLj2Ks34u7ItY/7USl/bYk
+f/+mZTJMAwEIB4h4BBgWCgAgFiEE/7M2iYDz5rtXNxRaMWxW0GTKy6UFAmjINoQC
+GwwACgkQMWxW0GTKy6VTOgEArDn9bg58W7bfZfVfneJJbIeICEf3NN9IovbRbAOB
+ax0A/RxtrG4qowLlo907vb25ITOa1hBoheSV2wNoDaDUhFEF
+=JQ8u
+-----END PGP PUBLIC KEY BLOCK-----
--- a/SPECS/llvm.spec
+++ b/SPECS/llvm.spec