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 Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5AE20C04A68 for ; Wed, 27 Jul 2022 16:31:34 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1BE9384028; Wed, 27 Jul 2022 18:31:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xs4all.nl Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 076EF84028; Wed, 27 Jul 2022 18:31:31 +0200 (CEST) Received: from sibelius.xs4all.nl (80-61-163-207.fixed.kpn.net [80.61.163.207]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C9F3D817E6 for ; Wed, 27 Jul 2022 18:31:28 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xs4all.nl Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=mark.kettenis@xs4all.nl Received: from localhost (bloch.sibelius.xs4all.nl [local]) by bloch.sibelius.xs4all.nl (OpenSMTPD) with ESMTPA id 52646f3a; Wed, 27 Jul 2022 18:31:27 +0200 (CEST) Date: Wed, 27 Jul 2022 18:31:27 +0200 (CEST) From: Mark Kettenis To: Michal Simek Cc: kettenis@openbsd.org, u-boot@lists.denx.de In-Reply-To: (message from Michal Simek on Wed, 27 Jul 2022 17:59:02 +0200) Subject: Re: [PATCH] tools: relocate-rela: Don't assume defines Microblaze stuff References: <20220727143405.52368-1-kettenis@openbsd.org> Message-ID: X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean > Date: Wed, 27 Jul 2022 17:59:02 +0200 > From: Michal Simek > > On 7/27/22 16:34, Mark Kettenis wrote: > > The contents of differ between OSes. It may only define > > the relocation types for the host architecture, and may not contain > > machine-specific defines for more obscure architectures (such as > > Microblaze) at all. > > > > Define the relevant constants for Microblaze locally if they are > > not provided by . > > > > Fixes: 034944b33bc8 ("tools: relocate-rela: Add support for 32bit Microblaze relocation") > > Signed-off-by: Mark Kettenis > > --- > > tools/relocate-rela.c | 20 ++++++++++++++++++++ > > 1 file changed, 20 insertions(+) > > > > diff --git a/tools/relocate-rela.c b/tools/relocate-rela.c > > index 090fb1acb2..c57c3cfade 100644 > > --- a/tools/relocate-rela.c > > +++ b/tools/relocate-rela.c > > @@ -20,6 +20,26 @@ > > #define R_AARCH64_RELATIVE 1027 > > #endif > > > > +#ifndef EM_MICROBLAZE > > +#define EM_MICROBLAZE 189 > > +#endif > > + > > +#ifndef R_MICROBLAZE_NONE > > +#define R_MICROBLAZE_NONE 0 > > +#endif > > + > > +#ifndef R_MICROBLAZE_32 > > +#define R_MICROBLAZE_32 1 > > +#endif > > + > > +#ifndef R_MICROBLAZE_REL > > +#define R_MICROBLAZE_REL 16 > > +#endif > > + > > +#ifndef R_MICROBLAZE_GLOB_DAT > > +#define R_MICROBLAZE_GLOB_DAT 18 > > +#endif > > + > > static int ei_class; > > > > static uint64_t rela_start, rela_end, text_base, dyn_start; > > > It is fixed already in the latest master branch. Tom merged it yesterday. > Please take a look. Ah great, missed that. Works for me!