From 05fb05b49b62df87b76f35de9f1de1beaddb0515 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Tue, 22 Oct 2024 12:42:41 +0100 Subject: [PATCH] gutf8: Factor out ifunc attribute checks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It looks like these might get more complex in future, as compilers claim to support the attribute (`__has_attribute(ifunc)` is true) but then raise errors at compile time if the target architecture doesn’t support ifuncs. For example, see #3511. This doesn’t fix #3511 (I don’t have time to test on musl right now), but it should make it easier to update the platform preprocessor conditions in future. Signed-off-by: Philip Withnall Helps: #3511 --- glib/gutf8.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/glib/gutf8.c b/glib/gutf8.c index ba0a0e731..45a2801aa 100644 --- a/glib/gutf8.c +++ b/glib/gutf8.c @@ -42,6 +42,10 @@ #include "glibintl.h" #include "gvalgrind.h" +#if g_macro__has_attribute(ifunc) && !defined(G_OS_WIN32) +#define HAVE_WORKING_IFUNC_ATTRIBUTE 1 +#endif + #define UTF8_COMPUTE(Char, Mask, Len) \ if (Char < 128) \ { \ @@ -1841,7 +1845,7 @@ g_utf8_validate_native (const char *str, return *str == 0; } -#if g_macro__has_attribute(ifunc) && !defined(G_OS_WIN32) +#ifdef HAVE_WORKING_IFUNC_ATTRIBUTE /* The fast implementation of UTF-8 validation in `utf8_verify()` technically * uses undefined behaviour when the string length is not provided (i.e. when * it’s looking for a trailing nul terminator): when doing word-sized reads of @@ -1889,7 +1893,7 @@ static gboolean (*resolve_g_utf8_validate (void)) (const char *, gssize, const c else return g_utf8_validate_native; } -#endif +#endif /* HAVE_WORKING_IFUNC_ATTRIBUTE */ /** * g_utf8_validate: @@ -1924,7 +1928,7 @@ gboolean g_utf8_validate (const char *str, gssize max_len, const gchar **end) -#if g_macro__has_attribute(ifunc) && !defined(G_OS_WIN32) +#ifdef HAVE_WORKING_IFUNC_ATTRIBUTE __attribute__((ifunc ("resolve_g_utf8_validate"))); #else {