git: 90bc40e26c61 - main - powerpc: Split CPU flags into separate file and include in ELF header

From: Timothy Pearson <tpearson_at_FreeBSD.org>
Date: Fri, 20 Nov 2026 02:40:04 UTC
The branch main has been updated by tpearson:

URL: https://cgit.FreeBSD.org/src/commit/?id=90bc40e26c610b68595427e736bca5215ebe5c57

commit 90bc40e26c610b68595427e736bca5215ebe5c57
Author:     Timothy Pearson <tpearson@FreeBSD.org>
AuthorDate: 2026-11-19 17:52:03 +0000
Commit:     Timothy Pearson <tpearson@FreeBSD.org>
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 <machine/cpu_flags.h>
 
 #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 <sys/elf64.h>	/* Definitions common to all 64 bit architectures. */
 #include <sys/elf_generic.h>
 
+#include <machine/cpu_flags.h>	/* Definitions of CPU feature flags */
+
 #if __ELF_WORD_SIZE == 64
 #define	ELF_ARCH	EM_PPC64
 #define	ELF_MACHINE_OK(x) ((x) == EM_PPC64)