Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp5846412rwb; Mon, 14 Nov 2022 10:15:06 -0800 (PST) X-Google-Smtp-Source: AA0mqf7ofNMJkjhMrBFbPUpNE0IBSyFt0sDTX7E6peU+disl+bp/fUl/zkcja9Zzcjx1UC/WYBLu X-Received: by 2002:a05:6402:1141:b0:467:3ea2:3ec4 with SMTP id g1-20020a056402114100b004673ea23ec4mr12217382edw.351.1668449705786; Mon, 14 Nov 2022 10:15:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668449705; cv=none; d=google.com; s=arc-20160816; b=i+Y65y5NI7yQ9FXrihDXxWxr4FNSkkWM/dah2+2WMvfkLmc9R422687r+NZpCSsQna A489yqje8xLUA3zlsBPnIuWEm7VXJAAtjofjGPQkD4HDl7JLTB5gYAwrP+p+mZy3ybvH /wgFtcGaMRBRB3be+EAhSqIsmzNY+vaqXnV246dRXlTMl9/89OIkitnW3yzbbzoOapmb 7JTp123JtAqjjaVCrsxiD6TqMLftwY4W9KB9XY/6feu4G99ND23UlJIcRNAACzYOWEPs KiSgzHVNKcXa4mS2gc+MlGeygfywQEGzqT/Ebp9C1S2qI2HnqpoThJi1nu5glTD/EBF/ JoNA== 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=xz2HT3U3i+AwM29IiB9s/7S2JPakevApyv5uJ9vDXMM=; b=K06O4pTfiT5mQbdXICIj8ZZfCAPs97Jw4o6uqgFlZr0yoE2pheJDrGruNM0MGkq3Lo SDle7e+HvHhflylNurlnaGJNoFlIS5nubHXzAyxMJ+XV6Kos/cxsIbv+lZ3PeP3h1eZg BeXGiUmdrWYZXcY+T6+rM8IRWkAnJRbKaPaxaIVFWI5eUUpfG8XR0GYrDd2UYGLn2tdy xPEb4Dr1iOHP6h1uOoF1c2XKDTow1oAY55VFR9JJA97Z2RSyIkfMzLpq4StvbnlvlSum svrhu0S5EUjBtRH+tIz47NbJLt66v3sMOjWwUvZLVhTy1tnbGPP4+idnxOeyqjAaq+h0 7VzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=C7pR89Xy; 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 f7-20020a50ee87000000b00459a58216d8si7877269edr.504.2022.11.14.10.14.43; Mon, 14 Nov 2022 10:15:05 -0800 (PST) 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=C7pR89Xy; 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 S238226AbiKNSAy (ORCPT + 89 others); Mon, 14 Nov 2022 13:00:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57354 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236819AbiKNSAW (ORCPT ); Mon, 14 Nov 2022 13:00:22 -0500 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86CA02872F for ; Mon, 14 Nov 2022 10:00:21 -0800 (PST) Received: from pps.filterd (m0127361.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.5) with ESMTP id 2AEHtqv2008164; Mon, 14 Nov 2022 18:00:02 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=xz2HT3U3i+AwM29IiB9s/7S2JPakevApyv5uJ9vDXMM=; b=C7pR89XyCPQPA+TyRASeou0ZdfwG90Bz+pEK6wc+FYFCTBWhvGizQbSQr0ToXyMJRPtk 6sk49ewGXu5KfMkdkqnCxiexMgIHnsYVvulALvOQuZbEMZL9KfGFknZ607t56oqe+WXE gJFhvTZ50SHRQQUCLahAOeDrpAdPWo72bJgywq1VuD0PSVx/yDRMc4FIXHDfrCnTYZ/C Cf7a7J2jrplRqrKmQY/uwMG8YYXhMry7yFvJRsVnqnm7olooqW4hcaBFjsH3wbhcKXpY rG70/vfQZ/y1k/4kfGhWQzihoEQ5w2NZBwfNQ4t8PlYANCqD5U+W31Dy4QPCF3cV9BYG aQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3kutgs03hb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Nov 2022 18:00:02 +0000 Received: from m0127361.ppops.net (m0127361.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 2AEHuCqe009675; Mon, 14 Nov 2022 18:00:02 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 3kutgs03fe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Nov 2022 18:00:01 +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 2AEHp8uB009896; Mon, 14 Nov 2022 17:59:59 GMT Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by ppma04fra.de.ibm.com with ESMTP id 3kt349a531-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Nov 2022 17:59:59 +0000 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 2AEHxvO937290592 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Nov 2022 17:59:57 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4DEE111C04A; Mon, 14 Nov 2022 17:59:57 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9765D11C050; Mon, 14 Nov 2022 17:59:52 +0000 (GMT) Received: from li-c3569c4c-1ef8-11b2-a85c-ee139cda3133.ibm.com.com (unknown [9.43.116.246]) by d06av25.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 14 Nov 2022 17:59:52 +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 v6 13/16] objtool: Use macros to define arch specific reloc types Date: Mon, 14 Nov 2022 23:27:51 +0530 Message-Id: <20221114175754.1131267-14-sv@linux.ibm.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221114175754.1131267-1-sv@linux.ibm.com> References: <20221114175754.1131267-1-sv@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: 7TQ7SFoPSs8G-ZQznl7EEFx8_85i86br X-Proofpoint-GUID: t3Ai8pJtE19YYkV96NrTM2nEK9dK5qiK X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-14_13,2022-11-11_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 clxscore=1015 mlxlogscore=846 mlxscore=0 priorityscore=1501 adultscore=0 lowpriorityscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211140125 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 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. Tested-by: Naveen N. Rao Reviewed-by: Naveen N. Rao Reviewed-by: Christophe Leroy Acked-by: Peter Zijlstra (Intel) Acked-by: Josh Poimboeuf 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 752a6ffd5c4c..2d7153b5d5d1 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -885,7 +885,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