From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242])
 by mx.groups.io with SMTP id smtpd.web11.36723.1639546433554694886
 for <devel@edk2.groups.io>;
 Tue, 14 Dec 2021 21:33:54 -0800
Authentication-Results: mx.groups.io;
 dkim=missing; spf=none, err=permanent DNS error (domain: byosoft.com.cn, ip: 58.240.74.242, mailfrom: gaoliming@byosoft.com.cn)
Received: from DESKTOPS6D0PVI ([58.246.60.130])
	(envelope-sender <gaoliming@byosoft.com.cn>)
	by 192.168.6.13 with ESMTP
	for <bob.c.feng@intel.com>; Wed, 15 Dec 2021 13:33:45 +0800
X-WM-Sender: gaoliming@byosoft.com.cn
X-Originating-IP: 58.246.60.130
X-WM-AuthFlag: YES
X-WM-AuthUser: gaoliming@byosoft.com.cn
From: "gaoliming" <gaoliming@byosoft.com.cn>
To: "'Mikhail Krichanov'" <krichanov@ispras.ru>,
	<devel@edk2.groups.io>
Cc: "'Bob Feng'" <bob.c.feng@intel.com>,
	"'Yuwei Chen'" <yuwei.chen@intel.com>,
	"'Vitaly Cheptsov'" <vit9696@protonmail.com>
References: <20211208100517.20306-1-krichanov@ispras.ru>
In-Reply-To: <20211208100517.20306-1-krichanov@ispras.ru>
Subject: =?UTF-8?B?5Zue5aSNOiBbUEFUQ0hdIEJhc2VUb29sczogRml4IGZvciBOT09QVCBDTEFORzM4IGNvbXBpbGF0aW9uIHdpdGggY2xhbmctMTM=?=
Date: Wed, 15 Dec 2021 13:33:50 +0800
Message-ID: <01f201d7f175$571a5490$054efdb0$@byosoft.com.cn>
MIME-Version: 1.0
X-Mailer: Microsoft Outlook 16.0
Thread-Index: AQEOUStHVAD756H4CkSAw7Mo6MlXh63GSETQ
Content-Type: text/plain;
	charset="gb2312"
Content-Transfer-Encoding: quoted-printable
Content-Language: zh-cn

Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

> -----=D3=CA=BC=FE=D4=AD=BC=FE-----
> =B7=A2=BC=FE=C8=CB: Mikhail Krichanov <krichanov@ispras.ru>
> =B7=A2=CB=CD=CA=B1=BC=E4: 2021=C4=EA12=D4=C28=C8=D5 18:05
> =CA=D5=BC=FE=C8=CB: devel@edk2.groups.io
> =B3=AD=CB=CD: Bob Feng <bob.c.feng@intel.com>; Liming Gao
> <gaoliming@byosoft.com.cn>; Yuwei Chen <yuwei.chen@intel.com>; Vitaly
> Cheptsov <vit9696@protonmail.com>; Mikhail Krichanov
> <krichanov@ispras.ru>
> =D6=F7=CC=E2: [PATCH] BaseTools: Fix for NOOPT CLANG38 compilation =
with clang-13
>=20
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3715
> REF CI: https://github.com/tianocore/edk2/pull/2241
>=20
> We must treat not only R_X86_64_PLT32 as R_X86_64_PC32
> (https://github.com/torvalds/linux/commit/
> b21ebf2fb4cde1618915a97cc773e287ff49173e),
> but also treat R_386_PLT32 relocation as R_386_PC32
> (https://github.com/torvalds/linux/commit/
> bb73d07148c405c293e576b40af37737faf23a6a).
>=20
> Cc: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Yuwei Chen <yuwei.chen@intel.com>
> Cc: Vitaly Cheptsov <vit9696@protonmail.com>
> Signed-off-by: Mikhail Krichanov <krichanov@ispras.ru>
> ---
>  BaseTools/Source/C/GenFw/Elf32Convert.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>=20
> diff --git a/BaseTools/Source/C/GenFw/Elf32Convert.c
> b/BaseTools/Source/C/GenFw/Elf32Convert.c
> index d917a444c8..b785998492 100644
> --- a/BaseTools/Source/C/GenFw/Elf32Convert.c
> +++ b/BaseTools/Source/C/GenFw/Elf32Convert.c
> @@ -779,6 +779,7 @@ WriteSections32 (
>              *(UINT32 *)Targ =3D *(UINT32 *)Targ - SymShdr->sh_addr
>                + mCoffSectionsOffset[Sym->st_shndx];
>              break;
> +          case R_386_PLT32:
>            case R_386_PC32:
>              //
>              // Relative relocation: Symbol - Ip + Addend
> @@ -900,6 +901,7 @@ WriteRelocations32 (
>            if (mEhdr->e_machine =3D=3D EM_386) {
>              switch (ELF_R_TYPE(Rel->r_info)) {
>              case R_386_NONE:
> +            case R_386_PLT32:
>              case R_386_PC32:
>                //
>                // No fixup entry required.
> @@ -1168,5 +1170,3 @@ CleanUp32 (
>      free (mCoffSectionsOffset);
>    }
>  }
> -
> -
> --
> 2.20.1