From nobody Sat Jan 21 02:20:11 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NzKp41fZrz2v0VY; Sat, 21 Jan 2023 02:20:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NzKp41Dhrz4GLh; Sat, 21 Jan 2023 02:20:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674267612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RA3SY6mqGzIzDpe9sMq4Ct7ODhl8IwL0tL3A0OEJycs=; b=J0N1Xkt5BcqplRNpPJGK7tlKwElcysoj5QWqJv00KhB8IxrfXatg4vY4MhVni3r0aQfyLq Vv45pc/TrXcAT1uFEaV1E4WQHDlXfXGzkCTtr4Fcpk2xUdfaCGDsELu0ruI537fOCAIGPa n0o1wFv9dvor6Orc47qW82an3LT2L8oTTQySTKSs8SkvLbnGX9N0XcU/BPiUZBu1ICo6BK xosGj5kXiAg4lJRSbt1fUyEN0JSZNiaZ4N7jVRe/hsg/PpMmjfJzoPuSFcl9bc/kqAlTE0 I5raGb3ZLPJKKu2PjWPVfTC+AerxxRc1mqQ8ssBPdk8UHlG8rclBreT9S7Co+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674267612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RA3SY6mqGzIzDpe9sMq4Ct7ODhl8IwL0tL3A0OEJycs=; b=a9vHc7D0w8MhHuNIPW2jy4fxjzoPM6zYSuG/9cQbbm7ev5F1g/CtBNijDVrn1c9QJicRqN u82D8LwUv9phmNZ7fhZgvh4FKxYlz2BcJcUyAakNPMr6QruUsWEMneJp7t+H9aPvC1CGnh ACfSY6dSmIvA0UR+WQdM0cRKN6IE7vPAuQxnb5zMTvunPoDe1lf/OAXfmQ8SUrC8IMVQi2 f3cWRTioPDQ/umpsEZiQ8rCOCb2Uegz79WOqK92OD6166n+lTIIkEfsyjPgA5vviETIbX0 Zm+t/KXPpalH7C59quD2ZJeg/BQj2iSYZDbyPuleDTDNiMSJvsep9aN3L4yBHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674267612; a=rsa-sha256; cv=none; b=ORalqpckSAugr+yDFpYsB/2SouJlA0xMyfrMTrHTjcDkNmPXiZnGPDf//fPqJsL+EEAAC8 9PqmpS6VOXWp6u3WVWUlFbexEmjdI1QvimYu2gZVA3bhs+gK7MLzAcy4K2YSgrzL8pkqy3 fhMdi72io6Pp/lu9lOMj6ORm/4obMbZLVhGtMMRjjoEijbxgfug6OA8WGccui9vlG64rlS Vf8WHxIyg0plevxRXt5kY8sSw9p9AP26reDMJtNHhHzUFtU4MgmVEJ+lfWkFn539DvEadO 408YayVOb1VwsRrXRwgL0vU8uVxwyUSHJkWsHvQk0s7RhNdC5EVh15NHrVh5+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NzKp40J7RzsnB; Sat, 21 Jan 2023 02:20:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30L2KBeE006869; Sat, 21 Jan 2023 02:20:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30L2KBQv006863; Sat, 21 Jan 2023 02:20:11 GMT (envelope-from git) Date: Sat, 21 Jan 2023 02:20:11 GMT Message-Id: <202301210220.30L2KBQv006863@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 34784d17eb2b - main - elf: Catch up with defining EF_ARM_EABI_VERSION in elf_common.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 34784d17eb2bcdcfaee39f570bff613b4055912d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=34784d17eb2bcdcfaee39f570bff613b4055912d commit 34784d17eb2bcdcfaee39f570bff613b4055912d Author: Warner Losh AuthorDate: 2023-01-21 02:15:52 +0000 Commit: Warner Losh CommitDate: 2023-01-21 02:18:15 +0000 elf: Catch up with defining EF_ARM_EABI_VERSION in elf_common.h FreeBSD defines EF_ARM_EABI_VERSION in a non-standard way (at least differently than everybody else). We use this only in elf*machdep.c to make sure the image is new enough. Switch to the more standard way of defining this and adjust other constants to match. Fixes: c52c98e69a2e Sponsored by: Netflix --- sys/arm/include/elf.h | 3 +-- sys/arm64/arm64/elf32_machdep.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/arm/include/elf.h b/sys/arm/include/elf.h index 35d0fa55ca1a..2ea60e8f10ee 100644 --- a/sys/arm/include/elf.h +++ b/sys/arm/include/elf.h @@ -74,9 +74,8 @@ __ElfType(Auxinfo); #define ELF_TARG_VER 1 /* Defines specific for arm headers */ -#define EF_ARM_EABI_VERSION(x) (((x) & EF_ARM_EABIMASK) >> 24) #define EF_ARM_EABI_VERSION_UNKNOWN 0 -#define EF_ARM_EABI_FREEBSD_MIN 4 +#define EF_ARM_EABI_FREEBSD_MIN EF_ARM_EABI_VER4 #define ET_DYN_LOAD_ADDR 0x01001000 diff --git a/sys/arm64/arm64/elf32_machdep.c b/sys/arm64/arm64/elf32_machdep.c index f637c5a65c05..627973ecfd3d 100644 --- a/sys/arm64/arm64/elf32_machdep.c +++ b/sys/arm64/arm64/elf32_machdep.c @@ -152,8 +152,7 @@ elf32_arm_abi_supported(struct image_params *imgp, int32_t *osrel __unused, ID_AA64PFR0_EL0_64_32) return (FALSE); -#define EF_ARM_EABI_VERSION(x) (((x) & EF_ARM_EABIMASK) >> 24) -#define EF_ARM_EABI_FREEBSD_MIN 4 +#define EF_ARM_EABI_FREEBSD_MIN EF_ARM_EABI_VER4 hdr = (const Elf32_Ehdr *)imgp->image_header; if (EF_ARM_EABI_VERSION(hdr->e_flags) < EF_ARM_EABI_FREEBSD_MIN) { if (bootverbose)