diff options
| author | Robert Nagy <rnagy@FreeBSD.org> | 2024-02-24 07:11:52 +0100 |
|---|---|---|
| committer | Robert Nagy <rnagy@FreeBSD.org> | 2024-02-24 21:23:13 +0100 |
| commit | a71d4d63985a0b63188f9695455b77bb3c0a8ab2 (patch) | |
| tree | a0921dec9e51a627859620db90ad267b9c16472a /www/chromium/files/patch-base_compiler__specific.h | |
| parent | security/vuxml: add www/*chromium < 122.0.6261.57 (diff) | |
www/chromium: udpate to 122.0.6261.69
Security: https://vuxml.freebsd.org/freebsd/2a470712-d351-11ee-86bb-a8a1599412c6.html
Diffstat (limited to 'www/chromium/files/patch-base_compiler__specific.h')
| -rw-r--r-- | www/chromium/files/patch-base_compiler__specific.h | 42 |
1 files changed, 9 insertions, 33 deletions
diff --git a/www/chromium/files/patch-base_compiler__specific.h b/www/chromium/files/patch-base_compiler__specific.h index 01643d0d5afd..32086eb84483 100644 --- a/www/chromium/files/patch-base_compiler__specific.h +++ b/www/chromium/files/patch-base_compiler__specific.h @@ -1,35 +1,11 @@ ---- base/compiler_specific.h.orig 2024-01-30 07:53:34 UTC +--- base/compiler_specific.h.orig 2024-02-23 21:04:38 UTC +++ base/compiler_specific.h -@@ -41,9 +41,9 @@ - // Annotate a function indicating it should not be inlined. - // Use like: - // NOINLINE void DoStuff() { ... } --#if defined(__clang__) && HAS_ATTRIBUTE(noinline) -+#if defined(__clang__) && (__clang_major__ >= 15) && HAS_ATTRIBUTE(noinline) - #define NOINLINE [[clang::noinline]] --#elif defined(COMPILER_GCC) && HAS_ATTRIBUTE(noinline) -+#elif (defined(COMPILER_GCC) || defined(__clang__)) && HAS_ATTRIBUTE(noinline) - #define NOINLINE __attribute__((noinline)) - #elif defined(COMPILER_MSVC) - #define NOINLINE __declspec(noinline) -@@ -60,9 +60,9 @@ - #define NOOPT - #endif - --#if defined(__clang__) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline) -+#if defined(__clang__) && (__clang_major__ >= 15) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline) - #define ALWAYS_INLINE [[clang::always_inline]] inline --#elif defined(COMPILER_GCC) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline) -+#elif (defined(COMPILER_GCC) || defined(__clang__)) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline) - #define ALWAYS_INLINE inline __attribute__((__always_inline__)) - #elif defined(COMPILER_MSVC) && defined(NDEBUG) - #define ALWAYS_INLINE __forceinline -@@ -78,7 +78,7 @@ - // prevent code folding, see NO_CODE_FOLDING() in base/debug/alias.h. - // Use like: - // NOT_TAIL_CALLED void FooBar(); --#if defined(__clang__) && HAS_ATTRIBUTE(not_tail_called) -+#if defined(__clang__) && (__clang_major__ >= 15) && HAS_ATTRIBUTE(not_tail_called) - #define NOT_TAIL_CALLED [[clang::not_tail_called]] +@@ -316,7 +316,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__)) #else - #define NOT_TAIL_CALLED |