From nobody Sat Nov 15 10:37:17 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1754185427; cv=none; d=zohomail.com; s=zohoarc; b=aLFDWfLqqfIO98UsgshWSHQPkQUUcy38glSXJGzCVlf1XMSjdqqpyGdqtH5MCwBlVNRm333n3m5Av33Uk3totCLTrZk8hjmgKrtSVMltboeYQzMQYzx6N2Gqq3jxV05EPRpj+mfTjV07oEOVetp0KfmVkcgoPK1UhfsnmbT9nwE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754185427; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=tUId5F6z2x4/S6lLBlgo51rNHngTmeRrnS/Doi1yk0A=; b=F2plipTf9OIdLjucWmihho8DU8JxKCT0D6tlOChfJoKzV9p5IcFBanlzZ8QXnj25vwg2sfIGOqKmoQUaZtamymJSnRdC5V7M1LmOPxa4c/5r88QE77vXE/3Qk920kCPczPKVhPOiaVUTC793nhxR3ADRpFm+KKvFIWxNgwAAtIU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1754185427950500.65292092261745; Sat, 2 Aug 2025 18:43:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uiNit-0007U4-PF; Sat, 02 Aug 2025 21:41:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uiNiq-0007Qr-RG for qemu-devel@nongnu.org; Sat, 02 Aug 2025 21:41:13 -0400 Received: from mail-yw1-x1134.google.com ([2607:f8b0:4864:20::1134]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uiNip-0004gm-C7 for qemu-devel@nongnu.org; Sat, 02 Aug 2025 21:41:12 -0400 Received: by mail-yw1-x1134.google.com with SMTP id 00721157ae682-71b691a40a8so21544687b3.2 for ; Sat, 02 Aug 2025 18:41:10 -0700 (PDT) Received: from stoup.. ([172.58.111.133]) by smtp.gmail.com with ESMTPSA id 00721157ae682-71b5a6031a1sm18753227b3.86.2025.08.02.18.41.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Aug 2025 18:41:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1754185270; x=1754790070; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tUId5F6z2x4/S6lLBlgo51rNHngTmeRrnS/Doi1yk0A=; b=sdnJQf6CZWwbbjELZeotEPvL4YA0/uzbjAo+Rdy6o9pUKHTGL3aM9CehfGSPqWiD21 dpCQKhofeEIGXbdiFmJzYnv+HVi63p35bnELB00tF5OB3u5eLN7E7oPtzCRpxg6ovM62 PyKyohAgPWlj6oJzd3vadvaMgg0Era1BVDmzusT6HOD716kQ3fZ/QkwMdf+i7+yjrATc Fe3cDNXeyr5rvIfcsXTmPjvfqLegzEl3Lq1zk+1r0PP0d6xASUeQAFdZBfIeMKI2mVsB jVpRtg718XV/Zs7afxndAzzBJ39w5uga5BBDbUkLXiQnedvBOKXubnPkidV+w2zIZu9m FSZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754185270; x=1754790070; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tUId5F6z2x4/S6lLBlgo51rNHngTmeRrnS/Doi1yk0A=; b=nXaWY8ATgWgePIhQB6j9HxWWxWI5anZ8vTCLnXmBXW/bOSTSAIkfP+Sph8XuJjhJiH KRUH6kQZqD0GuVDkTVqh3Ecft0mfCLdQX+6xteWZeJldWCOU5ilTIvk49kHDr5NPKFBu ru20r5lVp9mVu0Qyn60GReraOxZb7A8124KfzH0UNmccy6M/rhmxQ4Ec95aQ9IIy8vGm lLv43VJm0rzMSC+xk5dyz3vCpbSlBxq4hjk2+9izPpftYewZ5cjodCa/RvbNPUqdkU8y Ql2huSVzM8vZU9LBNWj7dabpHs2TtJbvWcOmdBH8k6fsodFWH0dfRa0Er5JZ4E7EBVeN gpTQ== X-Gm-Message-State: AOJu0YxNMsEHlHELX2dR4tMqjVrLxchZ/1UcWNhPLw4ajJh940Ry6kEl E97sRGX3leW8M1/RKZUOfOZ2VNDWIRHhpD2Z/u6iP5PTCgcsgiO1gYD92E5+Jj7Pu4fi7ugg+XB diAZny5E= X-Gm-Gg: ASbGncteZojhpPhnE+tyAG3jqdjsuiNb6jY3PolXxyoDfFgPNupj5UukHPAMs1Odgbd S+edUuBBu+ckV+9tcmKqiV53dEqefrT12WcsIxjQLr+23Ay1YUsuqO8ZCx4kF8G1RIlMGT1bx48 vOzyLz+CIyxbtj/Kt1umcYjhAJVc2SraAnKjhTM+WGQ+y3raDSPa77xHB3pqMfyCeY6vqnRdukz +qdD45oYCHk0w1lc5Z2lex0wspvfvc3C903litsXoFJyboqzDHiTqa4zeR9k7Yyh7qkz6vQLTkJ /EhZblEWR1M25fhdRphkCmNaLunoYyK2ZAb+Js/vozNHD+Z4QkSSgsW2Nx1ZkUNEYuuOA/ASVGI J1U838vLxs7A+R89UErmTKN9C6+akCorsqUcp8nSk3Le5k/oidUPKOP0/SNUK+Og= X-Google-Smtp-Source: AGHT+IHc5sazqexzGqAAVCEhhqq1068iphfmrDRigV+yvwhxVwmBYnu5Lbn6yAHDG6dEwpoMOuzkBw== X-Received: by 2002:a05:690c:3382:b0:719:edff:65a3 with SMTP id 00721157ae682-71b7ef6d3efmr63890327b3.29.1754185270289; Sat, 02 Aug 2025 18:41:10 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 10/11] linux-user: Change exported get_elf_hwcap to abi_ulong Date: Sun, 3 Aug 2025 11:40:18 +1000 Message-ID: <20250803014019.416797-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250803014019.416797-1-richard.henderson@linaro.org> References: <20250803014019.416797-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1134; envelope-from=richard.henderson@linaro.org; helo=mail-yw1-x1134.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1754185430425124100 Content-Type: text/plain; charset="utf-8" AArch64 is about to add the first 64-bit hwcap bit, so we have to expand the return type. Since the only user assigns this to a abi_ulong, match that type. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- linux-user/loader.h | 2 +- linux-user/elfload.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/linux-user/loader.h b/linux-user/loader.h index e102e6f410..e1badd4393 100644 --- a/linux-user/loader.h +++ b/linux-user/loader.h @@ -99,7 +99,7 @@ abi_long memcpy_to_target(abi_ulong dest, const void *src, extern unsigned long guest_stack_size; =20 #if defined(TARGET_S390X) || defined(TARGET_AARCH64) || defined(TARGET_ARM) -uint32_t get_elf_hwcap(void); +abi_ulong get_elf_hwcap(void); const char *elf_hwcap_str(uint32_t bit); #endif #if defined(TARGET_AARCH64) || defined(TARGET_ARM) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index baa618d6c2..4ab6bcd50d 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -511,10 +511,10 @@ static bool init_guest_commpage(void) #define ELF_HWCAP get_elf_hwcap() #define ELF_HWCAP2 get_elf_hwcap2() =20 -uint32_t get_elf_hwcap(void) +abi_ulong get_elf_hwcap(void) { ARMCPU *cpu =3D ARM_CPU(thread_cpu); - uint32_t hwcaps =3D 0; + abi_ulong hwcaps =3D 0; =20 hwcaps |=3D ARM_HWCAP_ARM_SWP; hwcaps |=3D ARM_HWCAP_ARM_HALF; @@ -841,10 +841,10 @@ enum { #define GET_FEATURE_ID(feat, hwcap) \ do { if (cpu_isar_feature(feat, cpu)) { hwcaps |=3D hwcap; } } while (= 0) =20 -uint32_t get_elf_hwcap(void) +abi_ulong get_elf_hwcap(void) { ARMCPU *cpu =3D ARM_CPU(thread_cpu); - uint32_t hwcaps =3D 0; + abi_ulong hwcaps =3D 0; =20 hwcaps |=3D ARM_HWCAP_A64_FP; hwcaps |=3D ARM_HWCAP_A64_ASIMD; @@ -1825,7 +1825,7 @@ static inline void init_thread(struct target_pt_regs = *regs, #define GET_FEATURE(_feat, _hwcap) \ do { if (s390_has_feat(_feat)) { hwcap |=3D _hwcap; } } while (0) =20 -uint32_t get_elf_hwcap(void) +abi_ulong get_elf_hwcap(void) { /* * Let's assume we always have esan3 and zarch. --=20 2.43.0