From patchwork Thu Nov 21 16:52:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Adhemerval Zanella (Code Review)" X-Patchwork-Id: 1199042 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-107259-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gnutoolchain-gerrit.osci.io Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="Nz6itnhd"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47JlyM4GlMz9sRR for ; Fri, 22 Nov 2019 03:54:03 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:in-reply-to:references :reply-to:mime-version:content-transfer-encoding:content-type :message-id; q=dns; s=default; b=v6q9l7rDbe5O23wHfuvBkCovHskrbf3 Hh10zoIwNvMNufOQLjMuGbGSi6w5/+DIIQ3fFoCAb1KoQwaYnZ0wQ3r7Q4GpT88a HNzx3gFcusRK8HU03Tj8P/RlT2qz6Ezms1mUDkMKoOYM8/+Llk1pPv0dGzg1Nxkx ZkFPhPY3BKjU= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:in-reply-to:references :reply-to:mime-version:content-transfer-encoding:content-type :message-id; s=default; bh=8Mj/hw56PYbiHVmWUOmxxcFJdw4=; b=Nz6it nhdG1OVwPUCTA58o/xT1iuvCa/G21g2Z36SW3enfQZ3jsD7I3KouaXg1aJ5BW8h7 SuoCeBorVjZL67YwvLwVewezuNscJyM/VI/ZLr76HSuq3OzI/YyYVUA6yvBAAWiI Xo2Ei0bhrsDjKZ6PNZOCd9augscjtBBrStOwCQ= Received: (qmail 4288 invoked by alias); 21 Nov 2019 16:53:00 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 4182 invoked by uid 89); 21 Nov 2019 16:52:58 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT autolearn=ham version=3.3.1 spammy= X-HELO: mx1.osci.io X-Gerrit-PatchSet: 4 Date: Thu, 21 Nov 2019 11:52:48 -0500 From: =?utf-8?q?Emilio_Cobos_=C3=81lvarez_=28Code_Review=29?= To: Florian Weimer , Florian Weimer , libc-alpha@sourceware.org Auto-Submitted: auto-generated X-Gerrit-MessageType: newpatchset Subject: [review v4] Don't use a custom wrapper macro around __has_include (bug 25189). X-Gerrit-Change-Id: Id4b8ee19176a9e4624b533087ba870c418f27e60 X-Gerrit-Change-Number: 697 X-Gerrit-ChangeURL: X-Gerrit-Commit: 1c672ca24ac1d0cb95653a2aec5dcfdc95b098ac In-Reply-To: References: Reply-To: emilio@crisal.io, fweimer@redhat.com, libc-alpha@sourceware.org, fw@deneb.enyo.de MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/3.0.3-79-g83ff7f88f1 Message-Id: <20191121165249.388332816F@gnutoolchain-gerrit.osci.io> The original change was created by Florian Weimer. Change URL: https://gnutoolchain-gerrit.osci.io/r/c/glibc/+/697 ...................................................................... Don't use a custom wrapper macro around __has_include (bug 25189). This causes issues when using clang with -frewrite-includes to e.g., submit the translation unit to a distributed compiler. In my case, I was building Firefox using sccache. See [1] for a reduced test-case since I initially thought this was a clang bug, and [2] for more context. Apparently doing this is invalid C++ per [cpp.cond], which mentions [3]: > The #ifdef and #ifndef directives, and the defined conditional > inclusion operator, shall treat __has_include and __has_cpp_attribute > as if they were the names of defined macros. The identifiers > __has_include and __has_cpp_attribute shall not appear in any context > not mentioned in this subclause. [1]: https://bugs.llvm.org/show_bug.cgi?id=43982 [2]: https://bugs.llvm.org/show_bug.cgi?id=37990 [3]: http://eel.is/c++draft/cpp.cond#7.sentence-2 Change-Id: Id4b8ee19176a9e4624b533087ba870c418f27e60 --- M misc/sys/cdefs.h M sysdeps/unix/sysv/linux/bits/statx.h 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h index abcb0d5..467dbd9 100644 --- a/misc/sys/cdefs.h +++ b/misc/sys/cdefs.h @@ -412,14 +412,6 @@ # define __glibc_has_attribute(attr) 0 #endif -#ifdef __has_include -/* Do not use a function-like macro, so that __has_include can inhibit - macro expansion. */ -# define __glibc_has_include __has_include -#else -# define __glibc_has_include(header) 0 -#endif - #if (!defined _Noreturn \ && (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) < 201112 \ && !__GNUC_PREREQ (4,7)) diff --git a/sysdeps/unix/sysv/linux/bits/statx.h b/sysdeps/unix/sysv/linux/bits/statx.h index ff3f2e8..2015c82 100644 --- a/sysdeps/unix/sysv/linux/bits/statx.h +++ b/sysdeps/unix/sysv/linux/bits/statx.h @@ -26,11 +26,13 @@ /* 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 +#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