[glibc/azanella/clang] alloc_buffer: Apply asm redirection before first use

[glibc/azanella/clang] alloc_buffer: Apply asm redirection before first use

[Adhemerval Zanella]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=51f48cd64298cf9c6368e9994364f38f210597b3

commit 51f48cd64298cf9c6368e9994364f38f210597b3
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date:   Fri Mar 11 15:37:57 2022 -0300

    alloc_buffer: Apply asm redirection before first use
    
    Compilers may not be able to apply asm redirections to functions after
    these functions are used for the first time, e.g. clang 13.

Diff:
---
 include/alloc_buffer.h | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/include/alloc_buffer.h b/include/alloc_buffer.h
index 1c1dbe0a46..553de607e8 100644
--- a/include/alloc_buffer.h
+++ b/include/alloc_buffer.h
@@ -114,6 +114,9 @@ enum
 
 /* Internal function.  Terminate the process using __libc_fatal.  */
 void __libc_alloc_buffer_create_failure (void *start, size_t size);
+#ifndef _ISOMAC
+libc_hidden_proto (__libc_alloc_buffer_create_failure)
+#endif
 
 /* Create a new allocation buffer.  The byte range from START to START
    + SIZE - 1 must be valid, and the allocation buffer allocates
@@ -132,6 +135,9 @@ alloc_buffer_create (void *start, size_t size)
 /* Internal function.  See alloc_buffer_allocate below.  */
 struct alloc_buffer __libc_alloc_buffer_allocate (size_t size, void **pptr)
   __attribute__ ((nonnull (2)));
+#ifndef _ISOMAC
+libc_hidden_proto (__libc_alloc_buffer_allocate)
+#endif
 
 /* Allocate a buffer of SIZE bytes using malloc.  The returned buffer
    is in a failed state if malloc fails.  *PPTR points to the start of
@@ -333,6 +339,9 @@ void * __libc_alloc_buffer_alloc_array (struct alloc_buffer *buf,
 					size_t size, size_t align,
 					size_t count)
   __attribute__ ((nonnull (1)));
+#ifndef _ISOMAC
+libc_hidden_proto (__libc_alloc_buffer_alloc_array)
+#endif
 
 /* Obtain a TYPE * pointer to an array of COUNT objects in BUF of
    TYPE.  Consume these bytes from the buffer.  Return NULL and mark
@@ -349,6 +358,9 @@ void * __libc_alloc_buffer_alloc_array (struct alloc_buffer *buf,
 struct alloc_buffer __libc_alloc_buffer_copy_bytes (struct alloc_buffer,
 						    const void *, size_t)
   __attribute__ ((nonnull (2)));
+#ifndef _ISOMAC
+libc_hidden_proto (__libc_alloc_buffer_copy_bytes)
+#endif
 
 /* Copy SIZE bytes starting at SRC into the buffer.  If there is not
    enough room in the buffer, the buffer is marked as failed.  No
@@ -363,6 +375,9 @@ alloc_buffer_copy_bytes (struct alloc_buffer *buf, const void *src, size_t size)
 struct alloc_buffer __libc_alloc_buffer_copy_string (struct alloc_buffer,
 						     const char *)
   __attribute__ ((nonnull (2)));
+#ifndef _ISOMAC
+libc_hidden_proto (__libc_alloc_buffer_copy_string)
+#endif
 
 /* Copy the string at SRC into the buffer, including its null
    terminator.  If there is not enough room in the buffer, the buffer
@@ -377,12 +392,4 @@ alloc_buffer_copy_string (struct alloc_buffer *buf, const char *src)
   return result;
 }
 
-#ifndef _ISOMAC
-libc_hidden_proto (__libc_alloc_buffer_alloc_array)
-libc_hidden_proto (__libc_alloc_buffer_allocate)
-libc_hidden_proto (__libc_alloc_buffer_copy_bytes)
-libc_hidden_proto (__libc_alloc_buffer_copy_string)
-libc_hidden_proto (__libc_alloc_buffer_create_failure)
-#endif
-
 #endif /* _ALLOC_BUFFER_H */