CVS commit: pkgsrc/lang/clang

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Jun 17 11:26:11 UTC 2024

Modified Files:
        pkgsrc/lang/clang: distinfo
        pkgsrc/lang/clang/patches: patch-lib_Basic_Targets_OSTargets.h

Log Message:
clang: Add __illumos__ if supported.


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 pkgsrc/lang/clang/distinfo
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/lang/clang/patches/patch-lib_Basic_Targets_OSTargets.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/clang/distinfo
diff -u pkgsrc/lang/clang/distinfo:1.83 pkgsrc/lang/clang/distinfo:1.84
--- pkgsrc/lang/clang/distinfo:1.83     Thu May  9 14:15:51 2024
+++ pkgsrc/lang/clang/distinfo  Mon Jun 17 11:26:11 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.83 2024/05/09 14:15:51 jperkin Exp $
+$NetBSD: distinfo,v 1.84 2024/06/17 11:26:11 jperkin Exp $
 
 BLAKE2s (clang-17.0.6.src.tar.xz) = 888020252b920ca120cc022d13cf411d7dc024f4076ccaff5eccc38dc1e4b438
 SHA512 (clang-17.0.6.src.tar.xz) = da6f670a52d60c46bbe6bfa2870106f6a6714c9566fab293b8c624a555308104a1a05cd065643091d7006ef4533a9a722dff1fccaf26f348a0c0a5c7b9331439
@@ -9,7 +9,7 @@ Size (cmake-17.0.6.src.tar.xz) = 8712 by
 BLAKE2s (runtimes-17.0.6.src.tar.xz) = 73840072a471442d27a106bbd026ef334d4fe6be083f3e3f79f9ac69c8c9e1b9
 SHA512 (runtimes-17.0.6.src.tar.xz) = 3d73abf3c25eb319e12d9f4118158a05f26bb569534b1fe0dd2e99f948046e0bfa9511b61d65863506444ff330c065b9e3bb77310daf3c71dd658a01622fd812
 Size (runtimes-17.0.6.src.tar.xz) = 6240 bytes
-SHA1 (patch-lib_Basic_Targets_OSTargets.h) = 0ec2aaecc77764afd46007239a98e9ea792eb03d
+SHA1 (patch-lib_Basic_Targets_OSTargets.h) = 0dcfbf3c8b0006e3314c36a75995032891ea8ceb
 SHA1 (patch-lib_Driver_ToolChain.cpp) = 06002fa45d16f9b9385f8a7a947aaf3970007938
 SHA1 (patch-lib_Driver_ToolChains_Gnu.cpp) = 2db0a13db660ad0b7cd87199da36653b1e8113b5
 SHA1 (patch-lib_Interpreter_IncrementalParser.cpp) = c5ace959ce566478316447b1621e9bfd9a537cc5

Index: pkgsrc/lang/clang/patches/patch-lib_Basic_Targets_OSTargets.h
diff -u pkgsrc/lang/clang/patches/patch-lib_Basic_Targets_OSTargets.h:1.6 pkgsrc/lang/clang/patches/patch-lib_Basic_Targets_OSTargets.h:1.7
--- pkgsrc/lang/clang/patches/patch-lib_Basic_Targets_OSTargets.h:1.6   Thu May  9 14:15:51 2024
+++ pkgsrc/lang/clang/patches/patch-lib_Basic_Targets_OSTargets.h       Mon Jun 17 11:26:11 2024
@@ -1,10 +1,17 @@
-$NetBSD: patch-lib_Basic_Targets_OSTargets.h,v 1.6 2024/05/09 14:15:51 jperkin Exp $
+$NetBSD: patch-lib_Basic_Targets_OSTargets.h,v 1.7 2024/06/17 11:26:11 jperkin Exp $
 
+Add __illumos__ if the bootstrap compiler also defines it.
 Sync SunOS default defines with what GCC uses.
 
 --- lib/Basic/Targets/OSTargets.h.orig 2023-11-28 08:52:28.000000000 +0000
 +++ lib/Basic/Targets/OSTargets.h
-@@ -642,22 +642,15 @@ protected:
+@@ -639,25 +639,21 @@ protected:
+   void getOSDefines(const LangOptions &Opts, const llvm::Triple &Triple,
+                     MacroBuilder &Builder) const override {
+     DefineStd(Builder, "sun", Opts);
++#if defined(__illumos__)
++    DefineStd(Builder, "__illumos__", Opts);
++#endif
      DefineStd(Builder, "unix", Opts);
      Builder.defineMacro("__svr4__");
      Builder.defineMacro("__SVR4");