From 9b3349f867fa23240413a5f0d867a813baeeaf08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= <fberat@redhat.com>
Date: Tue, 4 Nov 2025 14:26:15 +0100
Subject: [PATCH] Fix lint-Makefile failure (RHEL-126049)

Resolves: RHEL-126049
---
 glibc-RHEL-126049-1.patch | 43 +++++++++++++++++++++++++++++++++++++++
 glibc-RHEL-126049-2.patch | 29 ++++++++++++++++++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 glibc-RHEL-126049-1.patch
 create mode 100644 glibc-RHEL-126049-2.patch

diff --git a/glibc-RHEL-126049-1.patch b/glibc-RHEL-126049-1.patch
new file mode 100644
index 0000000..3bdfb8f
--- /dev/null
+++ b/glibc-RHEL-126049-1.patch
@@ -0,0 +1,43 @@
+commit ced745bcd3e0d58cfc38ebbbc36540b9dcdd29eb
+Author: H.J. Lu <hjl.tools@gmail.com>
+Date:   Tue Oct 8 08:46:45 2024 +0800
+
+    stdio-common/Makefile: Fix FAIL: lint-makefiles
+    
+    Fix stdio-common/Makefile:
+    
+    @@ -224,12 +224,12 @@
+       tst-freopen4 \
+       tst-freopen5 \
+       tst-freopen6 \
+    +  tst-freopen7 \
+       tst-freopen64-2 \
+       tst-freopen64-3 \
+       tst-freopen64-4 \
+       tst-freopen64-6 \
+       tst-freopen64-7 \
+    -  tst-freopen7 \
+       tst-fseek \
+       tst-fwrite \
+       tst-fwrite-memstrm \
+    
+    Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
+
+diff --git a/stdio-common/Makefile b/stdio-common/Makefile
+index 4c39b9d9fb3d029f..d89c2aa31f47a363 100644
+--- a/stdio-common/Makefile
++++ b/stdio-common/Makefile
+@@ -229,12 +229,12 @@ tests := \
+   tst-freopen4 \
+   tst-freopen5 \
+   tst-freopen6 \
+-  tst-freopen7 \
+   tst-freopen64-2 \
+   tst-freopen64-3 \
+   tst-freopen64-4 \
+   tst-freopen64-6 \
+   tst-freopen64-7 \
++  tst-freopen7 \
+   tst-fseek \
+   tst-fseek-mmap \
+   tst-fwrite \
diff --git a/glibc-RHEL-126049-2.patch b/glibc-RHEL-126049-2.patch
new file mode 100644
index 0000000..4ea51f1
--- /dev/null
+++ b/glibc-RHEL-126049-2.patch
@@ -0,0 +1,29 @@
+commit 265e13d33c470446043a3d2033984a1197151e09
+Author: H.J. Lu <hjl.tools@gmail.com>
+Date:   Sun Dec 22 05:55:39 2024 +0800
+
+    assert: Sort tests in Makefile
+    
+    Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
+
+Conflicts:
+	assert/Makefile
+	  (fixup context)
+
+diff --git a/assert/Makefile b/assert/Makefile
+index d2c6943e6e28dda0..ffd9024a4c7058cc 100644
+--- a/assert/Makefile
++++ b/assert/Makefile
+@@ -35,11 +35,11 @@ routines := \
+ 
+ tests := \
+   test-assert \
++  test-assert-2 \
+   test-assert-perr \
+   tst-assert-c++ \
+   tst-assert-g++ \
+   tst-assert-sa-2025-0001 \
+-  test-assert-2 \
+   # tests
+ 
+ ifeq ($(have-cxx-thread_local),yes)