From patchwork Thu May 3 21:38:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 908316 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40cTCx64R9z9s4r for ; Fri, 4 May 2018 07:43:25 +1000 (AEST) Received: from localhost ([::1]:59219 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEM0Z-0007Vb-FJ for incoming@patchwork.ozlabs.org; Thu, 03 May 2018 17:43:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54861) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fELwq-0004jQ-97 for qemu-devel@nongnu.org; Thu, 03 May 2018 17:39:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fELwm-00059B-48 for qemu-devel@nongnu.org; Thu, 03 May 2018 17:39:32 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:57917) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fELwl-00056q-Qf for qemu-devel@nongnu.org; Thu, 03 May 2018 17:39:28 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0LnShi-1ehncU28AY-00heMa; Thu, 03 May 2018 23:39:12 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 3 May 2018 23:38:59 +0200 Message-Id: <20180503213903.30335-3-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180503213903.30335-1-laurent@vivier.eu> References: <20180503213903.30335-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:3YDDdwNbwj/icOaSG7yHKauSRBcv9ZjiTvFCsozlYFEhizF4PPR 9dBN+4WGuFReBG7lhT+aJG+5tIP98Q3Io9UfJ5Go3SMwzl/3LG5Hzd3Gl2I6MvQ/OFV/0hH yFJzzsIV5S5jhoud2udjuO82H7I69Z29vIiMJ6eh2f+tWju8syEgEQ0rDKIrV1jFD4llAKj nU33SjuuaTqY/3Tg5TVbQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:UBUFxmVQr9Q=:GCg0lI/dGZcqWv+Lz2o5f8 6m7MjRUa/Cc4tT+wy/6BYfIPXnLeyt+G50r91X1L7XtJMRsRDRbjaHdsgxHQ4ms/RWFBoQUOc wue94Gq+4Ur2QrqvibC7N3WyRpncZNarLNBfQzfcG3Co22QwFE2FG2RtYmBdhpuX+364MdwME 3CobaLv+BuTzaXMMnPJiM0Z4f0jTZrwGkuzfdMSwaBXT/7fz4yT6WXEDgtVvYvdwLP1WnH4Lw 4nNUkZ22Dxg7jzriOH6oqwRpbPTKi2jxU3RpVFFNJxaBCDGatkiBsr1YXmAa+8MlGy1WywaXb cojF60PPKY8BehXaOObWuCzkbX9MG/e7yHU1lmRVtMBj1JP53EYWc4kCgiDTBnS7t8sdzBgsA dOTcOOGQQWOjHpfFMko7iEnWTRyqLjOU3moaxoG7rX0wj4GS3znUVEvl2xN8KL6YqYKYjggS+ 8mJO5kbIE6Tf28HWsQKgnsq2j2b7s2A3CXRm32m4I2xf4Y/s8qUbDGN+ZYZ1URwVAGkTEbMk7 HzVJQfCUyVeBgoPpC3n3AkCkbkP8MwZH34IpUy+0VkhA9koMq0xBtxyAUoCcPh8EiLAO/tZUZ SqLbSKU6AhZfUpSgOgK1US8QPdXuPa3bMMNcJBUz9heqK0NTdFQ9ByFJJJQqPvbX40pXRviWe WCrQK8nqKFYz/wBubgvkDfNUrp5c8SySK0mLJeOYUOMRPpKhIzJT2DOmSMRATJv2KA2hNDfxP Ot6Q1Ug9aTv6hro7 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.75 Subject: [Qemu-devel] [PULL 2/6] linux-user: ARM-FDPIC: Identify ARM FDPIC binaries 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: Christophe Lyon , Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Christophe Lyon Define an ARM-specific version of elf_is_fdpic: FDPIC ELF objects are identified with e_ident[EI_OSABI] == ELFOSABI_ARM_FDPIC. Co-Authored-By: Mickaël Guêné Signed-off-by: Christophe Lyon Reviewed-by: Peter Maydell Message-Id: <20180430080404.7323-3-christophe.lyon@st.com> Signed-off-by: Laurent Vivier --- include/elf.h | 1 + linux-user/elfload.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/include/elf.h b/include/elf.h index c0dc9bb5fd..934dbbd6b3 100644 --- a/include/elf.h +++ b/include/elf.h @@ -1483,6 +1483,7 @@ typedef struct elf64_shdr { #define ELFOSABI_TRU64 10 /* Compaq TRU64 UNIX. */ #define ELFOSABI_MODESTO 11 /* Novell Modesto. */ #define ELFOSABI_OPENBSD 12 /* OpenBSD. */ +#define ELFOSABI_ARM_FDPIC 65 /* ARM FDPIC */ #define ELFOSABI_ARM 97 /* ARM */ #define ELFOSABI_STANDALONE 255 /* Standalone (embedded) application */ diff --git a/linux-user/elfload.c b/linux-user/elfload.c index bbe93b03b6..76d7718b3d 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1681,11 +1681,18 @@ static void zero_bss(abi_ulong elf_bss, abi_ulong last_bss, int prot) } } +#ifdef TARGET_ARM +static int elf_is_fdpic(struct elfhdr *exec) +{ + return exec->e_ident[EI_OSABI] == ELFOSABI_ARM_FDPIC; +} +#else /* Default implementation, always false. */ static int elf_is_fdpic(struct elfhdr *exec) { return 0; } +#endif static abi_ulong loader_build_fdpic_loadmap(struct image_info *info, abi_ulong sp) {