From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5343CC07E99 for ; Mon, 12 Jul 2021 18:28:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 29EB261186 for ; Mon, 12 Jul 2021 18:28:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235797AbhGLSat (ORCPT ); Mon, 12 Jul 2021 14:30:49 -0400 Received: from imap3.hz.codethink.co.uk ([176.9.8.87]:58846 "EHLO imap3.hz.codethink.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230477AbhGLSas (ORCPT ); Mon, 12 Jul 2021 14:30:48 -0400 X-Greylist: delayed 2346 seconds by postgrey-1.27 at vger.kernel.org; Mon, 12 Jul 2021 14:30:48 EDT Received: from cpc152649-stkp13-2-0-cust121.10-2.cable.virginm.net ([86.15.83.122] helo=rainbowdash) by imap3.hz.codethink.co.uk with esmtpsa (Exim 4.92 #3 (Debian)) id 1m3032-0000CA-0D; Mon, 12 Jul 2021 18:48:52 +0100 Received: from ben by rainbowdash with local (Exim 4.94.2) (envelope-from ) id 1m3030-009EvY-Q4; Mon, 12 Jul 2021 18:48:50 +0100 From: Ben Dooks To: linux-kernel@lists.codethink.co.uk, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Cc: Paul Walmsley , Palmer Dabbelt , Albert Ou , Ben Dooks Subject: [PATCH] riscv: add correct as-options for assembly in modules Date: Mon, 12 Jul 2021 18:48:49 +0100 Message-Id: <20210712174849.2202287-1-ben.dooks@codethink.co.uk> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When trying to load modules built for riscv which include assembly the kernel loader errors with "unexpected relocation type 'R_RISCV_ALIGN'" due to R_RISCV_ALIGN relocations being generated by the assembler. In commit 7a8e7da42250138 ("RISC-V: Fixes to module loading") the fix for gcc adds -mno-relax to the command line when building C files. However this was never applied to assembly flags, and gcc does no pass -mno-relax to gas when presented with a .S file. The fix (other than making gcc always pass -mno-relax to gas) is to add -Wa,-mno-relax to gcc to make sure the as is invoked with the right options. Signed-off-by: Ben Dooks --- arch/riscv/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile index 1f5c03082976..fca40511a8c6 100644 --- a/arch/riscv/Makefile +++ b/arch/riscv/Makefile @@ -60,6 +60,7 @@ ifeq ($(CONFIG_PERF_EVENTS),y) endif KBUILD_CFLAGS_MODULE += $(call cc-option,-mno-relax) +KBUILD_AFLAGS_MODULE += $(call as-option,-Wa$(comma)-mno-relax) # GCC versions that support the "-mstrict-align" option default to allowing # unaligned accesses. While unaligned accesses are explicitly allowed in the -- 2.30.2