Received: by 2002:a05:6358:45e:b0:b5:b6eb:e1f9 with SMTP id 30csp3159411rwe; Mon, 29 Aug 2022 06:53:29 -0700 (PDT) X-Google-Smtp-Source: AA6agR6gSV97YoiLJ7Tt0VgvAMixvkhL+bC/2ssMs1f/e9CVePcBurKt5hWXHVVSdXoAuCt1Mjtm X-Received: by 2002:a17:90a:f2cb:b0:1fd:90a0:56e3 with SMTP id gt11-20020a17090af2cb00b001fd90a056e3mr11557378pjb.113.1661781209685; Mon, 29 Aug 2022 06:53:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661781209; cv=none; d=google.com; s=arc-20160816; b=GHqpqif+QpepBE5umk6TjF6uFNJINb5CZI4CmJJtKmVYQ3JgLheNVPWIKPDufcdf8x NAM8Rn8wP3Sajtiu+j6Pqhjdg2wdjPPvNDspAjtlvHQmtJ7A4UWYIQ7Cf6LM305dVW04 8aIIz2xanKfWRxRcNXgU8Nt3V84/jMuuX9C5kmVKV+sTTQrRIItVvLWM/Z8zgg9GT/f8 PEiVRZE4ZkL8G4gOBpS8b9Fq2ZXG83CoXi6pG/qpXzd6XTlnYqEvOLp3484p1FtLw7tt 5Y74oXX6VI98rMaPE1RYjVK/pwhercVuWdgU1/fce5pxTTQ3TiO9bbfZlA9k1F9oktED /U+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=r7LMss/wIp0qvUujkXyNAJmzNcCSjVi1/JkHEUDwrKc=; b=D+WC/LQqjUiIvmcmfCNJZIxnXcWFdNyAUH1wBDqOX81KMqNiTQH4Lq7disJNECcCy5 vOk3v5IQRAYVb3eSIZfGjSnABVbRUaOaQsiY2Nk0g5sOnHpwZnPuzsJnYUmHYsD5SmyA embuR31dg05APIB6FjH8cC2KohbEVoiFifB8PvsSeqQCw5WE9RiW2EKEti+gYdR2oo3+ fzZA2t6WGDK5FdH8qPyFcn3y1rG+r4HzM/evePwN5kmNcMzmGqBu6+MFkBydtQIP0kEz xxPFAUrzE3PZSCQgMzd3eRLMrjxWkibONkmp7l1MOdKWebR9nabrM9LPhZUmBA7Y7EJX M9nQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@xry111.site header.s=default header.b="g/JelLMD"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=xry111.site Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t29-20020a056a00139d00b005363ccd9195si9915752pfg.264.2022.08.29.06.53.18; Mon, 29 Aug 2022 06:53:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@xry111.site header.s=default header.b="g/JelLMD"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=xry111.site Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229845AbiH2NfN (ORCPT + 99 others); Mon, 29 Aug 2022 09:35:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229827AbiH2NfK (ORCPT ); Mon, 29 Aug 2022 09:35:10 -0400 Received: from xry111.site (xry111.site [89.208.246.23]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7834F24081 for ; Mon, 29 Aug 2022 06:35:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=xry111.site; s=default; t=1661780108; bh=kTsk985O1vybSmvpjcdvVMIIa8361S7JA67NI5+R/ZA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g/JelLMDgQRXrAiP8mZoOABhFjUQAeubwe+WJazxHrnVrpLcNr4bwmH4m5cU0V3K2 ATqCp04y959YlUbxWF+wTeCPEgZrRcesVJZjUayTeIgpebrqQA7R2aaybkPcewgHCm fh6mEh8YuEerzHNvn/xOx1G4hG1UlExZTkqWjsws= Received: from xry111-x57s1.. (unknown [IPv6:240e:358:11dd:1900:dc73:854d:832e:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) (Authenticated sender: xry111@xry111.site) by xry111.site (Postfix) with ESMTPSA id 6BB3466904; Mon, 29 Aug 2022 09:35:02 -0400 (EDT) From: Xi Ruoyao To: loongarch@lists.linux.dev Cc: linux-kernel@vger.kernel.org, WANG Xuerui , Huacai Chen , Youling Tang , Jinyang He , Xi Ruoyao Subject: [PATCH v6 2/6] LoongArch: Adjust CFLAGS for CONFIG_AS_HAS_EXPLICIT_RELOCS Date: Mon, 29 Aug 2022 21:31:42 +0800 Message-Id: <20220829133146.15236-3-xry111@xry111.site> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220829133146.15236-1-xry111@xry111.site> References: <20220829133146.15236-1-xry111@xry111.site> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FROM_SUSPICIOUS_NTLD, PDS_OTHER_BAD_TLD,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If explicit relocation hints is used by the toolchain, -Wa,-mla-* options will be useless for C code. Only use them for !CONFIG_AS_HAS_EXPLICIT_RELOCS. Replace "la" with "la.pcrel" in head.S to keep the semantic consistent with new and old toolchains for the low level startup code. Remove -fplt because it's the default for all known LoongArch C compilers. The behavior with different assemblers and compilers are summarized in the following table: AS has CC has explicit reloc explicit reloc Behavior ============================================================== No No Use la.* macros. No change from Linux 6.0. -------------------------------------------------------------- No Yes Disable explicit reloc. No change from Linux 6.0. -------------------------------------------------------------- Yes No Not supported. -------------------------------------------------------------- Yes Yes Use explicit relocs. No -Wa,-mla* options. ============================================================== Signed-off-by: Xi Ruoyao --- arch/loongarch/Makefile | 19 ++++++++++++++++++- arch/loongarch/kernel/head.S | 10 +++++----- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/arch/loongarch/Makefile b/arch/loongarch/Makefile index 7051a95f7f31..1563747c4fa8 100644 --- a/arch/loongarch/Makefile +++ b/arch/loongarch/Makefile @@ -40,10 +40,27 @@ endif cflags-y += -G0 -pipe -msoft-float LDFLAGS_vmlinux += -G0 -static -n -nostdlib + +# When the assembler supports explicit relocation hint, we must use it. +# GCC may have -mexplicit-relocs off by default if it was built with an old +# assembler, so we force it via an option. +# +# When the assembler does not supports explicit relocation hint, we can't use +# it. Disable it if the compiler supports it. +# +# If you've seen "unknown reloc hint" message building the kernel and you are +# now wondering why "-mexplicit-relocs" is not wrapped with cc-option: the +# combination of a "new" assembler and "old" compiler is not supported. Either +# upgrade the compiler or downgrade the assembler. +ifdef CONFIG_AS_HAS_EXPLICIT_RELOCS +cflags-y += -mexplicit-relocs +else +cflags-y += $(call cc-option,-mno-explicit-relocs) KBUILD_AFLAGS_KERNEL += -Wa,-mla-global-with-pcrel KBUILD_CFLAGS_KERNEL += -Wa,-mla-global-with-pcrel KBUILD_AFLAGS_MODULE += -Wa,-mla-global-with-abs -KBUILD_CFLAGS_MODULE += -fplt -Wa,-mla-global-with-abs,-mla-local-with-abs +KBUILD_CFLAGS_MODULE += -Wa,-mla-global-with-abs,-mla-local-with-abs +endif cflags-y += -ffreestanding cflags-y += $(call cc-option, -mno-check-zero-division) diff --git a/arch/loongarch/kernel/head.S b/arch/loongarch/kernel/head.S index 01bac62a6442..eb3f641d5915 100644 --- a/arch/loongarch/kernel/head.S +++ b/arch/loongarch/kernel/head.S @@ -55,17 +55,17 @@ SYM_CODE_START(kernel_entry) # kernel entry point li.w t0, 0x00 # FPE=0, SXE=0, ASXE=0, BTE=0 csrwr t0, LOONGARCH_CSR_EUEN - la t0, __bss_start # clear .bss + la.pcrel t0, __bss_start # clear .bss st.d zero, t0, 0 - la t1, __bss_stop - LONGSIZE + la.pcrel t1, __bss_stop - LONGSIZE 1: addi.d t0, t0, LONGSIZE st.d zero, t0, 0 bne t0, t1, 1b - la t0, fw_arg0 + la.pcrel t0, fw_arg0 st.d a0, t0, 0 # firmware arguments - la t0, fw_arg1 + la.pcrel t0, fw_arg1 st.d a1, t0, 0 /* KSave3 used for percpu base, initialized as 0 */ @@ -73,7 +73,7 @@ SYM_CODE_START(kernel_entry) # kernel entry point /* GPR21 used for percpu base (runtime), initialized as 0 */ move u0, zero - la tp, init_thread_union + la.pcrel tp, init_thread_union /* Set the SP after an empty pt_regs. */ PTR_LI sp, (_THREAD_SIZE - 32 - PT_SIZE) PTR_ADD sp, sp, tp -- 2.37.0