From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mx.groups.io with SMTP id smtpd.web12.21309.1595431456779706079 for ; Wed, 22 Jul 2020 08:24:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20150623.gappssmtp.com header.s=20150623 header.b=MbCcC1IH; spf=pass (domain: nuviainc.com, ip: 209.85.221.65, mailfrom: leif@nuviainc.com) Received: by mail-wr1-f65.google.com with SMTP id f18so2327648wrs.0 for ; Wed, 22 Jul 2020 08:24:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=b7ldaJTmrW+rvjivypg8Vj/iND2sFAItPFjWR0M7M8k=; b=MbCcC1IH74zmLWew5tWVXOCcjmyIWntqI/wY6yy44N5m8lmbjqIKdfmpEQFQhsaUdq +IVcVOzgWbgoUaA2lg/umDCf+YMWgevUyzhBrWGJ2n4jyn1lCCL5HZHCTwo3x+WXu3x4 z3kImR2fNbWLScqJ6Y3wYdqtKKxHDWEPxDxhC37xUVk49UwzqmlWeIoVKtstvnRQHWso fpRrszDkbjHwyIuA3tvubCMe8fg5MrbDi8TnnCLx76XybC+UTOK0eSXLKgqFpBO9f+vM 7tW0n+DlxLzIS+EjlaRA5NU5H3WLC6ddQdrmq5hpffH6IdHggAZo+QhlNUd8JUmpx9u+ Jd2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=b7ldaJTmrW+rvjivypg8Vj/iND2sFAItPFjWR0M7M8k=; b=AeWc8sFxeEZyvt5eg2Evt30ZALxAcAk6ENDwUNQ+LCxrB1rpyccuGAdYc2yEfpIuIy OuSRZ5/JA7WPiRVkcqYtFtcRNcsMmA9fO50P2A0DvZg/45ke1N94IxGeRLljUgZwK6dg fzPqomear7VgZ90Aje5LuFXLtxjPWo3k3IiajFq/HYP7hmXdvgtzt3qkL//4Q18W8uHs /iiCD00iDdAoVZOP7jnSFD3rB6Gm7L6LPyRpwL7caGQjic3dhzjlniFDNWf+tjLOEH+O lZCIQZO9Pn9yFinSDGkVF7jQJm/f9TiW9sNmfzAHS6/CEyo0abxfvWrwlxd2u5U2/2CY DpBQ== X-Gm-Message-State: AOAM531TDcXF/05i++Yj6hldSOjf4d4s1Hunc2qXfmq1IQyLzou9c+Es QLMFxb9+M5AKSijNBbrlNy6SeA== X-Google-Smtp-Source: ABdhPJzMlGGPHVBS0+URiLaXtNOCMvSN7ijaV0TulPK7bznMlytI+3NbYYiLxq5LTN0pQJbr7fj7MQ== X-Received: by 2002:a5d:5746:: with SMTP id q6mr89599wrw.59.1595431455363; Wed, 22 Jul 2020 08:24:15 -0700 (PDT) Return-Path: Received: from vanye ([2001:470:1f09:12f0:b26e:bfff:fea9:f1b8]) by smtp.gmail.com with ESMTPSA id u186sm71013wmu.10.2020.07.22.08.24.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2020 08:24:14 -0700 (PDT) Date: Wed, 22 Jul 2020 16:24:12 +0100 From: "Leif Lindholm" To: Pierre Gondois Cc: "devel@edk2.groups.io" , Laszlo Ersek , Bob Feng Subject: Re: [PATCH 1/1] EmbeddedPkg: fix gcc build errors in AndroidBootImgLib Message-ID: <20200722152412.GD1337@vanye> References: <20200721125056.32195-1-leif@nuviainc.com> MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Jul 21, 2020 at 13:18:02 +0000, Pierre Gondois wrote: > Hello Leif, > I actually submitted this modification on the build flags because of > the error that you fixed. I submitted a similar modification here > https://edk2.groups.io/g/devel/message/61832 . Right, sorry, I think I had a micommunication with Ard about who was looking at that. I'll respond to that separately. Fwiw I prefer my version of the fix, so if Laszlo could review this one, I would be most grateful. > I should have waited before modifying the flags, my apologizes. Ideally, the change would have been part of the same set - then this sort of mix-up could not have happened. The real problem was the being merged without Arm maintainer review. Regards, Leif > I tried building edk2 top-level packages and this should be the only impact. > > Regards, > Pierre > > -----Original Message----- > From: Leif Lindholm > Sent: 21 July 2020 13:51 > To: devel@edk2.groups.io > Cc: Pierre Gondois ; Laszlo Ersek ; Bob Feng > Subject: [PATCH 1/1] EmbeddedPkg: fix gcc build errors in AndroidBootImgLib > > Commit dbd546a32d5a > ("BaseTools: Add gcc flag to warn on void* pointer arithmetic") does its work and triggers build errors in this library. > Update the affected code to build correctly again. > > Cc: Pierre Gondois > Cc: Laszlo Ersek > Cc: Bob Feng > Signed-off-by: Leif Lindholm > --- > > Pierre - can you please ensure to CC Arm maintainers when proposing changes to Arm build flags? (And build test all the top-level edk2 packages *cough*.) > > Bob - can you please ensure Arm maintainers have commented on changes to global build flags? > (Would it be possible to break up tools_def.template into separate arch-specific include files so we could have GetMaintainer.py be more helpful for this?) > > Laszlo - you're not formally an EmbeddedPkg reviewer, but Ard is out for another couple of weeks. But since the Linaro CI is currently broken and the fix is trivial, could you have a look please? > > EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c b/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c > index e1036954ee58..15b5bf451330 100644 > --- a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c > +++ b/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c > @@ -97,7 +97,7 @@ AndroidBootImgGetKernelInfo ( > ASSERT (IS_VALID_ANDROID_PAGE_SIZE (Header->PageSize)); > > *KernelSize = Header->KernelSize; > - *Kernel = BootImg + Header->PageSize; > + *Kernel = (VOID *)((UINTN)BootImg + Header->PageSize); > return EFI_SUCCESS; > } > > @@ -341,7 +341,7 @@ AndroidBootImgUpdateFdt ( > > Status = AndroidBootImgSetProperty64 (UpdatedFdtBase, ChosenNode, > "linux,initrd-end", > - (UINTN)(RamdiskData + RamdiskSize)); > + ((UINTN)RamdiskData + > + RamdiskSize)); > if (EFI_ERROR (Status)) { > goto Fdt_Exit; > } > -- > 2.20.1 > > IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.