From nobody Fri Nov 20 02:40:04 2026 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 4jW01J4w0rz71ytk for ; Fri, 20 Nov 2026 02:40:04 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jW01J2TpCz4lSp for ; Fri, 20 Nov 2026 02:40:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795142404; 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=odVYAspKMizZsTw10IWG6ZZc5IUK9PaqWRkaLGNiVIc=; b=VFhKXIsK8JZFdQT36a0MtkTMG0HLFAc1luLqMV+2HrkvSbHiCpMC2/Wtv2hR/7XdSyJsLc SZiQQv2MBVr8/6AK3Uk1PWy9F1gAfbKcy6ox9fnNBUlb7ovfmniE8YLopBzou/WRVF4rCw kuQcR4WvITpA7YS+Zyyf0GO/E50iUV3aQu9FXX2IXztU4/ifg4+y8d/C55i4jzx6WTdh6I FrlnHg69cBnwrBc5f0kzVDlTZTyrKQ95GTYkn76DiLM78WVeLIkIE0N2LKoYKgg8/z//qn vLNkOGMRivCiquhwTNivk9iwwadz8M+P1j2Rs5EZLewT7rjVVgMPZHUtmuu2Nw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1795142404; b=ZWDTeL4HWSy9Yd2Q3hmj+zb8gMQhOzVsgfL4T7yxaIzs0RzMF7Sic51Izs0bs/E3KDDigi mixfczkxzgg+QT4uXrfyN31syfpNo4fqmV0/MTydpESSzhq0766oQr2J+m29HWLH6IRVG0 8mg+5ns4SHB23ZMiZbAIPpHpI9L//W0IuWbIQHG4NfETukeW89ihM0plg/ZQIkPimddT+n JpDdD5quNFbwNIfofyejnxZbwB2mwGKyL34D0xJ0w5UXIJ8zCPKXb/NDRmH38tyvguG9xs sLm3u7Pa9Zk9iSoNm2iaWO7zrCPArcPzSXJXgQcf+5UE5tt887+T96mKI3GRkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795142404; 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=odVYAspKMizZsTw10IWG6ZZc5IUK9PaqWRkaLGNiVIc=; b=Lv+h8A5VK01uMDetAZXXq5TXedSHkFj2iqclTd2+FjduJqoMRqdLjopVDSdqmMWCiexxk6 StwLwO98kMg/5FWglj10Dd+4xoVgzR8J+vBwAOoSj8Qbwlw7uf6fgPpOYR+zQu0QbkOl3g NIjHLhi7TB2Bnx1/VIYth7wnZLr+oo5xGd7QuWuTz1Ilu0U5psYmF82gUaO4dhWlSNdlSm 8khcqX1SYeTQpDUWAT81+PLjngmGclmBlH3HVZWcycGvyVRuHqw9Z33KbR+uyK1azZSp4k R4Lvf6m1s5Tp5nPmq8u/4OwkDhVyjbTbep7BuiWAueTDZHuCMAoU3QOLl40wdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jW01J28X7zSGw for ; Fri, 20 Nov 2026 02:40:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b019 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Nov 2026 02:40:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Timothy Pearson Subject: git: 90bc40e26c61 - main - powerpc: Split CPU flags into separate file and include in ELF header List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tpearson X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90bc40e26c610b68595427e736bca5215ebe5c57 Auto-Submitted: auto-generated Date: Fri, 20 Nov 2026 02:40:04 +0000 Message-Id: <6affb304.b019.54a807e@gitrepo.freebsd.org> The branch main has been updated by tpearson: URL: https://cgit.FreeBSD.org/src/commit/?id=90bc40e26c610b68595427e736bca5215ebe5c57 commit 90bc40e26c610b68595427e736bca5215ebe5c57 Author: Timothy Pearson AuthorDate: 2026-11-19 17:52:03 +0000 Commit: Timothy Pearson CommitDate: 2026-11-20 02:39:44 +0000 powerpc: Split CPU flags into separate file and include in ELF header This change fixes Bug 239621, where FreeBSD on powerpc deviates from userspace expectations on other architectures (arm) and operating systems (Linux) Approved by: jhibbits (mentor) MFC after: 1 week --- sys/powerpc/include/cpu.h | 53 +-------------------- sys/powerpc/include/cpu_flags.h | 100 ++++++++++++++++++++++++++++++++++++++++ sys/powerpc/include/elf.h | 2 + 3 files changed, 103 insertions(+), 52 deletions(-) diff --git a/sys/powerpc/include/cpu.h b/sys/powerpc/include/cpu.h index 35b32566484c..2e1247a18f71 100644 --- a/sys/powerpc/include/cpu.h +++ b/sys/powerpc/include/cpu.h @@ -51,58 +51,7 @@ extern u_long cpu_features; extern u_long cpu_features2; -#define PPC_FEATURE_32 0x80000000 /* Always true */ -#define PPC_FEATURE_64 0x40000000 /* Defined on a 64-bit CPU */ -#define PPC_FEATURE_601_INSTR 0x20000000 /* Defined on a 64-bit CPU */ -#define PPC_FEATURE_HAS_ALTIVEC 0x10000000 -#define PPC_FEATURE_HAS_FPU 0x08000000 -#define PPC_FEATURE_HAS_MMU 0x04000000 -#define PPC_FEATURE_UNIFIED_CACHE 0x01000000 -#define PPC_FEATURE_HAS_SPE 0x00800000 -#define PPC_FEATURE_HAS_EFP_SINGLE 0x00400000 -#define PPC_FEATURE_HAS_EFP_DOUBLE 0x00200000 -#define PPC_FEATURE_NO_TB 0x00100000 -#define PPC_FEATURE_POWER4 0x00080000 -#define PPC_FEATURE_POWER5 0x00040000 -#define PPC_FEATURE_POWER5_PLUS 0x00020000 -#define PPC_FEATURE_CELL 0x00010000 -#define PPC_FEATURE_BOOKE 0x00008000 -#define PPC_FEATURE_SMT 0x00004000 -#define PPC_FEATURE_ICACHE_SNOOP 0x00002000 -#define PPC_FEATURE_ARCH_2_05 0x00001000 -#define PPC_FEATURE_HAS_DFP 0x00000400 -#define PPC_FEATURE_POWER6_EXT 0x00000200 -#define PPC_FEATURE_ARCH_2_06 0x00000100 -#define PPC_FEATURE_HAS_VSX 0x00000080 -#define PPC_FEATURE_TRUE_LE 0x00000002 -#define PPC_FEATURE_PPC_LE 0x00000001 - -#define PPC_FEATURE2_ARCH_2_07 0x80000000 -#define PPC_FEATURE2_HTM 0x40000000 -#define PPC_FEATURE2_DSCR 0x20000000 -#define PPC_FEATURE2_EBB 0x10000000 -#define PPC_FEATURE2_ISEL 0x08000000 -#define PPC_FEATURE2_TAR 0x04000000 -#define PPC_FEATURE2_HAS_VEC_CRYPTO 0x02000000 -#define PPC_FEATURE2_HTM_NOSC 0x01000000 -#define PPC_FEATURE2_ARCH_3_00 0x00800000 -#define PPC_FEATURE2_HAS_IEEE128 0x00400000 -#define PPC_FEATURE2_DARN 0x00200000 -#define PPC_FEATURE2_SCV 0x00100000 -#define PPC_FEATURE2_HTM_NOSUSPEND 0x00080000 -#define PPC_FEATURE2_ARCH_3_1 0x00040000 -#define PPC_FEATURE2_MMA 0x00020000 - -#define PPC_FEATURE_BITMASK \ - "\20" \ - "\040PPC32\037PPC64\036PPC601\035ALTIVEC\034FPU\033MMU\031UNIFIEDCACHE" \ - "\030SPE\027SPESFP\026DPESFP\025NOTB\024POWER4\023POWER5\022P5PLUS\021CELL"\ - "\020BOOKE\017SMT\016ISNOOP\015ARCH205\013DFP\011ARCH206\010VSX"\ - "\002TRUELE\001PPCLE" -#define PPC_FEATURE2_BITMASK \ - "\20" \ - "\040ARCH207\037HTM\036DSCR\034ISEL\033TAR\032VCRYPTO\031HTMNOSC" \ - "\030ARCH300\027IEEE128\026DARN\025SCV\024HTMNOSUSP" +#include #define TRAPF_USERMODE(frame) (((frame)->srr1 & PSL_PR) != 0) #define TRAPF_PC(frame) ((frame)->srr0) diff --git a/sys/powerpc/include/cpu_flags.h b/sys/powerpc/include/cpu_flags.h new file mode 100644 index 000000000000..9f218a9826b0 --- /dev/null +++ b/sys/powerpc/include/cpu_flags.h @@ -0,0 +1,100 @@ +/*- + * SPDX-License-Identifier: BSD-4-Clause + * + * Copyright (C) 1995-1997 Wolfgang Solfrank. + * Copyright (C) 1995-1997 TooLs GmbH. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by TooLs GmbH. + * 4. The name of TooLs GmbH may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $NetBSD: cpu.h,v 1.11 2000/05/26 21:19:53 thorpej Exp $ + */ + +#ifndef _MACHINE_CPU_FLAGS_H_ +#define _MACHINE_CPU_FLAGS_H_ + +/* + * CPU Feature Attributes + * + * These are defined in the PowerPC ELF ABI for the AT_HWCAP vector, + * and are exported to userland via the machdep.cpu_features + * sysctl. + */ + +#define PPC_FEATURE_32 0x80000000 /* Always true */ +#define PPC_FEATURE_64 0x40000000 /* Defined on a 64-bit CPU */ +#define PPC_FEATURE_601_INSTR 0x20000000 /* Defined on a 64-bit CPU */ +#define PPC_FEATURE_HAS_ALTIVEC 0x10000000 +#define PPC_FEATURE_HAS_FPU 0x08000000 +#define PPC_FEATURE_HAS_MMU 0x04000000 +#define PPC_FEATURE_UNIFIED_CACHE 0x01000000 +#define PPC_FEATURE_HAS_SPE 0x00800000 +#define PPC_FEATURE_HAS_EFP_SINGLE 0x00400000 +#define PPC_FEATURE_HAS_EFP_DOUBLE 0x00200000 +#define PPC_FEATURE_NO_TB 0x00100000 +#define PPC_FEATURE_POWER4 0x00080000 +#define PPC_FEATURE_POWER5 0x00040000 +#define PPC_FEATURE_POWER5_PLUS 0x00020000 +#define PPC_FEATURE_CELL 0x00010000 +#define PPC_FEATURE_BOOKE 0x00008000 +#define PPC_FEATURE_SMT 0x00004000 +#define PPC_FEATURE_ICACHE_SNOOP 0x00002000 +#define PPC_FEATURE_ARCH_2_05 0x00001000 +#define PPC_FEATURE_HAS_DFP 0x00000400 +#define PPC_FEATURE_POWER6_EXT 0x00000200 +#define PPC_FEATURE_ARCH_2_06 0x00000100 +#define PPC_FEATURE_HAS_VSX 0x00000080 +#define PPC_FEATURE_TRUE_LE 0x00000002 +#define PPC_FEATURE_PPC_LE 0x00000001 + +#define PPC_FEATURE2_ARCH_2_07 0x80000000 +#define PPC_FEATURE2_HTM 0x40000000 +#define PPC_FEATURE2_DSCR 0x20000000 +#define PPC_FEATURE2_EBB 0x10000000 +#define PPC_FEATURE2_ISEL 0x08000000 +#define PPC_FEATURE2_TAR 0x04000000 +#define PPC_FEATURE2_HAS_VEC_CRYPTO 0x02000000 +#define PPC_FEATURE2_HTM_NOSC 0x01000000 +#define PPC_FEATURE2_ARCH_3_00 0x00800000 +#define PPC_FEATURE2_HAS_IEEE128 0x00400000 +#define PPC_FEATURE2_DARN 0x00200000 +#define PPC_FEATURE2_SCV 0x00100000 +#define PPC_FEATURE2_HTM_NOSUSPEND 0x00080000 +#define PPC_FEATURE2_ARCH_3_1 0x00040000 +#define PPC_FEATURE2_MMA 0x00020000 + +#define PPC_FEATURE_BITMASK \ + "\20" \ + "\040PPC32\037PPC64\036PPC601\035ALTIVEC\034FPU\033MMU\031UNIFIEDCACHE" \ + "\030SPE\027SPESFP\026DPESFP\025NOTB\024POWER4\023POWER5\022P5PLUS\021CELL"\ + "\020BOOKE\017SMT\016ISNOOP\015ARCH205\013DFP\011ARCH206\010VSX"\ + "\002TRUELE\001PPCLE" +#define PPC_FEATURE2_BITMASK \ + "\20" \ + "\040ARCH207\037HTM\036DSCR\034ISEL\033TAR\032VCRYPTO\031HTMNOSC" \ + "\030ARCH300\027IEEE128\026DARN\025SCV\024HTMNOSUSP" + +#endif /* _MACHINE_CPU_FLAGS_H_ */ diff --git a/sys/powerpc/include/elf.h b/sys/powerpc/include/elf.h index bcfa793540d2..326d298e7ca7 100644 --- a/sys/powerpc/include/elf.h +++ b/sys/powerpc/include/elf.h @@ -48,6 +48,8 @@ #include /* Definitions common to all 64 bit architectures. */ #include +#include /* Definitions of CPU feature flags */ + #if __ELF_WORD_SIZE == 64 #define ELF_ARCH EM_PPC64 #define ELF_MACHINE_OK(x) ((x) == EM_PPC64)