* [PATCH] qemu-binfmt-conf.sh: allow elf EI_ABIVERSION=1 for mips
@ 2022-03-03 10:17 Andreas K. Hüttel
2022-03-05 0:06 ` [PATCH v2] " Andreas K. Hüttel
0 siblings, 1 reply; 9+ messages in thread
From: Andreas K. Hüttel @ 2022-03-03 10:17 UTC (permalink / raw)
To: qemu-devel; +Cc: Andreas K. Hüttel
With the command line flag -mplt and a recent toolchain, ELF binaries
generated by gcc can obtain EI_ABIVERSION=1, see below, which makes, e.g.,
gcc three-stage bootstrap in a mips-unknown-linux-gnu qemu-user chroot
fail since the binfmt-misc magic does not match anymore.
qemu executes these binaries just fine, so relax the mask slightly.
CHOST=mips-unknown-linux-gnu
CFLAGS="-O2 -march=mips32 -mabi=32 -mplt -pipe"
gcc-11.2, binutils-2.37, glibc-2.34
| /*
| - * ELF dump of './prev-gcc/build/gengenrtl'
| - * 29608 (0x73A8) bytes
| + * ELF dump of './gcc/build/gengenrtl'
| + * 54532 (0xD504) bytes
| */
|
| Elf32_Dyn dumpedelf_dyn_0[];
| struct {
| Elf32_Ehdr ehdr;
| Elf32_Phdr phdrs[12];
| - Elf32_Shdr shdrs[33];
| + Elf32_Shdr shdrs[44];
| Elf32_Dyn *dyns;
| } dumpedelf_0 = {
|
| .ehdr = {
| .e_ident = { /* (EI_NIDENT bytes) */
| /* [0] EI_MAG: */ 0x7F,'E','L','F',
| /* [4] EI_CLASS: */ 1 , /* (ELFCLASS32) */
| /* [5] EI_DATA: */ 2 , /* (ELFDATA2MSB) */
| /* [6] EI_VERSION: */ 1 , /* (EV_CURRENT) */
| /* [7] EI_OSABI: */ 0 , /* (ELFOSABI_NONE) */
| - /* [8] EI_ABIVERSION: */ 0 ,
| + /* [8] EI_ABIVERSION: */ 1 ,
| /* [9-15] EI_PAD: */ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
| },
| .e_type = 2 , /* (ET_EXEC) */
| .e_machine = 8 , /* (EM_MIPS) */
| .e_version = 1 , /* (EV_CURRENT) */
| (...)
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
---
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 e9bfeb94d3..2ac2226f26 100755
--- a/scripts/qemu-binfmt-conf.sh
+++ b/scripts/qemu-binfmt-conf.sh
@@ -61,7 +61,7 @@ m68k_family=m68k
# FIXME: We could use the other endianness on a MIPS host.
mips_magic='\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08'
-mips_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
+mips_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
mips_family=mips
mipsel_magic='\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00'
--
2.34.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2] qemu-binfmt-conf.sh: allow elf EI_ABIVERSION=1 for mips
2022-03-03 10:17 [PATCH] qemu-binfmt-conf.sh: allow elf EI_ABIVERSION=1 for mips Andreas K. Hüttel
@ 2022-03-05 0:06 ` Andreas K. Hüttel
2022-03-05 0:18 ` Philippe Mathieu-Daudé
2022-03-14 21:33 ` qemu-binfmt-conf.sh: mips improvements Andreas K. Hüttel
0 siblings, 2 replies; 9+ messages in thread
From: Andreas K. Hüttel @ 2022-03-05 0:06 UTC (permalink / raw)
To: qemu-devel; +Cc: Andreas K. Hüttel
With the command line flag -mplt and a recent toolchain, ELF binaries
generated by gcc can obtain EI_ABIVERSION=1, see below, which makes, e.g.,
gcc three-stage bootstrap in a mips-unknown-linux-gnu qemu-user chroot
fail since the binfmt-misc magic does not match anymore.
qemu executes these binaries just fine, so relax the mask slightly.
CHOST=mips-unknown-linux-gnu (and also mipsel-unknown-linux-gnu)
CFLAGS="-O2 -march=mips32 -mabi=32 -mplt -pipe"
gcc-11.2, binutils-2.37, glibc-2.34
| /*
| - * ELF dump of './prev-gcc/build/gengenrtl'
| - * 29608 (0x73A8) bytes
| + * ELF dump of './gcc/build/gengenrtl'
| + * 54532 (0xD504) bytes
| */
|
| Elf32_Dyn dumpedelf_dyn_0[];
| struct {
| Elf32_Ehdr ehdr;
| Elf32_Phdr phdrs[12];
| - Elf32_Shdr shdrs[33];
| + Elf32_Shdr shdrs[44];
| Elf32_Dyn *dyns;
| } dumpedelf_0 = {
|
| .ehdr = {
| .e_ident = { /* (EI_NIDENT bytes) */
| /* [0] EI_MAG: */ 0x7F,'E','L','F',
| /* [4] EI_CLASS: */ 1 , /* (ELFCLASS32) */
| /* [5] EI_DATA: */ 2 , /* (ELFDATA2MSB) */
| /* [6] EI_VERSION: */ 1 , /* (EV_CURRENT) */
| /* [7] EI_OSABI: */ 0 , /* (ELFOSABI_NONE) */
| - /* [8] EI_ABIVERSION: */ 0 ,
| + /* [8] EI_ABIVERSION: */ 1 ,
| /* [9-15] EI_PAD: */ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
| },
| .e_type = 2 , /* (ET_EXEC) */
| .e_machine = 8 , /* (EM_MIPS) */
| .e_version = 1 , /* (EV_CURRENT) */
| (...)
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
---
v2: Add the same fix for little endian as for big endian
scripts/qemu-binfmt-conf.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
index e9bfeb94d3..fc2f856800 100755
--- a/scripts/qemu-binfmt-conf.sh
+++ b/scripts/qemu-binfmt-conf.sh
@@ -61,11 +61,11 @@ m68k_family=m68k
# FIXME: We could use the other endianness on a MIPS host.
mips_magic='\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08'
-mips_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
+mips_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
mips_family=mips
mipsel_magic='\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00'
-mipsel_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'
+mipsel_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xfe\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'
mipsel_family=mips
mipsn32_magic='\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08'
--
2.34.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v2] qemu-binfmt-conf.sh: allow elf EI_ABIVERSION=1 for mips
2022-03-05 0:06 ` [PATCH v2] " Andreas K. Hüttel
@ 2022-03-05 0:18 ` Philippe Mathieu-Daudé
2022-03-06 23:54 ` Philippe Mathieu-Daudé
2022-03-14 21:33 ` qemu-binfmt-conf.sh: mips improvements Andreas K. Hüttel
1 sibling, 1 reply; 9+ messages in thread
From: Philippe Mathieu-Daudé @ 2022-03-05 0:18 UTC (permalink / raw)
To: Andreas K. Hüttel, qemu-devel; +Cc: Laurent Vivier
Cc'ing Laurent:
$ ./scripts/get_maintainer.pl -f scripts/qemu-binfmt-conf.sh
Laurent Vivier <laurent@vivier.eu> (maintainer:Linux user)
qemu-devel@nongnu.org (open list:All patches CC here)
On 5/3/22 01:06, Andreas K. Hüttel wrote:
> With the command line flag -mplt and a recent toolchain, ELF binaries
> generated by gcc can obtain EI_ABIVERSION=1, see below, which makes, e.g.,
> gcc three-stage bootstrap in a mips-unknown-linux-gnu qemu-user chroot
> fail since the binfmt-misc magic does not match anymore.
>
> qemu executes these binaries just fine, so relax the mask slightly.
>
> CHOST=mips-unknown-linux-gnu (and also mipsel-unknown-linux-gnu)
> CFLAGS="-O2 -march=mips32 -mabi=32 -mplt -pipe"
> gcc-11.2, binutils-2.37, glibc-2.34
>
> | /*
> | - * ELF dump of './prev-gcc/build/gengenrtl'
> | - * 29608 (0x73A8) bytes
> | + * ELF dump of './gcc/build/gengenrtl'
> | + * 54532 (0xD504) bytes
> | */
> |
> | Elf32_Dyn dumpedelf_dyn_0[];
> | struct {
> | Elf32_Ehdr ehdr;
> | Elf32_Phdr phdrs[12];
> | - Elf32_Shdr shdrs[33];
> | + Elf32_Shdr shdrs[44];
> | Elf32_Dyn *dyns;
> | } dumpedelf_0 = {
> |
> | .ehdr = {
> | .e_ident = { /* (EI_NIDENT bytes) */
> | /* [0] EI_MAG: */ 0x7F,'E','L','F',
> | /* [4] EI_CLASS: */ 1 , /* (ELFCLASS32) */
> | /* [5] EI_DATA: */ 2 , /* (ELFDATA2MSB) */
> | /* [6] EI_VERSION: */ 1 , /* (EV_CURRENT) */
> | /* [7] EI_OSABI: */ 0 , /* (ELFOSABI_NONE) */
> | - /* [8] EI_ABIVERSION: */ 0 ,
> | + /* [8] EI_ABIVERSION: */ 1 ,
> | /* [9-15] EI_PAD: */ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
> | },
> | .e_type = 2 , /* (ET_EXEC) */
> | .e_machine = 8 , /* (EM_MIPS) */
> | .e_version = 1 , /* (EV_CURRENT) */
> | (...)
>
> Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
> ---
>
> v2: Add the same fix for little endian as for big endian
>
> scripts/qemu-binfmt-conf.sh | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
> index e9bfeb94d3..fc2f856800 100755
> --- a/scripts/qemu-binfmt-conf.sh
> +++ b/scripts/qemu-binfmt-conf.sh
> @@ -61,11 +61,11 @@ m68k_family=m68k
> # FIXME: We could use the other endianness on a MIPS host.
>
> mips_magic='\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08'
> -mips_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
> +mips_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
> mips_family=mips
>
> mipsel_magic='\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00'
> -mipsel_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'
> +mipsel_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xfe\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'
> mipsel_family=mips
>
> mipsn32_magic='\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08'
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v2] qemu-binfmt-conf.sh: allow elf EI_ABIVERSION=1 for mips
2022-03-05 0:18 ` Philippe Mathieu-Daudé
@ 2022-03-06 23:54 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 9+ messages in thread
From: Philippe Mathieu-Daudé @ 2022-03-06 23:54 UTC (permalink / raw)
To: Andreas K. Hüttel, qemu-devel; +Cc: Richard Henderson, Laurent Vivier
(Cc'ing Richard)
On 5/3/22 01:18, Philippe Mathieu-Daudé wrote:
> Cc'ing Laurent:
>
> $ ./scripts/get_maintainer.pl -f scripts/qemu-binfmt-conf.sh
> Laurent Vivier <laurent@vivier.eu> (maintainer:Linux user)
> qemu-devel@nongnu.org (open list:All patches CC here)
>
> On 5/3/22 01:06, Andreas K. Hüttel wrote:
>> With the command line flag -mplt and a recent toolchain, ELF binaries
>> generated by gcc can obtain EI_ABIVERSION=1, see below, which makes,
>> e.g.,
>> gcc three-stage bootstrap in a mips-unknown-linux-gnu qemu-user chroot
>> fail since the binfmt-misc magic does not match anymore.
>>
>> qemu executes these binaries just fine, so relax the mask slightly.
>>
>> CHOST=mips-unknown-linux-gnu (and also mipsel-unknown-linux-gnu)
>> CFLAGS="-O2 -march=mips32 -mabi=32 -mplt -pipe"
>> gcc-11.2, binutils-2.37, glibc-2.34
>>
>> | /*
>> | - * ELF dump of './prev-gcc/build/gengenrtl'
>> | - * 29608 (0x73A8) bytes
>> | + * ELF dump of './gcc/build/gengenrtl'
>> | + * 54532 (0xD504) bytes
>> | */
>> |
>> | Elf32_Dyn dumpedelf_dyn_0[];
>> | struct {
>> | Elf32_Ehdr ehdr;
>> | Elf32_Phdr phdrs[12];
>> | - Elf32_Shdr shdrs[33];
>> | + Elf32_Shdr shdrs[44];
>> | Elf32_Dyn *dyns;
>> | } dumpedelf_0 = {
>> |
>> | .ehdr = {
>> | .e_ident = { /* (EI_NIDENT bytes) */
>> | /* [0] EI_MAG: */ 0x7F,'E','L','F',
>> | /* [4] EI_CLASS: */ 1 , /* (ELFCLASS32) */
>> | /* [5] EI_DATA: */ 2 , /* (ELFDATA2MSB) */
>> | /* [6] EI_VERSION: */ 1 , /* (EV_CURRENT) */
>> | /* [7] EI_OSABI: */ 0 , /* (ELFOSABI_NONE) */
>> | - /* [8] EI_ABIVERSION: */ 0 ,
>> | + /* [8] EI_ABIVERSION: */ 1 ,
>> | /* [9-15] EI_PAD: */ 0x0, 0x0, 0x0, 0x0, 0x0,
>> 0x0, 0x0,
>> | },
>> | .e_type = 2 , /* (ET_EXEC) */
>> | .e_machine = 8 , /* (EM_MIPS) */
>> | .e_version = 1 , /* (EV_CURRENT) */
>> | (...)
>>
>> Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
>> ---
>>
>> v2: Add the same fix for little endian as for big endian
>>
>> scripts/qemu-binfmt-conf.sh | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
Acked-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>> diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
>> index e9bfeb94d3..fc2f856800 100755
>> --- a/scripts/qemu-binfmt-conf.sh
>> +++ b/scripts/qemu-binfmt-conf.sh
>> @@ -61,11 +61,11 @@ m68k_family=m68k
>> # FIXME: We could use the other endianness on a MIPS host.
>>
>> mips_magic='\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08'
>>
>> -mips_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
>>
>> +mips_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
>>
>> mips_family=mips
>>
>> mipsel_magic='\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00'
>>
>> -mipsel_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'
>>
>> +mipsel_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xfe\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'
>>
>> mipsel_family=mips
>>
>> mipsn32_magic='\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08'
>>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* qemu-binfmt-conf.sh: mips improvements
2022-03-05 0:06 ` [PATCH v2] " Andreas K. Hüttel
2022-03-05 0:18 ` Philippe Mathieu-Daudé
@ 2022-03-14 21:33 ` Andreas K. Hüttel
2022-03-14 21:33 ` [PATCH v3 1/2] qemu-binfmt-conf.sh: allow elf EI_ABIVERSION=1 for mips Andreas K. Hüttel
2022-03-14 21:33 ` [PATCH v3 2/2] qemu-binfmt-conf.sh: Extend magic to distinguish mips o32 and n32 ABI Andreas K. Hüttel
1 sibling, 2 replies; 9+ messages in thread
From: Andreas K. Hüttel @ 2022-03-14 21:33 UTC (permalink / raw)
To: qemu-devel
Cc: alex.bennee, richard.henderson, philippe.mathieu.daude, laurent
Two patches; the first one has been under review before, the second builds
on it and extends the binfmt-misc magic to differentiate between o32 and
n32 binaries (see also issue 843).
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v3 1/2] qemu-binfmt-conf.sh: allow elf EI_ABIVERSION=1 for mips
2022-03-14 21:33 ` qemu-binfmt-conf.sh: mips improvements Andreas K. Hüttel
@ 2022-03-14 21:33 ` Andreas K. Hüttel
2022-03-23 11:00 ` [PATCH-for-7.0 " Philippe Mathieu-Daudé
2022-03-14 21:33 ` [PATCH v3 2/2] qemu-binfmt-conf.sh: Extend magic to distinguish mips o32 and n32 ABI Andreas K. Hüttel
1 sibling, 1 reply; 9+ messages in thread
From: Andreas K. Hüttel @ 2022-03-14 21:33 UTC (permalink / raw)
To: qemu-devel
Cc: alex.bennee, richard.henderson, philippe.mathieu.daude, laurent,
Andreas K. Hüttel
With the command line flag -mplt and a recent toolchain, ELF binaries
generated by gcc can obtain EI_ABIVERSION=1, see below, which makes, e.g.,
gcc three-stage bootstrap in a mips-unknown-linux-gnu qemu-user chroot
fail since the binfmt-misc magic does not match anymore.
qemu executes these binaries just fine, so relax the mask slightly.
CHOST=mips-unknown-linux-gnu (and also mipsel-unknown-linux-gnu)
CFLAGS="-O2 -march=mips32 -mabi=32 -mplt -pipe"
gcc-11.2, binutils-2.37, glibc-2.34
| /*
| - * ELF dump of './prev-gcc/build/gengenrtl'
| - * 29608 (0x73A8) bytes
| + * ELF dump of './gcc/build/gengenrtl'
| + * 54532 (0xD504) bytes
| */
|
| Elf32_Dyn dumpedelf_dyn_0[];
| struct {
| Elf32_Ehdr ehdr;
| Elf32_Phdr phdrs[12];
| - Elf32_Shdr shdrs[33];
| + Elf32_Shdr shdrs[44];
| Elf32_Dyn *dyns;
| } dumpedelf_0 = {
|
| .ehdr = {
| .e_ident = { /* (EI_NIDENT bytes) */
| /* [0] EI_MAG: */ 0x7F,'E','L','F',
| /* [4] EI_CLASS: */ 1 , /* (ELFCLASS32) */
| /* [5] EI_DATA: */ 2 , /* (ELFDATA2MSB) */
| /* [6] EI_VERSION: */ 1 , /* (EV_CURRENT) */
| /* [7] EI_OSABI: */ 0 , /* (ELFOSABI_NONE) */
| - /* [8] EI_ABIVERSION: */ 0 ,
| + /* [8] EI_ABIVERSION: */ 1 ,
| /* [9-15] EI_PAD: */ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
| },
| .e_type = 2 , /* (ET_EXEC) */
| .e_machine = 8 , /* (EM_MIPS) */
| .e_version = 1 , /* (EV_CURRENT) */
| (...)
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
---
scripts/qemu-binfmt-conf.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
index e9bfeb94d3..fc2f856800 100755
--- a/scripts/qemu-binfmt-conf.sh
+++ b/scripts/qemu-binfmt-conf.sh
@@ -61,11 +61,11 @@ m68k_family=m68k
# FIXME: We could use the other endianness on a MIPS host.
mips_magic='\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08'
-mips_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
+mips_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
mips_family=mips
mipsel_magic='\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00'
-mipsel_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'
+mipsel_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xfe\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'
mipsel_family=mips
mipsn32_magic='\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08'
--
2.34.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH-for-7.0 v3 1/2] qemu-binfmt-conf.sh: allow elf EI_ABIVERSION=1 for mips
2022-03-14 21:33 ` [PATCH v3 1/2] qemu-binfmt-conf.sh: allow elf EI_ABIVERSION=1 for mips Andreas K. Hüttel
@ 2022-03-23 11:00 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 9+ messages in thread
From: Philippe Mathieu-Daudé @ 2022-03-23 11:00 UTC (permalink / raw)
To: laurent, Andreas K. Hüttel, qemu-devel
Cc: alex.bennee, richard.henderson
On 14/3/22 22:33, Andreas K. Hüttel wrote:
> With the command line flag -mplt and a recent toolchain, ELF binaries
> generated by gcc can obtain EI_ABIVERSION=1, see below, which makes, e.g.,
> gcc three-stage bootstrap in a mips-unknown-linux-gnu qemu-user chroot
> fail since the binfmt-misc magic does not match anymore.
>
> qemu executes these binaries just fine, so relax the mask slightly.
>
> CHOST=mips-unknown-linux-gnu (and also mipsel-unknown-linux-gnu)
> CFLAGS="-O2 -march=mips32 -mabi=32 -mplt -pipe"
> gcc-11.2, binutils-2.37, glibc-2.34
>
> | /*
> | - * ELF dump of './prev-gcc/build/gengenrtl'
> | - * 29608 (0x73A8) bytes
> | + * ELF dump of './gcc/build/gengenrtl'
> | + * 54532 (0xD504) bytes
> | */
> |
> | Elf32_Dyn dumpedelf_dyn_0[];
> | struct {
> | Elf32_Ehdr ehdr;
> | Elf32_Phdr phdrs[12];
> | - Elf32_Shdr shdrs[33];
> | + Elf32_Shdr shdrs[44];
> | Elf32_Dyn *dyns;
> | } dumpedelf_0 = {
> |
> | .ehdr = {
> | .e_ident = { /* (EI_NIDENT bytes) */
> | /* [0] EI_MAG: */ 0x7F,'E','L','F',
> | /* [4] EI_CLASS: */ 1 , /* (ELFCLASS32) */
> | /* [5] EI_DATA: */ 2 , /* (ELFDATA2MSB) */
> | /* [6] EI_VERSION: */ 1 , /* (EV_CURRENT) */
> | /* [7] EI_OSABI: */ 0 , /* (ELFOSABI_NONE) */
> | - /* [8] EI_ABIVERSION: */ 0 ,
> | + /* [8] EI_ABIVERSION: */ 1 ,
> | /* [9-15] EI_PAD: */ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
> | },
> | .e_type = 2 , /* (ET_EXEC) */
> | .e_machine = 8 , /* (EM_MIPS) */
> | .e_version = 1 , /* (EV_CURRENT) */
> | (...)
>
> Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
> ---
> scripts/qemu-binfmt-conf.sh | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
> index e9bfeb94d3..fc2f856800 100755
> --- a/scripts/qemu-binfmt-conf.sh
> +++ b/scripts/qemu-binfmt-conf.sh
> @@ -61,11 +61,11 @@ m68k_family=m68k
> # FIXME: We could use the other endianness on a MIPS host.
>
> mips_magic='\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08'
> -mips_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
> +mips_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
> mips_family=mips
>
> mipsel_magic='\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00'
> -mipsel_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'
> +mipsel_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xfe\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'
> mipsel_family=mips
>
> mipsn32_magic='\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08'
It seems this series got lost because you posted iterations as reply to
v1, so v2/v3 ended burried in the thread. Could you repost as v4 in a
new thread?
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Laurent, what do you think about getting this patch for 7.0?
Thanks,
Phil.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v3 2/2] qemu-binfmt-conf.sh: Extend magic to distinguish mips o32 and n32 ABI
2022-03-14 21:33 ` qemu-binfmt-conf.sh: mips improvements Andreas K. Hüttel
2022-03-14 21:33 ` [PATCH v3 1/2] qemu-binfmt-conf.sh: allow elf EI_ABIVERSION=1 for mips Andreas K. Hüttel
@ 2022-03-14 21:33 ` Andreas K. Hüttel
2022-03-22 10:35 ` Philippe Mathieu-Daudé
1 sibling, 1 reply; 9+ messages in thread
From: Andreas K. Hüttel @ 2022-03-14 21:33 UTC (permalink / raw)
To: qemu-devel
Cc: alex.bennee, richard.henderson, philippe.mathieu.daude, laurent,
Andreas K. Hüttel
This information is given by the EF_MIPS_ABI2 (0x20) bit in the
e_flags field of the ELF header (a 4-byte value at offset 0x24 for
the here applicable ELFCLASS32).
See-also: https://www.mail-archive.com/qemu-devel@nongnu.org/msg732572.html
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
---
scripts/qemu-binfmt-conf.sh | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
index fc2f856800..5f44346166 100755
--- a/scripts/qemu-binfmt-conf.sh
+++ b/scripts/qemu-binfmt-conf.sh
@@ -60,20 +60,20 @@ m68k_family=m68k
# FIXME: We could use the other endianness on a MIPS host.
-mips_magic='\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08'
-mips_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
+mips_magic='\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
+mips_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20'
mips_family=mips
-mipsel_magic='\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00'
-mipsel_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xfe\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'
+mipsel_magic='\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
+mipsel_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xfe\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00'
mipsel_family=mips
-mipsn32_magic='\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08'
-mipsn32_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
+mipsn32_magic='\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20'
+mipsn32_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20'
mipsn32_family=mips
-mipsn32el_magic='\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00'
-mipsn32el_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'
+mipsn32el_magic='\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00'
+mipsn32el_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xfe\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00'
mipsn32el_family=mips
mips64_magic='\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08'
--
2.34.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v3 2/2] qemu-binfmt-conf.sh: Extend magic to distinguish mips o32 and n32 ABI
2022-03-14 21:33 ` [PATCH v3 2/2] qemu-binfmt-conf.sh: Extend magic to distinguish mips o32 and n32 ABI Andreas K. Hüttel
@ 2022-03-22 10:35 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 9+ messages in thread
From: Philippe Mathieu-Daudé @ 2022-03-22 10:35 UTC (permalink / raw)
To: Andreas K. Hüttel, qemu-devel
Cc: alex.bennee, richard.henderson, laurent
On 14/3/22 22:33, Andreas K. Hüttel wrote:
> This information is given by the EF_MIPS_ABI2 (0x20) bit in the
> e_flags field of the ELF header (a 4-byte value at offset 0x24 for
> the here applicable ELFCLASS32).
>
> See-also: https://www.mail-archive.com/qemu-devel@nongnu.org/msg732572.html
This is commit ace3d65459 ("linux-user: detect mismatched ELF ABI
in qemu-mips[n32][el]").
> Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
> ---
> scripts/qemu-binfmt-conf.sh | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
> index fc2f856800..5f44346166 100755
> --- a/scripts/qemu-binfmt-conf.sh
> +++ b/scripts/qemu-binfmt-conf.sh
> @@ -60,20 +60,20 @@ m68k_family=m68k
>
> # FIXME: We could use the other endianness on a MIPS host.
>
> -mips_magic='\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08'
> -mips_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
> +mips_magic='\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
> +mips_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20'
> mips_family=mips
>
> -mipsel_magic='\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00'
> -mipsel_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xfe\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'
> +mipsel_magic='\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
> +mipsel_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xfe\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00'
> mipsel_family=mips
>
> -mipsn32_magic='\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08'
> -mipsn32_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
> +mipsn32_magic='\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20'
> +mipsn32_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20'
> mipsn32_family=mips
>
> -mipsn32el_magic='\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00'
> -mipsn32el_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'
> +mipsn32el_magic='\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00'
> +mipsn32el_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xfe\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00'
> mipsn32el_family=mips
>
> mips64_magic='\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08'
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-03-23 11:06 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-03 10:17 [PATCH] qemu-binfmt-conf.sh: allow elf EI_ABIVERSION=1 for mips Andreas K. Hüttel
2022-03-05 0:06 ` [PATCH v2] " Andreas K. Hüttel
2022-03-05 0:18 ` Philippe Mathieu-Daudé
2022-03-06 23:54 ` Philippe Mathieu-Daudé
2022-03-14 21:33 ` qemu-binfmt-conf.sh: mips improvements Andreas K. Hüttel
2022-03-14 21:33 ` [PATCH v3 1/2] qemu-binfmt-conf.sh: allow elf EI_ABIVERSION=1 for mips Andreas K. Hüttel
2022-03-23 11:00 ` [PATCH-for-7.0 " Philippe Mathieu-Daudé
2022-03-14 21:33 ` [PATCH v3 2/2] qemu-binfmt-conf.sh: Extend magic to distinguish mips o32 and n32 ABI Andreas K. Hüttel
2022-03-22 10:35 ` Philippe Mathieu-Daudé
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.