076f82
commit 14770f3e0462721b317f138197e1fbf4db542c94
076f82
Author: Sergei Trofimovich <slyich@gmail.com>
076f82
Date:   Mon May 23 13:56:43 2022 +0530
076f82
076f82
    string.h: fix __fortified_attr_access macro call [BZ #29162]
076f82
    
076f82
    commit e938c0274 "Don't add access size hints to fortifiable functions"
076f82
    converted a few '__attr_access ((...))' into '__fortified_attr_access (...)'
076f82
    calls.
076f82
    
076f82
    But one of conversions had double parentheses of '__fortified_attr_access (...)'.
076f82
    
076f82
    Noticed as a gnat6 build failure:
076f82
    
076f82
        /<<NIX>>-glibc-2.34-210-dev/include/bits/string_fortified.h:110:50: error: macro "__fortified_attr_access" requires 3 arguments, but only 1 given
076f82
    
076f82
    The change fixes parentheses.
076f82
    
076f82
    This is seen when using compilers that do not support
076f82
    __builtin___stpncpy_chk, e.g. gcc older than 4.7, clang older than 2.6
076f82
    or some compiler not derived from gcc or clang.
076f82
    
076f82
    Signed-off-by: Sergei Trofimovich <slyich@gmail.com>
076f82
    Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
076f82
    (cherry picked from commit 5a5f94af0542f9a35aaa7992c18eb4e2403a29b9)
076f82
076f82
diff --git a/string/bits/string_fortified.h b/string/bits/string_fortified.h
076f82
index 218006c9ba882d9c..4e66e0bd1ebb572a 100644
076f82
--- a/string/bits/string_fortified.h
076f82
+++ b/string/bits/string_fortified.h
076f82
@@ -107,7 +107,7 @@ __NTH (stpncpy (char *__dest, const char *__src, size_t __n))
076f82
 # else
076f82
 extern char *__stpncpy_chk (char *__dest, const char *__src, size_t __n,
076f82
 			    size_t __destlen) __THROW
076f82
-  __fortified_attr_access ((__write_only__, 1, 3))
076f82
+  __fortified_attr_access (__write_only__, 1, 3)
076f82
   __attr_access ((__read_only__, 2));
076f82
 extern char *__REDIRECT_NTH (__stpncpy_alias, (char *__dest, const char *__src,
076f82
 					       size_t __n), stpncpy);