diff options
| author | Robert Nagy <rnagy@FreeBSD.org> | 2024-11-16 08:32:18 +0100 |
|---|---|---|
| committer | Robert Nagy <rnagy@FreeBSD.org> | 2024-11-16 08:34:57 +0100 |
| commit | 1e5e2f4077490e6ba4827c4be549d4c2d68be522 (patch) | |
| tree | 4976027e416c8aa8feef1b975b264f5ee817d71d /www/chromium/files/patch-base_compiler__specific.h | |
| parent | security/vuxml: add www/*chromium < 131.0.6778.69 (diff) | |
www/chromium: update to 131.0.6778.69
Security: https://vuxml.freebsd.org/freebsd/8fe4f296-a3ec-11ef-8c1c-a8a1599412c6.html
PR: 278413
Diffstat (limited to 'www/chromium/files/patch-base_compiler__specific.h')
| -rw-r--r-- | www/chromium/files/patch-base_compiler__specific.h | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/www/chromium/files/patch-base_compiler__specific.h b/www/chromium/files/patch-base_compiler__specific.h index e0364a93cf53..b46998603cc6 100644 --- a/www/chromium/files/patch-base_compiler__specific.h +++ b/www/chromium/files/patch-base_compiler__specific.h @@ -1,20 +1,11 @@ ---- base/compiler_specific.h.orig 2024-10-22 08:31:56 UTC +--- base/compiler_specific.h.orig 2024-11-14 07:57:23 UTC +++ base/compiler_specific.h -@@ -257,7 +257,7 @@ - // - // In some cases it's desirable to remove this, e.g. on hot functions, or if - // we have purposely changed the reference canary. --#if defined(COMPILER_GCC) || defined(__clang__) -+#if (defined(COMPILER_GCC) || defined(__clang__)) && !defined(__OpenBSD__) && !defined(__FreeBSD__) - #if HAS_ATTRIBUTE(__no_stack_protector__) - #define NO_STACK_PROTECTOR __attribute__((__no_stack_protector__)) +@@ -683,7 +683,7 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) { + #if __has_cpp_attribute(clang::preserve_most) && \ + (defined(ARCH_CPU_ARM64) || defined(ARCH_CPU_X86_64)) && \ + !defined(COMPONENT_BUILD) && \ +- !(BUILDFLAG(IS_WIN) && defined(ARCH_CPU_ARM64)) ++ !((BUILDFLAG(IS_WIN) || BUILDFLAG(IS_OPENBSD)) && defined(ARCH_CPU_ARM64)) + #define PRESERVE_MOST [[clang::preserve_most]] #else -@@ -388,7 +388,7 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) { - // See https://clang.llvm.org/docs/AttributeReference.html#preserve-most for - // more details. - #if (defined(ARCH_CPU_ARM64) || defined(ARCH_CPU_X86_64)) && \ -- !(BUILDFLAG(IS_WIN) && defined(ARCH_CPU_ARM64)) && \ -+ !((BUILDFLAG(IS_WIN) || BUILDFLAG(IS_OPENBSD)) && defined(ARCH_CPU_ARM64)) && \ - !defined(COMPONENT_BUILD) && defined(__clang__) && \ - __clang_major__ >= 17 && HAS_ATTRIBUTE(preserve_most) - #define PRESERVE_MOST __attribute__((preserve_most)) + #define PRESERVE_MOST |