From 48c3c1238925410b4e777dc94e2fde4cc9132d44 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 14 Jun 2019 16:28:41 +0200 Subject: [PATCH] Linux: Fix __glibc_has_include use for and statx The identifier linux is used as a predefined macro, so the actually used path is 1/stat.h or 1/stat64.h. Using the quote-based version triggers a file lookup for /usr/include/bits/linux/stat.h (or whatever directory is used to store bits/statx.h), but since bits/ is pretty much reserved by glibc, this appears to be acceptable. This is related to GCC PR 80005: incorrect macro expansion of the argument of __has_include. Suggested by Zack Weinberg. Reviewed-by: Carlos O'Donell --- ChangeLog | 5 +++++ sysdeps/unix/sysv/linux/bits/statx.h | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4aae5e74f79..efd86e05ede 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2019-06-14 Florian Weimer + + * sysdeps/unix/sysv/linux/bits/statx.h: Use string literal in + argument to __glibc_has_include to inhibit macro expansion. + 2019-06-14 Florian Weimer * misc/sys/cdefs.h (__glibc_has_include): Do not use a diff --git a/sysdeps/unix/sysv/linux/bits/statx.h b/sysdeps/unix/sysv/linux/bits/statx.h index d36f44efc60..206878723fd 100644 --- a/sysdeps/unix/sysv/linux/bits/statx.h +++ b/sysdeps/unix/sysv/linux/bits/statx.h @@ -23,8 +23,11 @@ #endif /* Use the Linux kernel header if available. */ -#if __glibc_has_include () -# include + +/* Use "" to work around incorrect macro expansion of the + __has_include argument (GCC PR 80005). */ +#if __glibc_has_include ("linux/stat.h") +# include "linux/stat.h" # ifdef STATX_TYPE # define __statx_timestamp_defined 1 # define __statx_defined 1 -- 2.39.2