Received: by 2002:a05:6358:45e:b0:b5:b6eb:e1f9 with SMTP id 30csp2794306rwe; Sun, 28 Aug 2022 23:25:10 -0700 (PDT) X-Google-Smtp-Source: AA6agR5bSPNsYvlFGird/40v6LZJQiVMbgoVjcA4yJBhLL+r73dQiIG2qPCdDAzXZe4pXCvwu+Jk X-Received: by 2002:aa7:ca46:0:b0:447:af0a:be68 with SMTP id j6-20020aa7ca46000000b00447af0abe68mr14797466edt.327.1661754310263; Sun, 28 Aug 2022 23:25:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661754310; cv=none; d=google.com; s=arc-20160816; b=fMp1x3lIwOtVwoUOL11Cui8oEYyvQyo3h6/KdATESMfqqd8a/g2DVcNLaFDQBjHspY S1O/QHaI0xZgUA1VulgmZPTNb0xAv4+zDILUFw7w2iwZNYuAdPef6sDnsCNa1bmrsqM+ AAKpH0y8rGNTw9eDg4SAkPa/2cB3vCfxIuSb4/W0p1nIVFm47B1qhdCtaA6eLuO/Kmub VVizwTyj3tgp3C7P1edqKR9l7kr+SQLiwJCi89L7elFP5q8PNlD3z8dKPnbROWn61Za/ G8yOhalJn5/fJQdImxTgPE6sZ8kTjc4KO3M8m/JQFIJgqfFlbLGHPIRxCNLDL1EoKzTT gYzg== 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=2A7r4FSQd3xim2NDML2oRZaG66TTE/42n9SfIbtE0Gs=; b=VX3LktyGmP6JM+i5NwSMuDbemsJVv3aO+4DBLVIfmTLg38shuTz3hXr6q+OAftEbPz ndC1JjmNjuco1eHnzlk4Mh4KkLDMP4vRiim4n6ltVaj4pdnB7VjrvdXZ0mpUl/4EO2CT EOwFzHcuHyB1p9FQMJqVBllKFuabFBwZLXcx4L349s5h5n+rGSXQg/hqBaNCJsTH7jII 0f8zNw06Kzo1Pa5oFO0Fwk72axFrFHGr2ukUF6mR28UhHR+BMweituT8K1ImMKHJg9Fz x+X8HcOv2x6fYpGPmzRppvptXPNd8OHBFEKEobSxbwZrCxMfprJWY2FgoxKisEmQXXs9 VmrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b="c/3Zp8Va"; 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=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hh10-20020a170906a94a00b0072f1d8e7300si5037457ejb.430.2022.08.28.23.24.45; Sun, 28 Aug 2022 23:25:10 -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=@ibm.com header.s=pp1 header.b="c/3Zp8Va"; 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=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229832AbiH2Fyv (ORCPT + 99 others); Mon, 29 Aug 2022 01:54:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52006 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229743AbiH2FyU (ORCPT ); Mon, 29 Aug 2022 01:54:20 -0400 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 234F54A80C for ; Sun, 28 Aug 2022 22:54:04 -0700 (PDT) Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 27T5Q4ax000796; Mon, 29 Aug 2022 05:53:46 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=2A7r4FSQd3xim2NDML2oRZaG66TTE/42n9SfIbtE0Gs=; b=c/3Zp8VaWWhjPIL+WKCZNHqJaCVmwg5X/bAOX4tpFZg2yq8YopVdtMgl6cFdglT4/7l2 sQ8WZUQ60Ul7OSxHtFRZ9+YNeeQsqrlJakzjVFPWFZore9+pxzI/v3oB27dFiuCVuSZG qRUmLmO/7yD067gUtp7fPmLgTxOwXBTgDDfLxUtqXJq0pUmmkRUk1xSAtlIsRGHDxKHU KwDoc7q+Xu/UrESB17gWHRuTKkYL0btFHC3hxGRpyANxnXGFvnirNLwneahXky80nh+W F4RMP7baKyPb60GstXzu3h5Q8FNir3yaNGIaWTEOaHdNKJJTazuTBxwQNSKZKkVnmtnv QA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3j8qa4rh0s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 29 Aug 2022 05:53:46 +0000 Received: from m0098404.ppops.net (m0098404.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 27T5Z65I004794; Mon, 29 Aug 2022 05:53:45 GMT Received: from ppma04fra.de.ibm.com (6a.4a.5195.ip4.static.sl-reverse.com [149.81.74.106]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3j8qa4rh00-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 29 Aug 2022 05:53:45 +0000 Received: from pps.filterd (ppma04fra.de.ibm.com [127.0.0.1]) by ppma04fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 27T5perG005268; Mon, 29 Aug 2022 05:53:42 GMT Received: from b06avi18626390.portsmouth.uk.ibm.com (b06avi18626390.portsmouth.uk.ibm.com [9.149.26.192]) by ppma04fra.de.ibm.com with ESMTP id 3j7aw99bvs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 29 Aug 2022 05:53:42 +0000 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06avi18626390.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 27T5oTu741812242 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 29 Aug 2022 05:50:29 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 64A174C046; Mon, 29 Aug 2022 05:53:40 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7D2404C040; Mon, 29 Aug 2022 05:53:36 +0000 (GMT) Received: from li-c3569c4c-1ef8-11b2-a85c-ee139cda3133.ibm.com.com (unknown [9.43.67.34]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 29 Aug 2022 05:53:36 +0000 (GMT) From: Sathvika Vasireddy To: linuxppc-dev@lists.ozlabs.org Cc: jpoimboe@redhat.com, peterz@infradead.org, linux-kernel@vger.kernel.org, aik@ozlabs.ru, mpe@ellerman.id.au, mingo@redhat.com, christophe.leroy@csgroup.eu, rostedt@goodmis.org, mbenes@suse.cz, npiggin@gmail.com, chenzhongjin@huawei.com, naveen.n.rao@linux.vnet.ibm.com, sv@linux.ibm.com Subject: [PATCH v2 13/16] objtool: Use macros to define arch specific reloc types Date: Mon, 29 Aug 2022 11:22:20 +0530 Message-Id: <20220829055223.24767-14-sv@linux.ibm.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220829055223.24767-1-sv@linux.ibm.com> References: <20220829055223.24767-1-sv@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: 2qISx1SCfYHvyCk4NRdAs709Aj0jeAa5 X-Proofpoint-GUID: ZeEPRPq7PX3xNyU6X7ZXQzrbOEFWjceb X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-08-29_02,2022-08-25_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 mlxscore=0 malwarescore=0 adultscore=0 suspectscore=0 mlxlogscore=724 phishscore=0 bulkscore=0 impostorscore=0 lowpriorityscore=0 priorityscore=1501 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2207270000 definitions=main-2208290026 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS, 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 lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Make relocation types architecture specific. Signed-off-by: Sathvika Vasireddy --- tools/objtool/arch/x86/include/arch/elf.h | 2 ++ tools/objtool/check.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/objtool/arch/x86/include/arch/elf.h b/tools/objtool/arch/x86/include/arch/elf.h index 69cc4264b28a..ac14987cf687 100644 --- a/tools/objtool/arch/x86/include/arch/elf.h +++ b/tools/objtool/arch/x86/include/arch/elf.h @@ -2,5 +2,7 @@ #define _OBJTOOL_ARCH_ELF #define R_NONE R_X86_64_NONE +#define R_ABS64 R_X86_64_64 +#define R_ABS32 R_X86_64_32 #endif /* _OBJTOOL_ARCH_ELF */ diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 5298a143ceac..f1d055467926 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -883,7 +883,7 @@ static int create_mcount_loc_sections(struct objtool_file *file) memset(loc, 0, addrsize); if (elf_add_reloc_to_insn(file->elf, sec, idx, - R_X86_64_64, + addrsize == sizeof(u64) ? R_ABS64 : R_ABS32, insn->sec, insn->offset)) return -1; -- 2.31.1