git: c3b6408ee82b - main - powerpc: FreeBSD kernel compatibility cleanup

The branch main has been updated by alfredo:

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

commit c3b6408ee82b95f03acd5f789fa832d2a1500fbd
Author:     Alfredo Dal'Ava Junior <alfredo@FreeBSD.org>
AuthorDate: 2022-03-07 17:30:26 +0000
Commit:     Alfredo Dal'Ava Junior <alfredo@FreeBSD.org>
CommitDate: 2022-03-07 17:30:26 +0000

    powerpc: FreeBSD kernel compatibility cleanup
    
    Adjust FreeBSD kernel backward compatibility list
    
    Reviewed by:    jhibbits, pkubaj
    Sponsored by:   Instituto de Pesquisas Eldorado (eldorado.org.br)
    Differential Revision:  https://reviews.freebsd.org/D33421
---
 sys/powerpc/conf/GENERIC     |  2 --
 sys/powerpc/conf/GENERIC64   |  1 -
 sys/powerpc/conf/GENERIC64LE |  8 +++++---
 sys/powerpc/conf/MPC85XXSPE  | 15 +++++++++++----
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index 77c88cf05f78..b269893b01bd 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -61,8 +61,6 @@ options 	TMPFS			# Efficient memory filesystem
 options 	GEOM_PART_APM		# Apple Partition Maps.
 options 	GEOM_PART_GPT		# GUID Partition Tables.
 options 	GEOM_LABEL		# Provides labelization
-options 	COMPAT_FREEBSD4		# Keep this for a while
-options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
 options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
 options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
 options 	COMPAT_FREEBSD9		# Compatible with FreeBSD9
diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64
index 17fa9684d27c..30a0d2617ae7 100644
--- a/sys/powerpc/conf/GENERIC64
+++ b/sys/powerpc/conf/GENERIC64
@@ -69,7 +69,6 @@ options 	GEOM_PART_APM		# Apple Partition Maps.
 options 	GEOM_PART_GPT		# GUID Partition Tables.
 options 	GEOM_LABEL		# Provides labelization
 options 	COMPAT_FREEBSD32	# Compatible with FreeBSD/powerpc binaries
-options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
 options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
 options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
 options 	COMPAT_FREEBSD9		# Compatible with FreeBSD9
diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE
index 5b59a8c1fba2..c60043e73979 100644
--- a/sys/powerpc/conf/GENERIC64LE
+++ b/sys/powerpc/conf/GENERIC64LE
@@ -66,10 +66,12 @@ options 	TMPFS			# Efficient memory filesystem
 options 	GEOM_PART_APM		# Apple Partition Maps.
 options 	GEOM_PART_GPT		# GUID Partition Tables.
 options 	GEOM_LABEL		# Provides labelization
-#options 	COMPAT_FREEBSD32	# Compatible with FreeBSD/powerpcle binaries
-options		COMPAT_FREEBSD11	# Compatible with FreeBSD11
-options		COMPAT_FREEBSD12	# Compatible with FreeBSD12
+
+# ports lang/rust (1.57.0) and lang/go (1.17.5) depends on older kernel interfaces
+options         COMPAT_FREEBSD11        # Compatible with FreeBSD11 (required by ports)
+options         COMPAT_FREEBSD12        # Compatible with FreeBSD12 (required by ports)
 options 	COMPAT_FREEBSD13	# Compatible with FreeBSD13
+
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI 
 options 	KTRACE			# ktrace(1) syscall trace support
 options 	STACK			# stack(9) support
diff --git a/sys/powerpc/conf/MPC85XXSPE b/sys/powerpc/conf/MPC85XXSPE
index 1741055357a8..a3b8f06a4483 100644
--- a/sys/powerpc/conf/MPC85XXSPE
+++ b/sys/powerpc/conf/MPC85XXSPE
@@ -59,10 +59,17 @@ options 	SYSVSEM
 options 	SYSVSHM
 options 	WITNESS
 options 	WITNESS_SKIPSPIN
-options 	COMPAT_FREEBSD10
-options 	COMPAT_FREEBSD11
-options 	COMPAT_FREEBSD12
-options 	COMPAT_FREEBSD13
+
+# The powerpcspe target arch can run non Altivec/VMX powerpc binaries
+# Keep COMPAT options in sync with powerpc target arch.
+options		COMPAT_FREEBSD6		# Compatible with FreeBSD6
+options		COMPAT_FREEBSD7		# Compatible with FreeBSD7
+options		COMPAT_FREEBSD9		# Compatible with FreeBSD9
+options		COMPAT_FREEBSD10	# Compatible with FreeBSD10
+options		COMPAT_FREEBSD11	# Compatible with FreeBSD11
+options 	COMPAT_FREEBSD12	# Compatible with FreeBSD12
+options 	COMPAT_FREEBSD13	# Compatible with FreeBSD13
+
 options 	HWPMC_HOOKS
 options 	KDTRACE_HOOKS		# Kernel DTrace hooks
 options 	DDB_CTF			# Kernel ELF linker loads CTF data