| Message ID | mvminn3t1fq.fsf@suse.de |
|---|---|
| State | New |
| Headers | show |
On 21.03.2017 10:38, Andreas Schwab wrote: > The m68k mask should not remove the low bit of the ELF version field and > should ignore the OS/ABI field. Did you encounter a problem with a real binary here? ... then it might be worth to mention it in the patch description and the patch should likely be included into QEMU 2.9. Or is this just cosmetics? ... then it should rather be included in 2.10 later, I think. Thomas > Signed-off-by: Andreas Schwab <schwab@suse.de> > --- > scripts/qemu-binfmt-conf.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh > index 0f1aa63872..484bcf166e 100755 > --- a/scripts/qemu-binfmt-conf.sh > +++ b/scripts/qemu-binfmt-conf.sh > @@ -47,7 +47,7 @@ ppc64le_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\x > ppc64le_family=ppcle > > m68k_magic='\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x04' > -m68k_mask='\xff\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff' > +m68k_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff' > m68k_family=m68k > > # FIXME: We could use the other endianness on a MIPS host. >
On Mär 22 2017, Thomas Huth <huth@tuxfamily.org> wrote: > On 21.03.2017 10:38, Andreas Schwab wrote: >> The m68k mask should not remove the low bit of the ELF version field and >> should ignore the OS/ABI field. > > Did you encounter a problem with a real binary here? Yes, some binaries are using ELFOSABI_GNU instead of ELFOSABI_SYSV. All other patterns already ignore the OS/ABI field. Andreas.
Le 22/03/2017 à 13:04, Andreas Schwab a écrit : > On Mär 22 2017, Thomas Huth <huth@tuxfamily.org> wrote: > >> On 21.03.2017 10:38, Andreas Schwab wrote: >>> The m68k mask should not remove the low bit of the ELF version field and >>> should ignore the OS/ABI field. >> >> Did you encounter a problem with a real binary here? > > Yes, some binaries are using ELFOSABI_GNU instead of ELFOSABI_SYSV. All > other patterns already ignore the OS/ABI field. Yes, I've also seen this. Reviewed-by: Laurent Vivier <laurent@vivier.eu>
diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh index 0f1aa63872..484bcf166e 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -47,7 +47,7 @@ ppc64le_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\x ppc64le_family=ppcle m68k_magic='\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x04' -m68k_mask='\xff\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff' +m68k_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff' m68k_family=m68k # FIXME: We could use the other endianness on a MIPS host.
The m68k mask should not remove the low bit of the ELF version field and should ignore the OS/ABI field. Signed-off-by: Andreas Schwab <schwab@suse.de> --- scripts/qemu-binfmt-conf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)