From patchwork Wed Oct 11 09:59:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yujie X-Patchwork-Id: 1846488 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S57YX4kXXz23jd for ; Wed, 11 Oct 2023 21:00:16 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CAD633857019 for ; Wed, 11 Oct 2023 10:00:13 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by sourceware.org (Postfix) with ESMTP id 3AF313858028 for ; Wed, 11 Oct 2023 09:59:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3AF313858028 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=loongson.cn Received: from loongson.cn (unknown [114.243.99.180]) by gateway (Coremail) with SMTP id _____8BxHOsdciZlFvswAA--.24093S3; Wed, 11 Oct 2023 17:59:57 +0800 (CST) Received: from localhost.localdomain (unknown [114.243.99.180]) by localhost.localdomain (Coremail) with SMTP id AQAAf8DxT90dciZl9jAgAA--.3225S2; Wed, 11 Oct 2023 17:59:57 +0800 (CST) From: Yang Yujie To: gcc-patches@gcc.gnu.org Cc: chenglulu@loongson.cn, xuchenghua@loongson.cn, jbglaw@lug-owl.de, xry111@xry111.site, richard.sandiford@arm.com, Yang Yujie Subject: [PATCH v2] LoongArch: Adjust makefile dependency for loongarch headers. Date: Wed, 11 Oct 2023 17:59:53 +0800 Message-ID: <20231011095953.3184215-1-yangyujie@loongson.cn> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-CM-TRANSID: AQAAf8DxT90dciZl9jAgAA--.3225S2 X-CM-SenderInfo: 51dqw5pxmlvqxorr0wxvrqhubq/ X-Coremail-Antispam: 1Uk129KBj93XoWxWr43Zr4DCF4rtry5Cw4rJFc_yoW5Xr4fpr 9xZrnxtr48GFn8Gr4DJ3sIqwn8Ar9rGr12gFyaq348Cr47Zr18Zw1kKr9rWF1DXw4DZrW2 qr1rGw1jvF1UJ3cCm3ZEXasCq-sJn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUUkYb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r106r15M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_JFI_Gr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Jr0_Gr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AK xVWxJr0_GcWle2I262IYc4CY6c8Ij28IcVAaY2xG8wAqjxCEc2xF0cIa020Ex4CE44I27w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE 14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF 04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7 CjxVAFwI0_Jr0_GrUvcSsGvfC2KfnxnUUI43ZEXa7IU8czVUUUUUU== X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_SHORT, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org gcc/ChangeLog: * config.gcc: Add loongarch-driver.h to tm_files. * config/loongarch/loongarch.h: Do not include loongarch-driver.h. * config/loongarch/t-loongarch: Append loongarch-multilib.h to $(GTM_H) instead of $(TM_H) for building generator programs. --- gcc/config.gcc | 4 ++-- gcc/config/loongarch/loongarch.h | 3 --- gcc/config/loongarch/t-loongarch | 3 ++- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/gcc/config.gcc b/gcc/config.gcc index ee46d96bf62..60f63b6c7d4 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -2524,7 +2524,7 @@ riscv*-*-freebsd*) loongarch*-*-linux*) tm_file="elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h ${tm_file}" - tm_file="${tm_file} loongarch/gnu-user.h loongarch/linux.h" + tm_file="${tm_file} loongarch/gnu-user.h loongarch/linux.h loongarch/loongarch-driver.h" extra_options="${extra_options} linux-android.opt" tmake_file="${tmake_file} loongarch/t-multilib loongarch/t-linux" gnu_ld=yes @@ -2537,7 +2537,7 @@ loongarch*-*-linux*) loongarch*-*-elf*) tm_file="elfos.h newlib-stdint.h ${tm_file}" - tm_file="${tm_file} loongarch/elf.h loongarch/linux.h" + tm_file="${tm_file} loongarch/elf.h loongarch/linux.h loongarch/loongarch-driver.h" tmake_file="${tmake_file} loongarch/t-multilib loongarch/t-linux" gnu_ld=yes gas=yes diff --git a/gcc/config/loongarch/loongarch.h b/gcc/config/loongarch/loongarch.h index d357e32e414..19a18fb5f1b 100644 --- a/gcc/config/loongarch/loongarch.h +++ b/gcc/config/loongarch/loongarch.h @@ -49,9 +49,6 @@ along with GCC; see the file COPYING3. If not see #define TARGET_LIBGCC_SDATA_SECTION ".sdata" -/* Driver native functions for SPEC processing in the GCC driver. */ -#include "loongarch-driver.h" - /* This definition replaces the formerly used 'm' constraint with a different constraint letter in order to avoid changing semantics of the 'm' constraint when accepting new address formats in diff --git a/gcc/config/loongarch/t-loongarch b/gcc/config/loongarch/t-loongarch index 9b06fa84bcc..667a6bb3b50 100644 --- a/gcc/config/loongarch/t-loongarch +++ b/gcc/config/loongarch/t-loongarch @@ -16,7 +16,8 @@ # along with GCC; see the file COPYING3. If not see # . -TM_H += loongarch-multilib.h $(srcdir)/config/loongarch/loongarch-driver.h + +GTM_H += loongarch-multilib.h OPTIONS_H_EXTRA += $(srcdir)/config/loongarch/loongarch-def.h \ $(srcdir)/config/loongarch/loongarch-tune.h