commit:     8f8d82a41eb0f0b0cf04da9ac15b42454d5079ed
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 16 12:37:39 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Sep 17 12:12:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f8d82a4

sys-devel/clang-common: Cover more sanitizers for FORTIFY_SOURCE

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/38624
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../clang-common/clang-common-20.0.0.9999.ebuild      | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/sys-devel/clang-common/clang-common-20.0.0.9999.ebuild 
b/sys-devel/clang-common/clang-common-20.0.0.9999.ebuild
index 090a45690818..56db34cffe17 100644
--- a/sys-devel/clang-common/clang-common-20.0.0.9999.ebuild
+++ b/sys-devel/clang-common/clang-common-20.0.0.9999.ebuild
@@ -227,19 +227,20 @@ src_install() {
        #  define __GENTOO_HAS_FEATURE(x) 0
        # endif
        #
-       # if defined(__STDC_HOSTED__) && __STDC_HOSTED__ == 1
-       #  define __GENTOO_NOT_FREESTANDING 1
+       # if !defined(__OPTIMIZE__) || __OPTIMIZE__ == 0
+       # elif !defined(__STDC_HOSTED__) || __STDC_HOSTED__ != 1
+       # elif defined(__SANITIZE_ADDRESS__)
+       # elif __GENTOO_HAS_FEATURE(address_sanitizer)
+       # elif __GENTOO_HAS_FEATURE(hwaddress_sanitizer)
+       # elif __GENTOO_HAS_FEATURE(memory_sanitizer)
+       # elif __GENTOO_HAS_FEATURE(numerical_stability_sanitizer)
+       # elif __GENTOO_HAS_FEATURE(realtime_sanitizer)
+       # elif __GENTOO_HAS_FEATURE(thread_sanitizer)
        # else
-       #  define __GENTOO_NOT_FREESTANDING 0
+       #  define _FORTIFY_SOURCE ${fortify_level}
        # endif
        #
-       # if defined(__OPTIMIZE__) && __OPTIMIZE__ > 0 && 
__GENTOO_NOT_FREESTANDING > 0
-       #  if !defined(__SANITIZE_ADDRESS__) && 
!__GENTOO_HAS_FEATURE(address_sanitizer) && 
!__GENTOO_HAS_FEATURE(memory_sanitizer)
-       #   define _FORTIFY_SOURCE ${fortify_level}
-       #  endif
-       # endif
        # undef __GENTOO_HAS_FEATURE
-       # undef __GENTOO_NOT_FREESTANDING
        #endif
        EOF
 

Reply via email to