[1/6] clang: Fix libgcc.so.1.0 symlink to point to libunwind.so.1

diff --git a/meta/recipes-devtools/clang/clang/0040-llvm-libgcc-Fix-symlink-path-for-libcc-when-LLVM_ENA.patch b/meta/recipes-devtools/clang/clang/0040-llvm-libgcc-Fix-symlink-path-for-libcc-when-LLVM_ENA.patch
new file mode 100644
index 00000000000..f385dc83ea5
--- /dev/null
+++ b/meta/recipes-devtools/clang/clang/0040-llvm-libgcc-Fix-symlink-path-for-libcc-when-LLVM_ENA.patch
@@ -0,0 +1,33 @@ 
+From 4204fd1b62de30418433139fea1b7dad4fff9c59 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 28 Oct 2025 15:44:49 -0700
+Subject: [PATCH] [llvm-libgcc] Fix symlink path for libgcc
+
+The symlink for libgcc_so.1.0 is made to point to libunwind.so
+which is functionally correct but it fails some linux distro packaging
+complain because libunwind.so is made part of -dev package but
+libgcc_so.1.0 ends up in the real package, and creates an unneeded
+package -> dev dependency
+
+create the symlink to point to libunwind.so.1 instead then the boundaries
+of packaging are not crossed and all is well.
+
+Upstream-Status: Submitted [https://github.com/llvm/llvm-project/pull/165487]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ llvm-libgcc/CMakeLists.txt | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/llvm-libgcc/CMakeLists.txt b/llvm-libgcc/CMakeLists.txt
+index 47208fc19869..54009c1104c3 100644
+--- a/llvm-libgcc/CMakeLists.txt
++++ b/llvm-libgcc/CMakeLists.txt
+@@ -137,7 +147,7 @@ add_custom_target(llvm-libgcc ALL
+   DEPENDS unwind_shared unwind_static clang_rt.builtins-${COMPILER_RT_DEFAULT_TARGET_ARCH}
+   COMMAND ${CMAKE_COMMAND} -E create_symlink ${LLVM_LIBGCC_COMPILER_RT} libgcc.a
+   COMMAND ${CMAKE_COMMAND} -E create_symlink libunwind.a libgcc_eh.a
+-  COMMAND ${CMAKE_COMMAND} -E create_symlink libunwind.so libgcc_s.so.1.0
++  COMMAND ${CMAKE_COMMAND} -E create_symlink libunwind.so.1 libgcc_s.so.1.0
+   COMMAND ${CMAKE_COMMAND} -E create_symlink libgcc_s.so.1.0 libgcc_s.so.1
+   COMMAND ${CMAKE_COMMAND} -E create_symlink libgcc_s.so.1 libgcc_s.so
+ )
diff --git a/meta/recipes-devtools/clang/clang/0041-llvm-libgcc-Fix-libgcc.a-symlink-path-when-LLVM_ENAB.patch b/meta/recipes-devtools/clang/clang/0041-llvm-libgcc-Fix-libgcc.a-symlink-path-when-LLVM_ENAB.patch
new file mode 100644
index 00000000000..789d6d727a3
--- /dev/null
+++ b/meta/recipes-devtools/clang/clang/0041-llvm-libgcc-Fix-libgcc.a-symlink-path-when-LLVM_ENAB.patch
@@ -0,0 +1,83 @@ 
+From 919fcd11ad53bdfab9a14d5df6de0895bf24e456 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 28 Oct 2025 19:02:44 -0700
+Subject: [PATCH] [llvm-libgcc] Fix libgcc.a symlink path when LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF
+
+The llvm-libgcc installation was creating incorrect symlinks for libgcc.a
+when built with LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF, particularly seen with
+Yocto cross-compilation environments.
+
+Issues seen:
+
+-  Absolute path in symlink: The previous code didn't handle absolute paths
+   returned by get_compiler_rt_install_dir() in staging/sysroot environments,
+   resulting in symlinks like:
+   libgcc.a -> /absolute/path/to/sysroot/usr/lib/clang/.../libclang_rt.builtins.a
+
+-  Missing architecture suffix: When the install path contained "clang", the
+   code would skip setting builtins_suffix, creating:
+   libgcc.a -> clang/21.1.4/lib/linux/libclang_rt.builtins.a
+   instead of:
+   libgcc.a -> clang/21.1.4/lib/linux/libclang_rt.builtins-aarch64.a
+
+-  Incorrect relative path calculation: The original regex stripped too much
+   or too little of the path, either creating symlinks pointing to non-existent
+   locations or stripping the clang/ directory prefix entirely.
+
+Solution:
+
+- Extract the relative path starting from 'clang/' when present in absolute
+  paths, ensuring the symlink points to the correct location within the
+  installation hierarchy
+- Always append the architecture suffix to the builtins library name
+- Only prepend '../' to the path when LLVM_ENABLE_PER_TARGET_RUNTIME_DIR is
+  enabled, as this is when the builtins are in a different directory level
+
+The symlink now correctly points to the existing compiler-rt builtins library
+without creating duplicate copies.
+
+Tested with LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF in cross-compilation
+environments (aarch64 target).
+
+Upstream-Status: Submitted [https://github.com/llvm/llvm-project/pull/165487]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ llvm-libgcc/CMakeLists.txt | 24 ++++++++++++++++++++----
+ 1 file changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/llvm-libgcc/CMakeLists.txt b/llvm-libgcc/CMakeLists.txt
+index cd9c5011d410..ee7fe768bda0 100644
+--- a/llvm-libgcc/CMakeLists.txt
++++ b/llvm-libgcc/CMakeLists.txt
+@@ -124,11 +124,27 @@ target_link_libraries(unwind_shared PUBLIC
+ #===============================================================================
+
+ get_compiler_rt_install_dir(${COMPILER_RT_DEFAULT_TARGET_ARCH} install_dir_builtins)
+-string(REGEX REPLACE "^lib/" "" install_dir_builtins "${install_dir_builtins}")
+-string(FIND "${install_dir_builtins}" "clang" install_path_contains_triple)
+-if(install_path_contains_triple EQUAL -1)
+-  set(builtins_suffix "-${COMPILER_RT_DEFAULT_TARGET_ARCH}")
++
++# Extract the relative path starting from 'clang' or after 'lib/'
++if(IS_ABSOLUTE "${install_dir_builtins}")
++  # For absolute paths, extract starting from 'clang/' if it exists
++  string(REGEX MATCH "clang/.*$" install_dir_builtins_temp "${install_dir_builtins}")
++  if(install_dir_builtins_temp)
++    set(install_dir_builtins "${install_dir_builtins_temp}")
++  else()
++    # Fallback: strip up to first lib/
++    string(REGEX REPLACE "^.*/lib/" "" install_dir_builtins "${install_dir_builtins}")
++  endif()
+ else()
++  string(REGEX REPLACE "^lib/" "" install_dir_builtins "${install_dir_builtins}")
++endif()
++
++# Always add the architecture suffix
++set(builtins_suffix "-${COMPILER_RT_DEFAULT_TARGET_ARCH}")
++
++# Only prepend ../ when using per-target runtime directories
++string(FIND "${install_dir_builtins}" "clang" install_path_contains_triple)
++if(install_path_contains_triple GREATER -1 AND LLVM_ENABLE_PER_TARGET_RUNTIME_DIR)
+   string(PREPEND install_dir_builtins "../")
+ endif()
+ set(LLVM_LIBGCC_COMPILER_RT ${install_dir_builtins}/libclang_rt.builtins${builtins_suffix}.a)
diff --git a/meta/recipes-devtools/clang/common.inc b/meta/recipes-devtools/clang/common.inc
index 20adbf2610f..2b76c690588 100644
--- a/meta/recipes-devtools/clang/common.inc
+++ b/meta/recipes-devtools/clang/common.inc
@@ -38,7 +38,7 @@  SRC_URI = "\
     file://0016-clang-driver-Add-dyld-prefix-when-checking-sysroot-f.patch \
     file://0017-clang-Use-python3-in-python-scripts.patch \
     file://0018-llvm-clang-Insert-anchor-for-adding-OE-distro-vendor.patch \
-    file://0019-compiler-rt-Do-not-use-backtrace-APIs-on-non-glibc-l.patch \ 
+    file://0019-compiler-rt-Do-not-use-backtrace-APIs-on-non-glibc-l.patch \
     file://0020-clang-Fix-x86-triple-for-non-debian-multiarch-linux-.patch \
     file://0021-libunwind-Added-unw_backtrace-method.patch \
     file://0022-lldb-Link-with-libatomic-on-x86.patch \
@@ -59,6 +59,8 @@  SRC_URI = "\
     file://0037-Revert-libc-Remap-headers-in-the-debug-info-when-bui.patch \
     file://0038-Prevent-revisiting-block-when-searching-for-noreturn.patch \
     file://0039-Only-build-c-index-test-when-clang-tests-are-include.patch \
+    file://0040-llvm-libgcc-Fix-symlink-path-for-libcc-when-LLVM_ENA.patch \
+    file://0041-llvm-libgcc-Fix-libgcc.a-symlink-path-when-LLVM_ENAB.patch \
     file://0001-Install-lldb-tblgen.patch \
     file://0001-dont-expose-LLVM_HAVE_OPT_VIEWER_MODULES.patch \
     file://0001-clang-Support-building-native-tools-when-cross-compi.patch \