Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 18 Dec 2024 01:23:06 GMT
From:      Brooks Davis <brooks@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 983003a6153f - main - devel/llvm19: 19.1.6 release
Message-ID:  <202412180123.4BI1N6Lt040095@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/ports/commit/?id=983003a6153f1727cc46921197a8b0718f2b4e3e

commit 983003a6153f1727cc46921197a8b0718f2b4e3e
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2024-12-18 01:22:34 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2024-12-18 01:22:34 +0000

    devel/llvm19: 19.1.6 release
    
    See the release annoucement for details:
        https://discourse.llvm.org/t/llvm-19-1-6-released/83723
    
    Backport loongarch64 triple support from upstream LLVM.
---
 devel/llvm19/Makefile                          |   2 +-
 devel/llvm19/distinfo                          |   6 +-
 devel/llvm19/files/patch-backport-3b10e31d3a4a | 107 +++++++++++++++++++++++++
 3 files changed, 111 insertions(+), 4 deletions(-)

diff --git a/devel/llvm19/Makefile b/devel/llvm19/Makefile
index 326bb42fb6f8..f631cc1db49b 100644
--- a/devel/llvm19/Makefile
+++ b/devel/llvm19/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	llvm
-DISTVERSION=	19.1.5
+DISTVERSION=	19.1.6
 PORTREVISION=	0
 CATEGORIES=	devel lang
 MASTER_SITES=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION}/
