00c0d4
commit 86bf0feb0e3ec8e37872f72499d6ae33406561d7
00c0d4
Author: Siddhesh Poyarekar <siddhesh@sourceware.org>
00c0d4
Date:   Wed Jan 12 18:46:28 2022 +0530
00c0d4
00c0d4
    Enable _FORTIFY_SOURCE=3 for gcc 12 and above
00c0d4
    
00c0d4
    gcc 12 now has support for the __builtin_dynamic_object_size builtin.
00c0d4
    Adapt the macro checks to enable _FORTIFY_SOURCE=3 on gcc 12 and above.
00c0d4
    
00c0d4
    Signed-off-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
00c0d4
    Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
00c0d4
00c0d4
diff --git a/include/features.h b/include/features.h
00c0d4
index fe9fe16d034fad1b..2e9ca6ec2f4a0380 100644
00c0d4
--- a/include/features.h
00c0d4
+++ b/include/features.h
00c0d4
@@ -381,7 +381,9 @@
00c0d4
 #  warning _FORTIFY_SOURCE requires compiling with optimization (-O)
00c0d4
 # elif !__GNUC_PREREQ (4, 1)
00c0d4
 #  warning _FORTIFY_SOURCE requires GCC 4.1 or later
00c0d4
-# elif _FORTIFY_SOURCE > 2 && __glibc_clang_prereq (9, 0)
00c0d4
+# elif _FORTIFY_SOURCE > 2 && (__glibc_clang_prereq (9, 0)		      \
00c0d4
+			       || __GNUC_PREREQ (12, 0))
00c0d4
+
00c0d4
 #  if _FORTIFY_SOURCE > 3
00c0d4
 #   warning _FORTIFY_SOURCE > 3 is treated like 3 on this platform
00c0d4
 #  endif
00c0d4
diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
00c0d4
index 147339957c4ad490..a17ae0ed87e6163f 100644
00c0d4
--- a/misc/sys/cdefs.h
00c0d4
+++ b/misc/sys/cdefs.h
00c0d4
@@ -124,7 +124,8 @@
00c0d4
 #define __bos0(ptr) __builtin_object_size (ptr, 0)
00c0d4
 
00c0d4
 /* Use __builtin_dynamic_object_size at _FORTIFY_SOURCE=3 when available.  */
00c0d4
-#if __USE_FORTIFY_LEVEL == 3 && __glibc_clang_prereq (9, 0)
00c0d4
+#if __USE_FORTIFY_LEVEL == 3 && (__glibc_clang_prereq (9, 0)		      \
00c0d4
+				 || __GNUC_PREREQ (12, 0))
00c0d4
 # define __glibc_objsize0(__o) __builtin_dynamic_object_size (__o, 0)
00c0d4
 # define __glibc_objsize(__o) __builtin_dynamic_object_size (__o, 1)
00c0d4
 #else