From e73b7c0f890313d0925202bbeb8067be1951232b Mon Sep 17 00:00:00 2001 From: wangqiang Date: Tue, 21 Jan 2025 10:12:58 +0800 Subject: [PATCH] [Driver] Add kylin OS triple (cherry picked from commit 0d6d7b44a93901b37adc1c22a687a4773dc18100) --- 0028-Driver-add-kylin-OS-triple.patch | 55 +++++++++++++++++++++++++++ clang.spec | 6 ++- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 0028-Driver-add-kylin-OS-triple.patch diff --git a/0028-Driver-add-kylin-OS-triple.patch b/0028-Driver-add-kylin-OS-triple.patch new file mode 100644 index 0000000..d8dc07f --- /dev/null +++ b/0028-Driver-add-kylin-OS-triple.patch @@ -0,0 +1,55 @@ +From c42102c34fbc9873ae10eb077ccd7b822f371d20 Mon Sep 17 00:00:00 2001 +From: wangqiang +Date: Mon, 20 Jan 2025 17:33:44 +0800 +Subject: [PATCH] [Driver] Add kylin OS triple + +--- + clang/lib/Driver/ToolChains/Gnu.cpp | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp +index ee9d4f227..243724ef5 100644 +--- a/clang/lib/Driver/ToolChains/Gnu.cpp ++++ b/clang/lib/Driver/ToolChains/Gnu.cpp +@@ -2367,7 +2367,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( + static const char *const AArch64LibDirs[] = {"/lib64", "/lib"}; + static const char *const AArch64Triples[] = { + "aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-redhat-linux", +- "aarch64-suse-linux", "aarch64-openEuler-linux"}; ++ "aarch64-suse-linux", "aarch64-openEuler-linux", "aarch64-kylin-linux"}; + static const char *const AArch64beLibDirs[] = {"/lib"}; + static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu", + "aarch64_be-linux-gnu"}; +@@ -2401,7 +2401,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( + "x86_64-redhat-linux", "x86_64-suse-linux", + "x86_64-manbo-linux-gnu", "x86_64-linux-gnu", + "x86_64-slackware-linux", "x86_64-unknown-linux", +- "x86_64-amazon-linux", "x86_64-openEuler-linux"}; ++ "x86_64-amazon-linux", "x86_64-openEuler-linux", ++ "x86_64-kylin-linux"}; + static const char *const X32Triples[] = {"x86_64-linux-gnux32", + "x86_64-pc-linux-gnux32"}; + static const char *const X32LibDirs[] = {"/libx32", "/lib"}; +@@ -2415,7 +2416,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( + static const char *const LoongArch64LibDirs[] = {"/lib64", "/lib"}; + static const char *const LoongArch64Triples[] = { + "loongarch64-linux-gnu", "loongarch64-unknown-linux-gnu", +- "loongarch64-openEuler-linux"}; ++ "loongarch64-openEuler-linux", "loongarch64-kylin-linux"}; + + static const char *const M68kLibDirs[] = {"/lib"}; + static const char *const M68kTriples[] = { +@@ -2478,7 +2479,9 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( + static const char *const RISCV64LibDirs[] = {"/lib64", "/lib"}; + static const char *const RISCV64Triples[] = {"riscv64-unknown-linux-gnu", + "riscv64-linux-gnu", +- "riscv64-unknown-elf", "riscv64-openEuler-linux"}; ++ "riscv64-unknown-elf", ++ "riscv64-openEuler-linux", ++ "riscv64-kylin-linux"}; + + static const char *const SPARCv8LibDirs[] = {"/lib32", "/lib"}; + static const char *const SPARCv8Triples[] = {"sparc-linux-gnu", +-- +2.33.0 + diff --git a/clang.spec b/clang.spec index cf45ae5..7caa5cd 100644 --- a/clang.spec +++ b/clang.spec @@ -43,7 +43,7 @@ Name: %{pkg_name} Version: %{clang_version} -Release: 30 +Release: 31 Summary: A C language family front-end for LLVM License: NCSA URL: http://llvm.org @@ -78,6 +78,7 @@ Patch24: 0024-Backport-PATCH-Clang-CodeGen-Add__builtin_bcopy.patch Patch25: 0025-clang-Increase-the-number-of-driver-diagnostics.patch Patch26: 0026-Driver-add-option-fGNU-compatibility-aliased-with-fg.patch Patch27: 0027-Driver-fix-compile-error-for-fGNU-compatibility.patch +Patch28: 0028-Driver-add-kylin-OS-triple.patch # Patches for clang-tools-extra # See https://reviews.llvm.org/D120301 @@ -422,6 +423,9 @@ LD_LIBRARY_PATH=%{buildroot}/%{install_libdir} %{__ninja} check-all -C ./_build %{install_bindir}/git-clang-format %changelog +* Tue Jan 21 2025 wangqiang - 17.0.6-31 +- Add KylinOS triple + * Thu Nov 21 2024 eastb233 - 17.0.6-30 - Add option -fGNU-compatibility -- Gitee