From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 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 dcvr.yhbt.net (Postfix) with ESMTPS id DBCA61F4B5 for ; Tue, 12 Nov 2019 18:32:14 +0000 (UTC) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-type:content-transfer-encoding; q=dns; s= default; b=rRCfjvJ3RHPZp0JD9bRLsO5aMHGqOHDN2dntZrU7EmXXDLvBf+zYm 3jgJFZ9p1TI2Jr28GX8oxcKd32bXB9D06oDvPAgyliey1NSAdDE4tn4G+nBDhpj4 h8KHCWoNSkDzSAsUxzf0qCl68+hOLOcELUtFORL2P0puRKlv19+yuQ= 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:from:to:cc:subject:date:message-id :mime-version:content-type:content-transfer-encoding; s=default; bh=eAFqN0yVOr3GvPzxjgUX8i4t7aw=; b=pYCq/6yODtJLn+LSpP1aETEh0dJq T4NUsUZN8hp/BZdhEkKS6r31ToStNTKbKyLKHraP+p+ORH/gPNSNOKZFbS17S3GO B89mGHLb4D1Ipx9WqEpAO+fA3mWmqLSMdKig8iDzUglQK2iwaKOABuzV31n64Epa 4XV9FtVIvILkLXc= Received: (qmail 119261 invoked by alias); 12 Nov 2019 18:32:12 -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 Received: (qmail 119253 invoked by uid 89); 12 Nov 2019 18:32:12 -0000 Authentication-Results: sourceware.org; auth=none X-HELO: emiliocobos.net From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Authentication-Results: mail.emiliocobos.net; dmarc=none (p=none dis=none) header.from=crisal.io To: libc-alpha@sourceware.org Cc: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Subject: [PATCH] libc: Don't use a custom wrapper macro around __has_include. Date: Tue, 12 Nov 2019 19:31:15 +0100 Message-Id: <20191112183115.2048865-1-emilio@crisal.io> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 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 (See https://bugs.llvm.org/show_bug.cgi?id=37990) Signed-off-by: Emilio Cobos Álvarez --- misc/sys/cdefs.h | 8 -------- sysdeps/unix/sysv/linux/bits/statx.h | 14 ++++++++------ 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h index abcb0d5e3c..467dbd9547 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 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 #include -- 2.24.0