diff options
| author | Robert Nagy <rnagy@FreeBSD.org> | 2024-06-26 08:11:27 +0200 |
|---|---|---|
| committer | Robert Nagy <rnagy@FreeBSD.org> | 2024-06-26 17:34:47 +0200 |
| commit | b313ad21d659165dbf7eda701b81d5bf413ad752 (patch) | |
| tree | 2e5e02a358bbb3e2e4439e7528bf7f5e59caa0db /www/iridium/files/patch-base_compiler__specific.h | |
| parent | science/py-qcengine: update 0.29.0 → 0.30.0 (diff) | |
www/iridium: update to 2024.06.126.2
Diffstat (limited to 'www/iridium/files/patch-base_compiler__specific.h')
| -rw-r--r-- | www/iridium/files/patch-base_compiler__specific.h | 42 |
1 files changed, 9 insertions, 33 deletions
diff --git a/www/iridium/files/patch-base_compiler__specific.h b/www/iridium/files/patch-base_compiler__specific.h index 68ec17479a8a..e6258c63b357 100644 --- a/www/iridium/files/patch-base_compiler__specific.h +++ b/www/iridium/files/patch-base_compiler__specific.h @@ -1,35 +1,11 @@ ---- base/compiler_specific.h.orig 2023-07-24 14:27:53 UTC +--- base/compiler_specific.h.orig 2024-06-25 12:08:48 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) -@@ -51,9 +51,9 @@ - #define NOINLINE - #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 -@@ -69,7 +69,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 |