From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B77AC433F5 for ; Mon, 18 Oct 2021 16:27:44 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 45AE660E0C for ; Mon, 18 Oct 2021 16:27:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 45AE660E0C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:38798 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcVUF-00014Y-9f for qemu-devel@archiver.kernel.org; Mon, 18 Oct 2021 12:27:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcV93-0007kL-96 for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:50 -0400 Received: from mail-il1-x135.google.com ([2607:f8b0:4864:20::135]:41857) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcV8o-00082M-At for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:48 -0400 Received: by mail-il1-x135.google.com with SMTP id l7so2107316iln.8 for ; Mon, 18 Oct 2021 09:05:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=laLU0XX8CdBP2//L0jChpwkHQR7NdHyxMB0d78r5Vqk=; b=ZPbpmCBDWOPGalSpIbsw32CCSxtJO28n+eI/fjgTIFRLCFvLzWfzcFO/SIYHehlibM kqwISHlddB3aO2p0eBUKazrgo4WfmlXhnz559GhdWfLqyckMkqemZ2FLy0dP4eSZSTiy VN3UU5Q8NDFRDHDuCd57w1322E3GpaOorefaBw6waWeBeMZc+nG5epaidsKwA4T6vMB0 Tl3D+3NSiEAqZhlZBWk9HdPA6ri2E8JpDLLzBq+CYYXGW/w7mAKACO9rgksQgUeIgYe/ vBahfJowa4H4T09za6rXr4CU9WQWu3ap+8+03m1VWrugCCxkKva3MkugRc28Mhkm3s7i mVNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=laLU0XX8CdBP2//L0jChpwkHQR7NdHyxMB0d78r5Vqk=; b=R6rp2xNYasXKJOBCSk6NDvl0+4pJP8qNdq1MeIiKYahaQAVmSCKmdJba2tPwC9jFUg pa+plscEDdWk0raR3Ggreku6H8sLDpHZewVpn1KNsyCyyToqxulze2XAUsjqqu6zq9Ub hGGG48CwZuRXSlSS3Ph0fe+rKPEdoaDEAs/N2NHJgV/x4Iuyh1LAeUjT1y4aPELjuEqW MavdJ8xjBHKSbmPOfYRXyB7qQymoWWXRaMUpy53fjB8EV/mYiSFsJycBldO5epZLCe0v 2L/WjXT+pbs6lOVi685aDdmMjM1kCr0QzaFOVuAZoO3GZ3LkUleqZ3VTm0I9VQCAC88D jgcQ== X-Gm-Message-State: AOAM5313wKX6NjE+IyH0zuZ8mbWb6nwoOFj+0vBr3BF+m3mWjJX+cKMD ptKoGNdxbli/6V9fVU4clPp+W1cCaV8= X-Google-Smtp-Source: ABdhPJwAznuDJSTLPpgi9aIrTYMFG8K4xlAqSgKyp2xdeBEc0/LAGBnLe+nEH7rdZevTZERj0aQ+0g== X-Received: by 2002:a92:cd8e:: with SMTP id r14mr14070331ilb.291.1634573131682; Mon, 18 Oct 2021 09:05:31 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id a4sm7240936ild.52.2021.10.18.09.05.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 09:05:31 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 17/23] bsd-user/target_os_elf.h: Remove fallback ELF_HWCAP and reorder Date: Mon, 18 Oct 2021 10:04:52 -0600 Message-Id: <20211018160458.1976-18-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211018160458.1976-1-imp@bsdimp.com> References: <20211018160458.1976-1-imp@bsdimp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=2607:f8b0:4864:20::135; envelope-from=imp@bsdimp.com; helo=mail-il1-x135.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kyle Evans , Richard Henderson , Laurent Vivier , Warner Losh , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" All architectures have a ELF_HWCAP, so remove the fallback ifdef. Place ELF_HWCAP in the same order as on native FreeBSD. Signed-off-by: Warner Losh Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Kyle Evans --- bsd-user/freebsd/target_os_elf.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/bsd-user/freebsd/target_os_elf.h b/bsd-user/freebsd/target_os_elf.h index 2d03a883aa..adcffd1ddb 100644 --- a/bsd-user/freebsd/target_os_elf.h +++ b/bsd-user/freebsd/target_os_elf.h @@ -38,10 +38,6 @@ #define ELF_PLATFORM (NULL) #endif -#ifndef ELF_HWCAP -#define ELF_HWCAP 0 -#endif - /* XXX Look at the other conflicting AT_* values. */ #define FREEBSD_AT_NCPUS 19 #define FREEBSD_AT_HWCAP 25 @@ -114,12 +110,12 @@ static abi_ulong target_create_elf_tables(abi_ulong p, int argc, int envc, NEW_AUX_ENT(AT_FLAGS, (abi_ulong)0); NEW_AUX_ENT(FREEBSD_AT_NCPUS, (abi_ulong)bsd_get_ncpu()); NEW_AUX_ENT(AT_ENTRY, load_bias + exec->e_entry); + features = ELF_HWCAP; + NEW_AUX_ENT(FREEBSD_AT_HWCAP, features); NEW_AUX_ENT(AT_UID, (abi_ulong)getuid()); NEW_AUX_ENT(AT_EUID, (abi_ulong)geteuid()); NEW_AUX_ENT(AT_GID, (abi_ulong)getgid()); NEW_AUX_ENT(AT_EGID, (abi_ulong)getegid()); - features = ELF_HWCAP; - NEW_AUX_ENT(FREEBSD_AT_HWCAP, features); target_auxents = sp; /* Note where the aux entries are in the target */ #ifdef ARCH_DLINFO /* -- 2.32.0