From: Florian Weimer <fweimer@redhat.com>
To: "Emilio Cobos Álvarez" <emilio@crisal.io>
Cc: libc-alpha@sourceware.org
Subject: Re: [PATCH] libc: Don't use a custom wrapper macro around __has_include.
Date: Thu, 21 Nov 2019 14:00:26 +0100 [thread overview]
Message-ID: <875zjdo045.fsf@oldenburg2.str.redhat.com> (raw)
In-Reply-To: <20191112183115.2048865-1-emilio@crisal.io> ("Emilio Cobos \=\?utf-8\?Q\?\=C3\=81lvarez\=22's\?\= message of "Tue, 12 Nov 2019 19:31:15 +0100")
* Emilio Cobos Álvarez:
> This causes issues when using clang with -frewrite-includes to e.g., submit the
> translation unit to a distributed compiler.
Thanks for the patch. The substance of the patch is okay. I would
prefer if you could repost it with the minor issues mentioned below
addressed, then I can push it on your behalf.
I've tried to push this into Gerrit, but we can't Cc: people who do not
have accounts in the tool. Not your fault. We can continue on the
mailing list.
> In my case, I was building Firefox using sccache.
>
> See https://bugs.llvm.org/show_bug.cgi?id=43982 for a reduced test-case since I
> initially thought this was a clang bug.
>
> Apparently doing this is invalid C++ per:
>
> * http://eel.is/c++draft/cpp.cond#7.sentence-2
I think it's probably better to quote the actual language in the
standard.
> (See https://bugs.llvm.org/show_bug.cgi?id=37990)
>
> Signed-off-by: Emilio Cobos Álvarez <emilio@crisal.io>
We do not use Signed-off-by, but copyright assignments, but we have been
advised that this is not necessary for changes of this size.
> diff --git a/sysdeps/unix/sysv/linux/bits/statx.h b/sysdeps/unix/sysv/linux/bits/statx.h
> index ff3f2e8973..14d5992226 100644
> --- a/sysdeps/unix/sysv/linux/bits/statx.h
> +++ b/sysdeps/unix/sysv/linux/bits/statx.h
> @@ -26,12 +26,14 @@
>
> /* 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
> -# endif
> +#ifdef __has_include
> +# if __has_include("linux/stat.h")
> +# include "linux/stat.h"
> +# ifdef STATX_TYPE
> +# define __statx_timestamp_defined 1
> +# define __statx_defined 1
> +# endif
> +# endif
> #endif
The indentation is slight off here, I think. Each nested conditional
adds one space after the #. Please also include a space after
__has_include.
Thanks,
Florian
next prev parent reply other threads:[~2019-11-21 13:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-12 18:31 [PATCH] libc: Don't use a custom wrapper macro around __has_include Emilio Cobos Álvarez
2019-11-21 13:00 ` Florian Weimer [this message]
2019-11-21 13:21 ` [PATCH v2] " Emilio Cobos Álvarez
2019-11-21 13:28 ` [PATCH] " Emilio Cobos Álvarez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=875zjdo045.fsf@oldenburg2.str.redhat.com \
--to=fweimer@redhat.com \
--cc=emilio@crisal.io \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).