From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by sourceware.org (Postfix) with ESMTPS id 629003858D1E for ; Tue, 2 May 2023 12:22:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 629003858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-3023a56048bso3458364f8f.3 for ; Tue, 02 May 2023 05:22:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683030120; x=1685622120; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=S/2HqpDd227vsSOIHw1gEwmbthP4RuC/1RcMDqeEBD0=; b=BEbOaVTyVmlcarvW1ywDPUlMuhIkYtOSQaFOLXAiomoYZokh7Ds5xpV9jYC1KEdZVb M/wvuogJOf4Gm/rMNKDULHB//bZe3Xa0wzYMnw+ytfLNONJk4macYhsNIVONkkD1IGPT nedj8rpJ8wc1OMbdP20zH/aDrYhP0Kg0lMhFTCumpkK70vfUmcm6eVLYp/fhizQhYOYz KsSMHxdqFcBuZct68BiFU3DA0H41j87MIRWG+pQFToyCLHX9XLoXv8U/0Bfvcg7PZy/U YCgIV8Fwbi3qdu0b2Kd5beNp1F9QLNlS1GJR3iKz+djrFpjPZMZejjiwY54BN9dlZZpf o+yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683030120; x=1685622120; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=S/2HqpDd227vsSOIHw1gEwmbthP4RuC/1RcMDqeEBD0=; b=NQwkTQPyOgZkeLvS4ec/+lNtdL5XbEITGah/JgZ3k9sCLIoL8D+obZkDvd815N2Jto myevyIrXInRwgBm6NKA9NICSMLZPG+9MKEdwD7r59p6sE+aDnLAZF6+MAbUSOgaDy5J+ OBoJN0xkDd2oMM6xYDj7AvH49YtrXoXyeSdkYqUV6r4x+7sT5aUqHphGG9xDNaEURQbL 1FjLOIzCpfH2LrD9WtDZUJvJte5zenchfUGEU1P/7VvvTTme9DOMBu5Lb1pg7hcBhYkX vMnaE79uLEryDKj9y2WCfCR62jymnOqtyoBBsQEDhx3Nbm8U44h8Ug8jJHwNQ0ctYih7 fh5Q== X-Gm-Message-State: AC+VfDxL0PQwhXNqOSKAN5XEYv7b9FBJDatA2JvR6T/C2fsOADpG1/lC Y0NgJuXGtxyReOU2UNIQydQXrQSvsDg= X-Google-Smtp-Source: ACHHUZ5ogOfuq49O/DyxhAuodVgYWTyovL/GKKuvuxAoTbVa2EMwOO0KjPmy4YAgEuAxCC46udQrWQ== X-Received: by 2002:a5d:4b4f:0:b0:306:31b7:abed with SMTP id w15-20020a5d4b4f000000b0030631b7abedmr3252771wrs.59.1683030119908; Tue, 02 May 2023 05:21:59 -0700 (PDT) Received: from P-NTS-Evian.home (2a01cb05945b7e009bdc688723a24f31.ipv6.abo.wanadoo.fr. [2a01:cb05:945b:7e00:9bdc:6887:23a2:4f31]) by smtp.gmail.com with ESMTPSA id w12-20020adff9cc000000b0030635f6949fsm2159302wrr.103.2023.05.02.05.21.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 May 2023 05:21:59 -0700 (PDT) From: Romain Naour To: gcc-patches@gcc.gnu.org Cc: kito.cheng@sifive.com, juzhe.zhong@rivai.ai, Romain Naour Subject: [PATCH] RISC-V: fix build issue with gcc 4.9.x Date: Tue, 2 May 2023 14:21:55 +0200 Message-Id: <20230502122155.2576725-1-romain.naour@gmail.com> X-Mailer: git-send-email 2.34.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: GCC should still build with GCC 4.8.3 or newer [1] using C++03 by default. But a recent change in RISC-V port introduced a C++11 feature "std::log2" [2]. Use log2 from the C header, without the namespace [3]. [1] https://gcc.gnu.org/install/prerequisites.html [2] https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=7caa1ae5e451e780fbc4746a54e3f19d4f4304dc [3] https://stackoverflow.com/questions/26733413/error-log2-is-not-a-member-of-std Fixes: https://gitlab.com/buildroot.org/toolchains-builder/-/jobs/4202276589 gcc/ChangeLog: * config/riscv/genrvv-type-indexer.cc: Use log2 from the C header, without the namespace. Signed-off-by: Romain Naour --- gcc/config/riscv/genrvv-type-indexer.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc/config/riscv/genrvv-type-indexer.cc b/gcc/config/riscv/genrvv-type-indexer.cc index e677b55290c..eebe382d1c3 100644 --- a/gcc/config/riscv/genrvv-type-indexer.cc +++ b/gcc/config/riscv/genrvv-type-indexer.cc @@ -115,9 +115,9 @@ same_ratio_eew_type (unsigned sew, int lmul_log2, unsigned eew, bool unsigned_p, if (sew == eew) elmul_log2 = lmul_log2; else if (sew > eew) - elmul_log2 = lmul_log2 - std::log2 (sew / eew); + elmul_log2 = lmul_log2 - log2 (sew / eew); else /* sew < eew */ - elmul_log2 = lmul_log2 + std::log2 (eew / sew); + elmul_log2 = lmul_log2 + log2 (eew / sew); if (float_p) return floattype (eew, elmul_log2); -- 2.34.3