Commit 96980b83 authored by Willy Tarreau's avatar Willy Tarreau Committed by Paul E. McKenney

tools/nolibc/string: do not use __builtin_strlen() at -O0

clang wants to use strlen() for __builtin_strlen() at -O0. We don't
really care about -O0 but it at least ought to build, so let's make
sure we don't choke on this, by dropping the optimizationn for
constant strings in this case.
Signed-off-by: default avatarWilly Tarreau <w@1wt.eu>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent 0b37dff1
......@@ -122,7 +122,9 @@ char *strcpy(char *dst, const char *src)
return ret;
}
/* this function is only used with arguments that are not constants */
/* this function is only used with arguments that are not constants or when
* it's not known because optimizations are disabled.
*/
static __attribute__((unused))
size_t nolibc_strlen(const char *str)
{
......@@ -132,11 +134,18 @@ size_t nolibc_strlen(const char *str)
return len;
}
/* do not trust __builtin_constant_p() at -O0, as clang will emit a test and
* the two branches, then will rely on an external definition of strlen().
*/
#if defined(__OPTIMIZE__)
#define strlen(str) ({ \
__builtin_constant_p((str)) ? \
__builtin_strlen((str)) : \
nolibc_strlen((str)); \
})
#else
#define strlen(str) nolibc_strlen((str))
#endif
static __attribute__((unused))
size_t strlcat(char *dst, const char *src, size_t size)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment