From 8c2352b985b1bf69efb965ba15f5e300eb7e8e12 Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Thu, 21 Sep 2023 15:50:32 +0200
Subject: Properly enable diagnose_as_builtin attribute

---
 include/stdio.h | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'include/stdio.h')

diff --git a/include/stdio.h b/include/stdio.h
index 9d29e94..000a72d 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -40,14 +40,12 @@ extern "C" {
 #undef vsprintf
 
 __access(read_only, 2)
-__diagnose_as_builtin(__builtin_fdopen, 1, 2)
 _FORTIFY_FN(fdopen) FILE *fdopen(int __f, const char* _FORTIFY_POS0 __m)
 {
 	return __orig_fdopen(__f, __m);
 }
 
 __access(write_only, 1, 2)
-__diagnose_as_builtin(__builtin_fgets, 1, 2, 3)
 _FORTIFY_FN(fgets) char *fgets(char * _FORTIFY_POS0 __s, int __n, FILE *__f)
 {
 	size_t __b = __bos(__s, 0);
@@ -58,7 +56,6 @@ _FORTIFY_FN(fgets) char *fgets(char * _FORTIFY_POS0 __s, int __n, FILE *__f)
 }
 
 __malloc(malloc (fclose, 1))
-__diagnose_as_builtin(__builtin_fmemopen, 1, 2, 3)
 _FORTIFY_FN(fmemopen) FILE *fmemopen(void* _FORTIFY_POS0 __b, size_t __s, const char* _FORTIFY_POS0 __m)
 {
 	return __orig_fmemopen(__b, __s, __m);
@@ -67,14 +64,12 @@ _FORTIFY_FN(fmemopen) FILE *fmemopen(void* _FORTIFY_POS0 __b, size_t __s, const
 __access(read_only, 1)
 __access(read_only, 2)
 __malloc(malloc (fclose, 1))
-__diagnose_as_builtin(__builtin_fopen, 1, 2)
 _FORTIFY_FN(fopen) FILE *fopen(const char* _FORTIFY_POS0 __p, const char* _FORTIFY_POS0 __m)
 {
 	return __orig_fopen(__p, __m);
 }
 
 __access(write_only, 1)
-__diagnose_as_builtin(__builtin_fread, 1, 2, 3, 4)
 _FORTIFY_FN(fread) size_t fread(void * _FORTIFY_POS0 __d, size_t __n,
                                 size_t __m, FILE *__f)
 {
@@ -88,7 +83,6 @@ _FORTIFY_FN(fread) size_t fread(void * _FORTIFY_POS0 __d, size_t __n,
 }
 
 __access(read_only, 1)
-__diagnose_as_builtin(__builtin_fwrite, 1, 2, 3, 4)
 _FORTIFY_FN(fwrite) size_t fwrite(const void * _FORTIFY_POS0 __d, size_t __n,
                                   size_t __m, FILE *__f)
 {
@@ -104,7 +98,6 @@ _FORTIFY_FN(fwrite) size_t fwrite(const void * _FORTIFY_POS0 __d, size_t __n,
 __access(read_only, 1)
 __access(read_only, 2)
 __malloc(malloc (pclose, 1))
-__diagnose_as_builtin(__builtin_fwrite, 1, 2)
 _FORTIFY_FN(popen) FILE *popen(const char* _FORTIFY_POS0 __c, const char* _FORTIFY_POS0 __t)
 {
 	return __orig_popen(__c, __t);
@@ -122,7 +115,9 @@ _FORTIFY_FN(tmpfile) FILE *tmpfile(void)
 __access(read_write, 1, 2)
 __access(read_only, 3)
 __format(printf, 3, 0)
+#if __has_builtin(__builtin_vsnprintf)
 __diagnose_as_builtin(__builtin_vsnprintf, 1, 2, 3, 4)
+#endif
 _FORTIFY_FN(vsnprintf) int vsnprintf(char * _FORTIFY_POS0 __s, size_t __n,
                                      const char *__f, __builtin_va_list __v)
 {
@@ -136,7 +131,9 @@ _FORTIFY_FN(vsnprintf) int vsnprintf(char * _FORTIFY_POS0 __s, size_t __n,
 __format(printf, 2, 0)
 __access(read_write, 1)
 __access(read_only, 2)
+#if __has_builtin(__builtin_vsprintf)
 __diagnose_as_builtin(__builtin_vsprintf, 1, 2, 3)
+#endif
 _FORTIFY_FN(vsprintf) int vsprintf(char * _FORTIFY_POS0 __s, const char *__f,
                                    __builtin_va_list __v)
 {
-- 
cgit v1.3