Hi Ray, On Wed, Jun 02, 2021 at 16:11:41 +0800, Ni, Ray wrote: > From: Liming Gao <gaolim...@byosoft.com.cn> > > CLANG8ELF tool chain generated ELF image with the different attributes > in section. Update GenFw to handle them. > 1. .text section with writable attribute (support) > 2. .reloc section has the symbol for *ABS* (skip) > > Signed-off-by: Liming Gao <gaolim...@byosoft.com.cn> > Reviewed-by: Feng Bob C <bob.c.f...@intel.com>
This commit breaks many of the ARM platforms. I end up seeing GenFw: Elf64Convert.c:719: ScanSections64: Assertion `FALSE' failed. when generating certain ACPI tables. Note: this applies to both GCC5 and CLANG38 - it is not isolated to CLANG8ELF. Reverting to commit c1aa3bab1259 makes these builds work again. / Leif > --- > BaseTools/Source/C/GenFw/Elf32Convert.c | 12 +++--------- > BaseTools/Source/C/GenFw/Elf64Convert.c | 5 +++-- > 2 files changed, 6 insertions(+), 11 deletions(-) > > diff --git a/BaseTools/Source/C/GenFw/Elf32Convert.c > b/BaseTools/Source/C/GenFw/Elf32Convert.c > index 2485b2cb7a..7c8a065678 100644 > --- a/BaseTools/Source/C/GenFw/Elf32Convert.c > +++ b/BaseTools/Source/C/GenFw/Elf32Convert.c > @@ -238,7 +238,7 @@ IsTextShdr ( > Elf_Shdr *Shdr > ) > { > - return (BOOLEAN) ((Shdr->sh_flags & (SHF_WRITE | SHF_ALLOC)) == SHF_ALLOC); > + return (BOOLEAN) ((Shdr->sh_flags & (SHF_EXECINSTR | SHF_ALLOC)) == > (SHF_EXECINSTR | SHF_ALLOC)); > } > > STATIC > @@ -261,7 +261,7 @@ IsDataShdr ( > if (IsHiiRsrcShdr(Shdr)) { > return FALSE; > } > - return (BOOLEAN) (Shdr->sh_flags & (SHF_WRITE | SHF_ALLOC)) == (SHF_ALLOC > | SHF_WRITE); > + return (BOOLEAN) (Shdr->sh_flags & (SHF_EXECINSTR | SHF_WRITE | > SHF_ALLOC)) == (SHF_ALLOC | SHF_WRITE); > } > > STATIC > @@ -749,13 +749,7 @@ WriteSections32 ( > if (SymName == NULL) { > SymName = (const UINT8 *)"<unknown>"; > } > - > - Error (NULL, 0, 3000, "Invalid", > - "%s: Bad definition for symbol '%s'@%#x or unsupported > symbol type. " > - "For example, absolute and undefined symbols are not > supported.", > - mInImageName, SymName, Sym->st_value); > - > - exit(EXIT_FAILURE); > + continue; > } > SymShdr = GetShdrByIndex(Sym->st_shndx); > > diff --git a/BaseTools/Source/C/GenFw/Elf64Convert.c > b/BaseTools/Source/C/GenFw/Elf64Convert.c > index d097db8632..8fe672e984 100644 > --- a/BaseTools/Source/C/GenFw/Elf64Convert.c > +++ b/BaseTools/Source/C/GenFw/Elf64Convert.c > @@ -246,7 +246,7 @@ IsTextShdr ( > Elf_Shdr *Shdr > ) > { > - return (BOOLEAN) ((Shdr->sh_flags & (SHF_WRITE | SHF_ALLOC)) == SHF_ALLOC); > + return (BOOLEAN) ((Shdr->sh_flags & (SHF_EXECINSTR | SHF_ALLOC)) == > (SHF_EXECINSTR | SHF_ALLOC)); > } > > STATIC > @@ -269,7 +269,7 @@ IsDataShdr ( > if (IsHiiRsrcShdr(Shdr)) { > return FALSE; > } > - return (BOOLEAN) (Shdr->sh_flags & (SHF_WRITE | SHF_ALLOC)) == (SHF_ALLOC > | SHF_WRITE); > + return (BOOLEAN) (Shdr->sh_flags & (SHF_EXECINSTR | SHF_WRITE | > SHF_ALLOC)) == (SHF_ALLOC | SHF_WRITE); > } > > STATIC > @@ -1060,6 +1060,7 @@ WriteSections64 ( > > exit(EXIT_FAILURE); > } > + continue; > } > SymShdr = GetShdrByIndex(Sym->st_shndx); > > -- > 2.31.1.windows.1 > > > > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#76072): https://edk2.groups.io/g/devel/message/76072 Mute This Topic: https://groups.io/mt/83253913/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-