From nobody Wed May 8 19:23:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1528228160296481.178444264327; Tue, 5 Jun 2018 12:49:20 -0700 (PDT) Received: from localhost ([::1]:48788 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQHx8-0004Qv-H6 for importer@patchew.org; Tue, 05 Jun 2018 15:49:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50837) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQHvq-0003pU-Ki for qemu-devel@nongnu.org; Tue, 05 Jun 2018 15:47:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fQHvn-000178-J8 for qemu-devel@nongnu.org; Tue, 05 Jun 2018 15:47:50 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:55971) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fQHvn-00015x-8B for qemu-devel@nongnu.org; Tue, 05 Jun 2018 15:47:47 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MW3dQ-1foOMC37EG-00X4SP; Tue, 05 Jun 2018 21:47:36 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 5 Jun 2018 21:47:25 +0200 Message-Id: <20180605194725.8585-1-laurent@vivier.eu> X-Mailer: git-send-email 2.14.4 X-Provags-ID: V03:K1:fj6p5Zxoj3bVizQUgJ3OaJsz6yonS8b+GT8bnyGslTd+tLUM5tl MWmRsjypGkzc4friRyY/fhuvrts+GzrIOwlKlpOK/Sy/RJ2CkbyysU8pc6HZ2dF0LsJKZYG x/SdugJcbu9rn41BFo/NLWwIu5zrrZyXfsoQjAlOamPKou7pxpEzfFf/io8O/6g4ngjOs8A QOV808gDMw6q+BtvO21hw== X-UI-Out-Filterresults: notjunk:1;V01:K0:GRDAq8ooW/4=:Lkgbv3y2Y10AyLMzRFLB8d czaSXZUmNvcCTycdoQZ1zoVQJtlaumsS+8mt5ErXFXJfoxp32pFShVcs3ROXHzo+MKdFVjYdU cnjgtz4R6hIlwh6mN/YX+vqw9pr4aXVo8WuOwiJVUhA8mEi5ULs0QO3XPz1l4owPry/yqruLV 9lv13GSyH2k6thZ1uSPYlq9c69b1AP0wXpmL5dATM1VEvShpvwHu7Dbk/hCe/LQttSd6hxDe0 3Oqx5Nn64gUnPk9DgFsB6hrPic2ixSChgm/nzvKXEJ5ELTEqgBTL51vxq8W+XDo/q5eBdwb5m fkmavKrYxmnN4X3olG6tpIa3wJOag1KyIEpag9KGj5VwxDzLVeCG6drP2TYrT8aMwWsihZRLs hxZwKxDwj6+LyBZwrTtwe4ePjTWCXRN4lI2zbngnIe6qbZQ7GzXi83O3TLtPstZI+p8iCpkQY DDGtNvKK4SX3IH/EwxiXkGUbT/4vP70jRDXPeECMDU6igl0h4ehaXhbxqIaldv+37zzOOv6mg ksOUSvUBnuLmkj/CEfLxnzd/0ZkCV9aJZ82S9ReYdjxnsnKcTMyDO1G6ADQ36Lzb5zaRpjZXr x09FWCLCnlhVOW/5GYmT3QFFGqSOF+knUXlJrsqwZwW3TfA8MS8/a+rl1XPCQuXeBgfNrVX68 SjKGQnmAITfpkaN9jOlJkNOvmjlzPAoA0y0rFJKkIx2KuRn1rs8jBTPCK/8u7d4U1REo= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.187 Subject: [Qemu-devel] [PATCH] qemu-binfmt-conf.sh: ignore the OS/ABI field X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Most of the binaries have a value of "UNIX - System V" for the OS/ABI. But cc1 has a value of "UNIX - GNU", and if we don't update the binfmt mask to ignore the OS/ABI field, gcc fails to execute it: gcc: error trying to exec '/usr/lib/gcc/m68k-linux-gnu/7/cc1': execv: Exec = format error Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- scripts/qemu-binfmt-conf.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh index 7ab7435fbd..d7eefda0b8 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -7,15 +7,15 @@ mips mipsel mipsn32 mipsn32el mips64 mips64el \ sh4 sh4eb s390x aarch64 aarch64_be hppa riscv32 riscv64 xtensa xtensaeb mi= croblaze microblazeel" =20 i386_magic=3D'\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\= x00\x03\x00' -i386_mask=3D'\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\= xff\xfe\xff\xff\xff' +i386_mask=3D'\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\= xff\xfe\xff\xff\xff' i386_family=3Di386 =20 i486_magic=3D'\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\= x00\x06\x00' -i486_mask=3D'\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\= xff\xfe\xff\xff\xff' +i486_mask=3D'\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\= xff\xfe\xff\xff\xff' i486_family=3Di386 =20 alpha_magic=3D'\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02= \x00\x26\x90' -alpha_mask=3D'\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff= \xff\xfe\xff\xff\xff' +alpha_mask=3D'\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff= \xff\xfe\xff\xff\xff' alpha_family=3Dalpha =20 arm_magic=3D'\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x= 00\x28\x00' @@ -27,11 +27,11 @@ armeb_mask=3D'\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\= xff\xff\xff\xff\xff\xff\xff armeb_family=3Darmeb =20 sparc_magic=3D'\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00= \x02\x00\x02' -sparc_mask=3D'\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff= \xff\xff\xfe\xff\xff' +sparc_mask=3D'\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff= \xff\xff\xfe\xff\xff' sparc_family=3Dsparc =20 sparc32plus_magic=3D'\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x= 00\x00\x02\x00\x12' -sparc32plus_mask=3D'\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x= ff\xff\xff\xff\xfe\xff\xff' +sparc32plus_mask=3D'\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\x= ff\xff\xff\xff\xfe\xff\xff' sparc32plus_family=3Dsparc =20 ppc_magic=3D'\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x= 02\x00\x14' @@ -47,7 +47,7 @@ ppc64le_mask=3D'\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\= xff\xff\xff\xff\xff\xff\x ppc64le_family=3Dppcle =20 m68k_magic=3D'\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\= x02\x00\x04' -m68k_mask=3D'\xff\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\= xff\xff\xfe\xff\xff' +m68k_mask=3D'\xff\xff\xff\xff\xff\xff\xfe\x00\xff\xff\xff\xff\xff\xff\xff\= xff\xff\xfe\xff\xff' m68k_family=3Dm68k =20 # FIXME: We could use the other endianness on a MIPS host. @@ -77,15 +77,15 @@ mips64el_mask=3D'\xff\xff\xff\xff\xff\xff\xff\x00\xff\x= ff\xff\xff\xff\xff\xff\xff\ mips64el_family=3Dmips =20 sh4_magic=3D'\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x= 00\x2a\x00' -sh4_mask=3D'\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x= ff\xfe\xff\xff\xff' +sh4_mask=3D'\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\x= ff\xfe\xff\xff\xff' sh4_family=3Dsh4 =20 sh4eb_magic=3D'\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00= \x02\x00\x2a' -sh4eb_mask=3D'\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff= \xff\xff\xfe\xff\xff' +sh4eb_mask=3D'\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff= \xff\xff\xfe\xff\xff' sh4eb_family=3Dsh4 =20 s390x_magic=3D'\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00= \x02\x00\x16' -s390x_mask=3D'\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff= \xff\xff\xfe\xff\xff' +s390x_mask=3D'\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff= \xff\xff\xfe\xff\xff' s390x_family=3Ds390x =20 aarch64_magic=3D'\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x= 02\x00\xb7\x00' --=20 2.14.4