From patchwork Tue Feb 12 07:48:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 158130 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3537310jaa; Mon, 11 Feb 2019 23:51:43 -0800 (PST) X-Google-Smtp-Source: AHgI3IajZdH5bNcEfbF2Q7pf0BfB8clLOEI2KyFexlObueaTYUort6xx5lY/AzHHS1Ni5JA16BBg X-Received: by 2002:a25:5017:: with SMTP id e23mr1754349ybb.407.1549957902948; Mon, 11 Feb 2019 23:51:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549957902; cv=none; d=google.com; s=arc-20160816; b=xluVn7RIS1OHE2imcjMP+l4cc3h9UiTIfe+uY22AXvi49WHcIWEyH8dmBOZlIbXmmZ YetQ5YB3BnqP4GdK55/fuWXW2iGsOf1NQD93fCGnfwF9hepKuDXTfqWnNJAaoOUonUCn GYJW8wHWLOZ94lUMqb65GJrkQhJ9QbcZqVYJjg5GiQ5r/wY7IMEriHrhkbbJfkDAs1Mh XpaOi2y5oOBz/usPRVgUbMu15NU0TJBK1Yid+WC+3VnP0M2TXGdvKHzl1yRe39pS2ssg xHRf5uGQB575bmLj5qkF8pX114PtRYRQmPSOCN9RXxIrIEgUpBsJGNT12mDwbbNjFwag F+sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=8VR2NCBStrzK5fg9pKiT2jRDK0BBrG59FKQTP8Fe2kc=; b=FoeBaGgyq/TTmv4gLiLJI1jAJ5AppsmngxFfeHLOX1GHZxKCIMmLDC6JhMW1gKgcU5 BtEj4Y8nuwhSfDn5hOSULCVUnLBVo2yhRW8yFH1rj9BU6yaAzc9AuXGgu7fHYWymX4M9 jSCCx1A0sNxg8q3TjmRnjg8DLPaDLV/GqRNuME+2aeGtHT6sYjBhHyanWk5mf+FFwN0+ uRe/Xi1qxwCVhXamM07UHL56fzfgcbzspfkLdKo/ELlIX4Nh251pgjbxAr21tXQ3jGMQ T8O8tj3dZ51Zo+tmO/nBdB3WcFbzpji21x2/jJari2pCHdFvkewdRC91cd8zRvNnwXlF vPjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LhsLS70k; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a8si7541552ybk.312.2019.02.11.23.51.42 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 11 Feb 2019 23:51:42 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LhsLS70k; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:35193 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtSr0-0005oh-Iz for patch@linaro.org; Tue, 12 Feb 2019 02:51:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46627) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtSoH-0004DP-1X for qemu-devel@nongnu.org; Tue, 12 Feb 2019 02:48:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtSoF-0005xA-6C for qemu-devel@nongnu.org; Tue, 12 Feb 2019 02:48:52 -0500 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]:44338) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtSoE-0005pL-Pr for qemu-devel@nongnu.org; Tue, 12 Feb 2019 02:48:51 -0500 Received: by mail-pg1-x544.google.com with SMTP id y1so860801pgk.11 for ; Mon, 11 Feb 2019 23:48:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8VR2NCBStrzK5fg9pKiT2jRDK0BBrG59FKQTP8Fe2kc=; b=LhsLS70kgj/RdIrmlBo6//j//aOLLWl5Wn9Go8Wqcjx4bXDGgdZXjB9+Wi5OdXdybd 4nY+4c2/seoObNh4gEDleTnVBXVMO7rCSA2Y8Rbn8K687jRvlsEjSDFz1UScCtWzvoi6 tq1zfmMOAeFr6zp2pJFgHcRbFZMWoWvx+xCn0JMtk0VT0zN4bSArV1kupWZ8mf7t3Te+ 5m7IXPJw6NDGUgR3Sz5Uv849e/5XqJx7HE5YQWt7aFxP6AyPwZUtTs0cUeReP72LE+wt yDnoWkINh4dD+VR7CwqgKBf/AbDbbXhCj1M1/s3uER5NhWrZcUhc3IazoLrXguc43E0o aayg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8VR2NCBStrzK5fg9pKiT2jRDK0BBrG59FKQTP8Fe2kc=; b=mDHs3kSqyQmEB8yPeDmvUgZSJRdgQZHJ3O/Ayi31fLRteCviZY+aYZXEEv0Y35NYeI ez6W8cEhXUzTGZ0QwG8x1rhgNM9CUKXQ2XUvB6a3z61Jk7fvtWnFw6XkYEdeHVmv355g Z+yoA8gtlY5DNnJw/LfSYvS7T/DUwyn8xHkmYpxiyflHcL2HJ3LsXtpTYiKwynoQQ0fO nE/LsGdgZJBuvRvWpGXd+wE/MjxdHWJsONoJRh0YjR/u/+waunOSe0uMi887Wb3fasvR KLxkOdYiw9m3mGmLhkB8nGoi3CE4URKg0Hl5+w/Y/O8I3d89syAiKmI+cJpSvqF9XKw8 10FA== X-Gm-Message-State: AHQUAuYjJxoY/pv5c+y97h6GB8lqazXhStPUx5QljQ0fK/w5axo9lOXI 8Y2mQ0g7SkHxakhOASbo8XBXf+swYHw= X-Received: by 2002:a65:5c02:: with SMTP id u2mr2419976pgr.13.1549957723505; Mon, 11 Feb 2019 23:48:43 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id z62sm20975215pfi.4.2019.02.11.23.48.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 23:48:42 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 11 Feb 2019 23:48:39 -0800 Message-Id: <20190212074840.13542-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190212074840.13542-1-richard.henderson@linaro.org> References: <20190212074840.13542-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::544 Subject: [Qemu-devel] [PATCH v2 1/2] linux-user: Add ELF_PLATFORM for arm 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: qemu-arm@nongnu.org, laurent@vivier.eu Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The 32-bit kernel has strings for v4, v5, v6, v7, v7m. The 64-bit kernel, in compat mode, has strings for v8. Fixes: https://bugs.launchpad.net/bugs/1813034 Signed-off-by: Richard Henderson --- v2: Include v8. --- linux-user/elfload.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) -- 2.17.2 Reviewed-by: Laurent Vivier diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 775a36ccdd..d796d51ec6 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -500,6 +500,37 @@ static uint32_t get_elf_hwcap2(void) #undef GET_FEATURE #undef GET_FEATURE_ID +#define ELF_PLATFORM get_elf_platform() + +static const char *get_elf_platform(void) +{ + CPUARMState *env = thread_cpu->env_ptr; + +#ifdef TARGET_WORDS_BIGENDIAN +# define END "b" +#else +# define END "l" +#endif + + if (arm_feature(env, ARM_FEATURE_V8)) { + return "v8" END; + } else if (arm_feature(env, ARM_FEATURE_V7)) { + if (arm_feature(env, ARM_FEATURE_M)) { + return "v7m" END; + } else { + return "v7" END; + } + } else if (arm_feature(env, ARM_FEATURE_V6)) { + return "v6" END; + } else if (arm_feature(env, ARM_FEATURE_V5)) { + return "v5" END; + } else { + return "v4" END; + } + +#undef END +} + #else /* 64 bit ARM definitions */ #define ELF_START_MMAP 0x80000000 From patchwork Tue Feb 12 07:48:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 158128 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3535609jaa; Mon, 11 Feb 2019 23:49:11 -0800 (PST) X-Google-Smtp-Source: AHgI3IYpRFLmWxsEIzuI30162Qa1aubdBwoq+WKryqpqf4MFnfKl2MfcmmjQ7z/3kfunIBtkA3AD X-Received: by 2002:a5b:542:: with SMTP id r2mr1910431ybp.174.1549957751650; Mon, 11 Feb 2019 23:49:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549957751; cv=none; d=google.com; s=arc-20160816; b=cSAIGwqKD1aPzqdlV7hut4erZ8I0EPzs9RYhgq0IxcaifcQLbPy0rgik9MPJtCJbrU BstYxAknGIWTbruIl21KUq1M3ChE6AValZecHaHSDKroTEjY0eP0Ut+g+YMe09SUf3Dq YiiqRnIAUMbAPneb/NXBVlBIJbJqEnYXMZLHghCCv272M+EgkOlsxc8u8X5WxRqGAulU FrH4iRZX/O57AflUtSTw5sn+HUMMwLM8qyb8RLFc9TNggClsPV9L1+DojiKUUFIqInWW GDPogjfryfGR7ivjhLaUlFbaZvs1Wp8qSqFWp/vLHsfDlXcpRQUA8L/BuwBLzhq10Mnf X01w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=gyJVYE+RE6Pw9+PF2rtBoB0FqLzSP0m28mCpgAHUQbw=; b=KTYfQjQg0voVFl19mxqtFVOBEv0+COxdD0WTCQgsttFzDUBEdeoLtWNHU/EGem2eS3 Qbzu9u9xMvZJ1j20UyueWuLfZD6WE6WXuYEgD9BEj+SJU9LaKwfIg9rcdYt0+C1qlcWF v0E8ad7rGCYfciuIj3943g7FjTAmnTKHhbznQPPWTz9HWWQj/wyDyDvjGjRYosR1eB9X rTjiIXAEOymIIu+gCb6uHSt8UK50Nh6lleRXDRePC7ho7UOOqY2YDh2uDIvDiviah3yp eH4xizslR2s3Xd1nps004St9kEYA00sUf+oq+AV+SdZfBMF2iZ6aLVz5l3DgCvNBsESN /20w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=S7vVCiXk; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u12si6935663ybp.155.2019.02.11.23.49.11 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 11 Feb 2019 23:49:11 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=S7vVCiXk; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:35135 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtSoZ-0004Do-6J for patch@linaro.org; Tue, 12 Feb 2019 02:49:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46620) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtSoG-0004DM-VK for qemu-devel@nongnu.org; Tue, 12 Feb 2019 02:48:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtSoF-0005wq-2m for qemu-devel@nongnu.org; Tue, 12 Feb 2019 02:48:52 -0500 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:44337) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtSoE-0005qP-PV for qemu-devel@nongnu.org; Tue, 12 Feb 2019 02:48:50 -0500 Received: by mail-pg1-x542.google.com with SMTP id y1so860812pgk.11 for ; Mon, 11 Feb 2019 23:48:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gyJVYE+RE6Pw9+PF2rtBoB0FqLzSP0m28mCpgAHUQbw=; b=S7vVCiXk3OO+nX/VPyM/Zd2KHHVsBfQ6lGJtvHYYJ9widL1uez1CLPHQBAnXOx46AS BWaOCqhpIsqaWWz03++vZ1pACXIt2HRDRXWVg85OTv8SSbADgdbi/fbVGPAUvjydn3UQ SLqbUOw9Uud+K9wtfioF6eypJCk/mIHsVpFFbMbAtAcb9nLcjEja2LZbk0iy6btho0da hB0CoPZPPLuTAhWRysyKqbsSBwZZqaebpx/1CrZwv49sQYBo6cDFXLTyQYh/Ful403wg GTOS9WyZgbkeS4ZjIa1KQI0lKycX5wQ1r5Vh4Gtox5i2/q2qdu3dmhe+EGG42dZ7g3UI Akyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gyJVYE+RE6Pw9+PF2rtBoB0FqLzSP0m28mCpgAHUQbw=; b=lHFi2fI/+6bye3UJtlVcpqJjUf8lK8TE+m3mNZyd4/7m8Ju8qhtINkabQ29BI1QaeO Kk/SThZ+FYT7g8//l3cUERm9wEPVhJ68tC0QhsvIjQYB0wxrnirY7AHcfsD19HQc4Yev X7jT87Z0MOJKuMGsEfOzEIqSRlkweszzLBiWudPk5tuAvYZIQr4yxn+GDfYxLTVM/q3/ cLBxVl0JSSvVCrgQNZi+B5iVaZitX7xMIUHzPXtTc5CbfznCKbnvAfgyXw7SErzUqysB wxv9yFnWjP6O5IA3F4e7WbJzcAp46sqyL8v4TBNe0b7lKkjL6hnhtHWeXPLgqsH3wfcp vmfA== X-Gm-Message-State: AHQUAuYItAtzMeW+88/KSJEmwbFO0h2NbWQPXsSU9HA2n01/6VaTjP7K lhhs2IA6BwFBGnbmf+JsFcEMIRlYcC4= X-Received: by 2002:a65:610f:: with SMTP id z15mr2386629pgu.153.1549957724619; Mon, 11 Feb 2019 23:48:44 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id z62sm20975215pfi.4.2019.02.11.23.48.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 23:48:43 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 11 Feb 2019 23:48:40 -0800 Message-Id: <20190212074840.13542-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190212074840.13542-1-richard.henderson@linaro.org> References: <20190212074840.13542-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::542 Subject: [Qemu-devel] [PATCH v2 2/2] linux-user: Fix ELF_PLATFORM for aarch64_be-linux-user 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: qemu-arm@nongnu.org, laurent@vivier.eu Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- linux-user/elfload.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -- 2.17.2 Reviewed-by: Laurent Vivier diff --git a/linux-user/elfload.c b/linux-user/elfload.c index d796d51ec6..5aa0628ae9 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -537,7 +537,11 @@ static const char *get_elf_platform(void) #define ELF_ARCH EM_AARCH64 #define ELF_CLASS ELFCLASS64 -#define ELF_PLATFORM "aarch64" +#ifdef TARGET_WORDS_BIGENDIAN +# define ELF_PLATFORM "aarch64_be" +#else +# define ELF_PLATFORM "aarch64" +#endif static inline void init_thread(struct target_pt_regs *regs, struct image_info *infop)