summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@sourceware.org>2022-01-12 18:46:28 +0530
committerSiddhesh Poyarekar <siddhesh@sourceware.org>2022-03-11 20:36:24 +0530
commitd6a58bd81d07322ff5da8f419d8620ef037b6a36 (patch)
tree74ab1e7815f8d0c676eabac2da157a6c7cee6e30 /misc
parent10f7bdebe570e42d1f7a43de4f90eda8ccb4f0da (diff)
downloadglibc-d6a58bd81d07322ff5da8f419d8620ef037b6a36.tar.gz
Enable _FORTIFY_SOURCE=3 for gcc 12 and above
gcc 12 now has support for the __builtin_dynamic_object_size builtin. Adapt the macro checks to enable _FORTIFY_SOURCE=3 on gcc 12 and above. Signed-off-by: Siddhesh Poyarekar <siddhesh@sourceware.org> Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> (cherry picked from commit 86bf0feb0e3ec8e37872f72499d6ae33406561d7)
Diffstat (limited to 'misc')
-rw-r--r--misc/sys/cdefs.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
index 3bb9f38916..515fb681a0 100644
--- a/misc/sys/cdefs.h
+++ b/misc/sys/cdefs.h
@@ -142,7 +142,8 @@
#define __bos0(ptr) __builtin_object_size (ptr, 0)
/* Use __builtin_dynamic_object_size at _FORTIFY_SOURCE=3 when available. */
-#if __USE_FORTIFY_LEVEL == 3 && __glibc_clang_prereq (9, 0)
+#if __USE_FORTIFY_LEVEL == 3 && (__glibc_clang_prereq (9, 0) \
+ || __GNUC_PREREQ (12, 0))
# define __glibc_objsize0(__o) __builtin_dynamic_object_size (__o, 0)
# define __glibc_objsize(__o) __builtin_dynamic_object_size (__o, 1)
#else