From patchwork Sat Jul 25 22:06:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1336347 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=IZi0KNAb; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BDgCT3GkSz9sRK for ; Sun, 26 Jul 2020 08:07:01 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 4ED3D2052F; Sat, 25 Jul 2020 22:06:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4NLIJGjiaaPm; Sat, 25 Jul 2020 22:06:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id F2AB220785; Sat, 25 Jul 2020 22:06:56 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id E93791BF2AF for ; Sat, 25 Jul 2020 22:06:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id E5D9087D57 for ; Sat, 25 Jul 2020 22:06:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qDNAcdNQKDok for ; Sat, 25 Jul 2020 22:06:52 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id C53DF87C70 for ; Sat, 25 Jul 2020 22:06:51 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id x5so10286336wmi.2 for ; Sat, 25 Jul 2020 15:06:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h5G8RDPhIcO5yb6fEhQATwGEFy6e/i02pqcgQUx4Ueg=; b=IZi0KNAb5ghAd/pQ9MW7o7whpWJobF9AY7CQsCRqDJMb5RKzH6/QnrLkApD2ocIivj imhR30AlV89b/TKVbkwK+R9Y/EYX6Wv1ZANJT+uLkEQC4KEde05jTC2msntMfrX7B+ub JwEu8odHg4JlZ8Qrr4SV/SeHy2n2eubg0eO4mNLpYNyPWGKMA8GmjKN6eyUx48qILz7C pNq6F40xqf63DPaBtn84Srsm052MABLsNFa3XLrKXjIvIIcS1Lsk/rj8t37GdIpAVgw0 PI4o7pxwLD6viR8pBuKWJCMbX2JFb0LZKlaVxPnuiVw380GQT7zgsuPnUXKiyZ7G/SRB t0wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=h5G8RDPhIcO5yb6fEhQATwGEFy6e/i02pqcgQUx4Ueg=; b=DRqJQ4r0ydRKAvCCmPGc7wwlyVsFUheAm5CRKSbi7TtZPzK9rt0Md3ZvW8OPGoDTlN WV+wQgiI4thCqYaoYEeiDwSDFmsAdW3Y5kGz50QpzUg1BPsBh1TMkDerdmp2o10jHtba jkXYsx7aTii2tjSEavxmiuY3Z1AAVgYGOUigG60+eL9Xg3acSdXWQ7A0NA1bw/hLcwQ2 qjwmHR/6gkM+EGVMH05MmumxGqn9Nf6fZb+WkWmxtdr3rJ+VuYBhzWybZa5dGZZ5aRBN N+otobxw8GF2Is+p72bdM1wwPJampjbmeC5nq+VFkTxEdNREeD3hnRJ2kM1mh3PrwGWf 1Q5w== X-Gm-Message-State: AOAM531YwCEYp2aKwOi3ydf41EKldNzOs/Eftgqcyp8XvRrVLFUqsf80 3tQ0pWpeD/AiT20dNe/rdhXXVIjO X-Google-Smtp-Source: ABdhPJxzUSwyb5T/zl+jd+V6ZE4hrQlei9AWTbNhL9BUf+TYmi56tY+Z4aCMjRhFcgbY5ym6R5f40A== X-Received: by 2002:a7b:cb8d:: with SMTP id m13mr13441530wmi.120.1595714806918; Sat, 25 Jul 2020 15:06:46 -0700 (PDT) Received: from localhost.localdomain (2a01cb058f8a18003dbee9eed79eb521.ipv6.abo.wanadoo.fr. [2a01:cb05:8f8a:1800:3dbe:e9ee:d79e:b521]) by smtp.gmail.com with ESMTPSA id q2sm2497316wro.8.2020.07.25.15.06.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Jul 2020 15:06:46 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Sun, 26 Jul 2020 00:06:41 +0200 Message-Id: <20200725220641.1370957-3-romain.naour@gmail.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200725220641.1370957-1-romain.naour@gmail.com> References: <20200725220641.1370957-1-romain.naour@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 3/3] package/glibc: use __has_include instead of __has_include__ X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour , Alistair Francis Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Backport upstream commit to use __has_include: https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=28dd3939221ab26c6774097e9596e30d9753f758 Otherwise glibc fail to build with gcc 10: warning: "__has_include__" is not defined, evaluates to 0 [-Wundef] ../sysdeps/unix/sysv/linux/riscv/flush-icache.c:24:21: error: missing binary operator before token "(" 24 | #if __has_include__ () | ^ Fixes: https://gitlab.com/kubu93/buildroot/-/jobs/655618374 Signed-off-by: Romain Naour Cc: Alistair Francis --- ...001-riscv-Do-not-use-__has_include__.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/glibc/06983fe52cfe8e4779035c27e8cc5d2caab31531/0001-riscv-Do-not-use-__has_include__.patch diff --git a/package/glibc/06983fe52cfe8e4779035c27e8cc5d2caab31531/0001-riscv-Do-not-use-__has_include__.patch b/package/glibc/06983fe52cfe8e4779035c27e8cc5d2caab31531/0001-riscv-Do-not-use-__has_include__.patch new file mode 100644 index 0000000000..93159e9a7b --- /dev/null +++ b/package/glibc/06983fe52cfe8e4779035c27e8cc5d2caab31531/0001-riscv-Do-not-use-__has_include__.patch @@ -0,0 +1,28 @@ +From 28dd3939221ab26c6774097e9596e30d9753f758 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Thu, 6 Jun 2019 11:24:32 +0200 +Subject: [PATCH] riscv: Do not use __has_include__ + +The user-visible preprocessor construct is called __has_include. + +Signed-off-by: Romain Naour +--- + sysdeps/unix/sysv/linux/riscv/flush-icache.c | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/sysdeps/unix/sysv/linux/riscv/flush-icache.c b/sysdeps/unix/sysv/linux/riscv/flush-icache.c +index cd5c400977..f2dfcc50d0 100644 +--- a/sysdeps/unix/sysv/linux/riscv/flush-icache.c ++++ b/sysdeps/unix/sysv/linux/riscv/flush-icache.c +@@ -21,7 +21,7 @@ + #include + #include + #include +-#if __has_include__ () ++#if __has_include () + # include + #else + # include +-- +2.25.4 +