diff --git a/devel/llvm19/distinfo b/devel/llvm19/distinfo
index 54d0b1e5e4db..9af84bcde8dd 100644
--- a/devel/llvm19/distinfo
+++ b/devel/llvm19/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1733242597
-SHA256 (llvm-project-19.1.5.src.tar.xz) = bd8445f554aae33d50d3212a15e993a667c0ad1b694ac1977f3463db3338e542
-SIZE (llvm-project-19.1.5.src.tar.xz) = 141243716
+TIMESTAMP = 1734470406
+SHA256 (llvm-project-19.1.6.src.tar.xz) = e3f79317adaa9196d2cfffe1c869d7c100b7540832bc44fe0d3f44a12861fa34
+SIZE (llvm-project-19.1.6.src.tar.xz) = 141248428
diff --git a/devel/llvm19/files/patch-backport-3b10e31d3a4a b/devel/llvm19/files/patch-backport-3b10e31d3a4a
new file mode 100644
index 000000000000..9fa19c3f0958
--- /dev/null
+++ b/devel/llvm19/files/patch-backport-3b10e31d3a4a
@@ -0,0 +1,107 @@
+commit 3b10e31d3a4a1c660c82287d3b9f6515f37a32ca
+Author: hitmoon <zxq_yx_007@163.com>
+Date:   Fri Dec 13 10:34:53 2024 +0800
+
+    [clang][LoongArch] Add FreeBSD targets (#119191)
+    
+    Add support for freebsd on loongarch
+    
+    Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
+    Co-authored-by: yu shan wei <mpysw@vip.163.com>
+
+diff --git clang/lib/Basic/Targets.cpp clang/lib/Basic/Targets.cpp
+index 0021d33c45d7..706a391023b3 100644
+--- clang/lib/Basic/Targets.cpp
++++ clang/lib/Basic/Targets.cpp
+@@ -726,6 +726,9 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
+     case llvm::Triple::Linux:
+         return std::make_unique<LinuxTargetInfo<LoongArch32TargetInfo>>(Triple,
+                                                                         Opts);
++    case llvm::Triple::FreeBSD:
++      return std::make_unique<FreeBSDTargetInfo<LoongArch32TargetInfo>>(Triple,
++                                                                        Opts);
+     default:
+         return std::make_unique<LoongArch32TargetInfo>(Triple, Opts);
+     }
+@@ -734,6 +737,9 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
+     case llvm::Triple::Linux:
+         return std::make_unique<LinuxTargetInfo<LoongArch64TargetInfo>>(Triple,
+                                                                         Opts);
++    case llvm::Triple::FreeBSD:
++      return std::make_unique<FreeBSDTargetInfo<LoongArch64TargetInfo>>(Triple,
++                                                                        Opts);
+     default:
+         return std::make_unique<LoongArch64TargetInfo>(Triple, Opts);
+     }
+diff --git clang/lib/Basic/Targets/OSTargets.h clang/lib/Basic/Targets/OSTargets.h
+index c0351f26e9be..cd9b3760ca58 100644
+--- clang/lib/Basic/Targets/OSTargets.h
++++ clang/lib/Basic/Targets/OSTargets.h
+@@ -231,6 +231,9 @@ public:
+     case llvm::Triple::riscv32:
+     case llvm::Triple::riscv64:
+       break;
++    case llvm::Triple::loongarch32:
++    case llvm::Triple::loongarch64:
++      break;
+     }
+   }
+ };
+diff --git clang/lib/Driver/ToolChains/FreeBSD.cpp clang/lib/Driver/ToolChains/FreeBSD.cpp
+index c78f4e26a2f1..678efefb1afc 100644
+--- clang/lib/Driver/ToolChains/FreeBSD.cpp
++++ clang/lib/Driver/ToolChains/FreeBSD.cpp
+@@ -213,6 +213,14 @@ void freebsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+     CmdArgs.push_back("-m");
+     CmdArgs.push_back("elf64lriscv");
+     break;
++  case llvm::Triple::loongarch32:
++    CmdArgs.push_back("-m");
++    CmdArgs.push_back("elf32loongarch");
++    break;
++  case llvm::Triple::loongarch64:
++    CmdArgs.push_back("-m");
++    CmdArgs.push_back("elf64loongarch");
++    break;
+   default:
+     break;
+   }
+@@ -223,6 +231,12 @@ void freebsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+       CmdArgs.push_back("--no-relax");
+   }
+ 
++  if (Triple.isLoongArch64()) {
++    CmdArgs.push_back("-X");
++    if (Args.hasArg(options::OPT_mno_relax))
++      CmdArgs.push_back("--no-relax");
++  }
++
+   if (Arg *A = Args.getLastArg(options::OPT_G)) {
+     if (ToolChain.getTriple().isMIPS()) {
+       StringRef v = A->getValue();
+diff --git clang/test/Driver/freebsd.c clang/test/Driver/freebsd.c
+index 10fe155fee87..a0787bab4feb 100644
+--- clang/test/Driver/freebsd.c
++++ clang/test/Driver/freebsd.c
+@@ -77,6 +77,21 @@
+ // RUN:   | FileCheck --check-prefix=CHECK-RV64I-LD %s
+ // CHECK-RV64I-LD: ld{{.*}}" {{.*}} "-m" "elf64lriscv"
+ //
++// Check that LoongArch passes the correct linker emulation.
++//
++// RUN: %clang --target=loongarch32-freebsd -### %s %s 2>&1 \
++// RUN:   | FileCheck --check-prefix=CHECK-LA32-LD %s
++// CHECK-LA32-LD: ld{{.*}}" {{.*}} "-m" "elf32loongarch"
++// RUN: %clang --target=loongarch64-freebsd -### %s %s 2>&1 \
++// RUN:   | FileCheck --check-prefix=CHECK-LA64-LD %s
++// CHECK-LA64-LD: ld{{.*}}" {{.*}} "-m" "elf64loongarch"
++//
++// Check options passed to the linker on LoongArch
++//
++// RUN: %clang --target=loongarch64-freebsd -mno-relax -### %s %s 2>&1 \
++// RUN:   | FileCheck --check-prefix=CHECK-LA64-LD-OPTS %s
++// CHECK-LA64-LD-OPTS: ld{{.*}}" {{.*}} "-X" "--no-relax"
++//
+ // Check that the new linker flags are passed to FreeBSD
+ // RUN: %clang --target=x86_64-pc-freebsd10.0 -m32 %s \
+ // RUN:   --sysroot=%S/Inputs/multiarch_freebsd64_tree -### 2>&1 \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202412180123.4BI1N6Lt040095>