head	1.5;
access;
symbols
	pkgsrc-2026Q1:1.4.0.14
	pkgsrc-2026Q1-base:1.4
	pkgsrc-2025Q4:1.4.0.12
	pkgsrc-2025Q4-base:1.4
	pkgsrc-2025Q3:1.4.0.10
	pkgsrc-2025Q3-base:1.4
	pkgsrc-2025Q2:1.4.0.8
	pkgsrc-2025Q2-base:1.4
	pkgsrc-2025Q1:1.4.0.6
	pkgsrc-2025Q1-base:1.4
	pkgsrc-2024Q4:1.4.0.4
	pkgsrc-2024Q4-base:1.4
	pkgsrc-2024Q3:1.4.0.2
	pkgsrc-2024Q3-base:1.4
	pkgsrc-2024Q2:1.1.0.2
	pkgsrc-2024Q2-base:1.1;
locks; strict;
comment	@// @;


1.5
date	2026.03.25.22.56.25;	author wiz;	state Exp;
branches;
next	1.4;
commitid	29BuEbar9GuKtpzG;

1.4
date	2024.07.07.14.00.21;	author wiz;	state Exp;
branches;
next	1.3;
commitid	7D3yOyJILV2DDUgF;

1.3
date	2024.07.07.07.36.09;	author jperkin;	state dead;
branches;
next	1.2;
commitid	q6aBIiXZWuO7vSgF;

1.2
date	2024.07.06.15.45.07;	author adam;	state Exp;
branches;
next	1.1;
commitid	9KpFpYTi5zNpfNgF;

1.1
date	2024.05.09.14.15.51;	author jperkin;	state Exp;
branches;
next	;
commitid	QjAbpX1uks8AAk9F;


desc
@@


1.5
log
@llvm and friends: update to to 20.1.8

Based on the wip packages and help from adam@@
@
text
@$NetBSD: patch-lib_Driver_ToolChains_Gnu.cpp,v 1.4 2024/07/07 14:00:21 wiz Exp $

On SunOS always use the GCC that was used to build clang.

--- lib/Driver/ToolChains/Gnu.cpp.orig	2026-02-21 07:22:27.510926289 +0000
+++ lib/Driver/ToolChains/Gnu.cpp
@@@@ -2348,6 +2348,11 @@@@ void Generic_GCC::GCCInstallationDetector::AddDefaultG
     // /usr/gcc/<version> as a prefix.
 
     SmallVector<std::pair<GCCVersion, std::string>, 8> SolarisPrefixes;
+
+    // Only use compiler as configured by pkgsrc
+    Prefixes.push_back("@@GCCBASEDIR@@");
+    return;
+
     std::string PrefixDir = concat(SysRoot, "/usr/gcc");
     std::error_code EC;
     for (llvm::vfs::directory_iterator LI = D.getVFS().dir_begin(PrefixDir, EC),
@


1.4
log
@clang: try merging Solaris patches
@
text
@d1 1
a1 1
$NetBSD: patch-lib_Driver_ToolChains_Gnu.cpp,v 1.1 2024/05/09 14:15:51 jperkin Exp $
d5 1
a5 1
--- lib/Driver/ToolChains/Gnu.cpp.orig	2024-06-15 17:21:32.000000000 +0000
d7 1
a7 1
@@@@ -2382,6 +2382,11 @@@@ void Generic_GCC::GCCInstallationDetecto
@


1.3
log
@clang: Remove SunOS patches.

These are from an older version of clang and do not work.  The working
patches that replaced these that were removed in the previous update
will be maintained elsewhere.
@
text
@d1 1
a1 1
$NetBSD: patch-lib_Driver_ToolChains_Gnu.cpp,v 1.2 2024/07/06 15:45:07 adam Exp $
a3 1
Support x86_64-sun-solaris2.11 target.
a18 9
@@@@ -2583,7 +2588,7 @@@@ void Generic_GCC::GCCInstallationDetecto
     static const char *const SolarisSparcV9Triples[] = {
         "sparcv9-sun-solaris2.11"};
     static const char *const SolarisX86Triples[] = {"i386-pc-solaris2.11"};
-    static const char *const SolarisX86_64Triples[] = {"x86_64-pc-solaris2.11"};
+    static const char *const SolarisX86_64Triples[] = {"x86_64-pc-solaris2.11", "x86_64-sun-solaris2.11"};
     LibDirs.append(begin(SolarisLibDirs), end(SolarisLibDirs));
     BiarchLibDirs.append(begin(SolarisLibDirs), end(SolarisLibDirs));
     switch (TargetTriple.getArch()) {
@


1.2
log
@llvm: updated to 18.1.8

https://releases.llvm.org
@
text
@d1 1
a1 1
$NetBSD: patch-lib_Driver_ToolChains_Gnu.cpp,v 1.1 2024/05/09 14:15:51 jperkin Exp $
@


1.1
log
@clang: Switch SunOS back to using the GCC runtime.

Upstream LLVM have removed the SunOS code from libcxx et al, despite us
offering to support it and it working fine, and so we're left with no
choice but to go back to using the GCC libraries and headers, which is a
shame.

Tested to compile at least a few different C/C++ files, and is able to
complete the builds of lang/wasi-*.
@
text
@d1 1
a1 1
$NetBSD$
d6 1
a6 1
--- lib/Driver/ToolChains/Gnu.cpp.orig	2024-05-09 10:06:41.859223500 +0000
d8 1
a8 1
@@@@ -2228,6 +2228,11 @@@@ void Generic_GCC::GCCInstallationDetecto
d20 6
a25 6
@@@@ -2431,6 +2436,7 @@@@ void Generic_GCC::GCCInstallationDetecto
     static const char *const SolarisX86Triples[] = {"i386-pc-solaris2.11",
                                                     "i386-pc-solaris2.12"};
     static const char *const SolarisX86_64Triples[] = {"x86_64-pc-solaris2.11",
+                                                       "x86_64-sun-solaris2.11",
                                                        "x86_64-pc-solaris2.12"};
d28 1
@