From 3e6704d0be707487d7a9dccfdc75203c7261e11b Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Sat, 18 Mar 2023 14:01:02 +0100
Subject: Make use of __builtin_dynamic_object_size

GCC and Clang provide __builtin_dynamic_object_size
(see documentation: https://gcc.gnu.org/onlinedocs/gcc/Object-Size-Checking.html),
so we should make use of it when its available.
---
 include/strings.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'include/strings.h')

diff --git a/include/strings.h b/include/strings.h
index a16e1ad..7645848 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -32,8 +32,8 @@ extern "C" {
 #undef bzero
 _FORTIFY_FN(bcopy) void bcopy(const void *__s, void *__d, size_t __n)
 {
-	size_t __bd = __builtin_object_size(__d, 0);
-	size_t __bs = __builtin_object_size(__s, 0);
+	size_t __bd = __bos(__d, 0);
+	size_t __bs = __bos(__s, 0);
 
 	if (__n > __bd || __n > __bs)
 		__builtin_trap();
@@ -42,7 +42,7 @@ _FORTIFY_FN(bcopy) void bcopy(const void *__s, void *__d, size_t __n)
 
 _FORTIFY_FN(bzero) void bzero(void *__s, size_t __n)
 {
-	size_t __b = __builtin_object_size(__s, 0);
+	size_t __b = __bos(__s, 0);
 
 	if (__n > __b)
 		__builtin_trap();
-- 
cgit v1.3