From nobody Mon Mar 07 14:32:17 2022 X-Original-To: dev-commits-src-main@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 6E0A61A06F8E; Mon, 7 Mar 2022 14:32:17 +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 4KC1BT2hNvz3Kh2; Mon, 7 Mar 2022 14:32:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646663537; 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=d0mDTCeYt09hELU324wJb9rzRDxxJRg0L4zYN0cMEb0=; b=Bb9kq40e2S/EfxTfAKwSzoHWxEOVI90TO29t08gchTmMVUk3CQZX2+aHoI9yVNyjyxILHE l4qFJyZN9LuiGJeIEovG1k2qNYImuj5fZLjBZopaUy0v/CDI676Z/WefxFwhN+gPB7hZK9 mb5QuwFe7dKS4TqLx5CY9UDa8Ql4D7A9O4lTzfFVZ9VA3i2MY9FvZ3CgjmIWWsqiGxdVqV EpY7XstVfWsspxQwJhcHgddUZwrZLKd5LF0lf4BmopG3K0tkbjpaRF2KYwCkkgqvc9oSfQ 0E80ME4JpY71cZNQBOZsRdNh+obIazRcy485pvJQ2fC75+MeaJXTWzmQHxna0g== 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 3C88C1A40; Mon, 7 Mar 2022 14:32:17 +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 227EWHmP053810; Mon, 7 Mar 2022 14:32:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 227EWHpi053809; Mon, 7 Mar 2022 14:32:17 GMT (envelope-from git) Date: Mon, 7 Mar 2022 14:32:17 GMT Message-Id: <202203071432.227EWHpi053809@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alfredo Dal'Ava Junior" Subject: git: c3b6408ee82b - main - powerpc: FreeBSD kernel compatibility cleanup List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: alfredo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c3b6408ee82b95f03acd5f789fa832d2a1500fbd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646663537; 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=d0mDTCeYt09hELU324wJb9rzRDxxJRg0L4zYN0cMEb0=; b=jctSgj7MgNzXwYBi6uMv+bo+WyD5FSqjUPJcdx+u61Mup5mivwSrjUcr8glQmS77zpSTIM UvgkYwFDkHZXspb7F34W+GMuYHeZOLDTM4oXNPRcg2QSxEcpsPWwKumiVEYS0YfbmsXKya XuIQ3l32NTr4+3r+2iTPZ71PZdiNsODXo0hVgR+rjTtnwJnhCPyok4uiApZlLpeHCu7dAY 4GwptxCWpsB6WfOZ0V4uq3W6ge1xFjFAtkuq2oAfj3d2W0w4kAVfD6pdfSwvTC+BYVNlk2 JRLNCqJ1bF6FYSOUhZK3MIqzRcbYl54P8uHT/2cjUFVIW2yYgWHNn6cX8omUUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646663537; a=rsa-sha256; cv=none; b=Z2Mb6zGO49yPussQTSIqSyLoPllLJPam18K2SEaoINI1QLnd/91nZUB2mhXj47oZ6VDXoP GWPcDbFCfx6Zs4dJ0HR4HO0yNIakBBuSjNWoYkT7xt6YPDIwolcYtZCIKtvO6nzxz5cd7b oX1IwHQz7FDM/PwOhNCVMfwOlhtxVXad2VuOCjPfS/waoIpBFngyY8nhugQPFvec4lYBTz 39e+chXqLKTTVfeK1n1pPU/yMbr/F/QU9/kSBLaRtDdo+6Si2JQvrbOrZGPIY0HYNR5jRg 1Kf6ExbwxoTNtWvJbplBpgbU9Ow2jYmGA3vdDeLc/vhgU703FzfsiTUE8nGzlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by alfredo: URL: https://cgit.FreeBSD.org/src/commit/?id=c3b6408ee82b95f03acd5f789fa832d2a1500fbd commit c3b6408ee82b95f03acd5f789fa832d2a1500fbd Author: Alfredo Dal'Ava Junior AuthorDate: 2022-03-07 17:30:26 +0000 Commit: Alfredo Dal'Ava Junior 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