01/08: platform: Introduce new platforms.

[guix-commits]

mothacehe pushed a commit to branch master
in repository guix.

commit 31f7696be4a2b2f9e54639a549f7ded32e68260b
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Mon May 2 12:54:44 2022 +0200

    platform: Introduce new platforms.
    
    * gnu/platforms/intel.scm: New file.
    * gnu/platforms/mips.scm: Ditto.
    * gnu/platforms/powerpc.scm: Ditto.
    * gnu/platforms/riscv.scm: Ditto.
    * gnu/platforms/s390.scm: Ditto.
    * gnu/local.mk (GNU_SYSTEM_MODULES): Add them.
    
    Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
 gnu/local.mk                            |  6 +++++-
 gnu/platforms/{hurd.scm => mips.scm}    | 13 +++++++------
 gnu/platforms/{hurd.scm => powerpc.scm} | 20 ++++++++++++++------
 gnu/platforms/{hurd.scm => riscv.scm}   | 13 +++++++------
 gnu/platforms/{hurd.scm => s390.scm}    | 13 +++++++------
 gnu/platforms/{hurd.scm => x86.scm}     | 31 ++++++++++++++++++++++++++++---
 6 files changed, 68 insertions(+), 28 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 6274f43566..2a74677509 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -632,7 +632,11 @@ GNU_SYSTEM_MODULES =                               \
   %D%/packages/zwave.scm                       \
                                                \
   %D%/platforms/arm.scm                                \
-  %D%/platforms/hurd.scm                       \
+  %D%/platforms/mips.scm                       \
+  %D%/platforms/powerpc.scm                    \
+  %D%/platforms/riscv.scm                      \
+  %D%/platforms/s390.scm                       \
+  %D%/platforms/x86.scm                                \
                                                \
   %D%/services.scm                             \
   %D%/services/admin.scm                       \
diff --git a/gnu/platforms/hurd.scm b/gnu/platforms/mips.scm
similarity index 78%
copy from gnu/platforms/hurd.scm
copy to gnu/platforms/mips.scm
index 0e5c58fd08..84a492699d 100644
--- a/gnu/platforms/hurd.scm
+++ b/gnu/platforms/mips.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org>
+;;; Copyright © 2022 Mathieu Othacehe <othacehe@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -16,13 +16,14 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
-(define-module (gnu platforms hurd)
+(define-module (gnu platforms mips)
   #:use-module (gnu platform)
   #:use-module (gnu packages linux)
   #:use-module (guix records)
-  #:export (hurd))
+  #:export (mips64-linux))
 
-(define hurd
+(define mips64-linux
   (platform
-   (target "i586-pc-gnu")
-   (system "i586-gnu")))
+   (target "mips64el-linux-gnu")
+   (system "mips64el-linux")
+   (linux-architecture "mips")))
diff --git a/gnu/platforms/hurd.scm b/gnu/platforms/powerpc.scm
similarity index 67%
copy from gnu/platforms/hurd.scm
copy to gnu/platforms/powerpc.scm
index 0e5c58fd08..8fadfe88de 100644
--- a/gnu/platforms/hurd.scm
+++ b/gnu/platforms/powerpc.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org>
+;;; Copyright © 2022 Mathieu Othacehe <othacehe@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -16,13 +16,21 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
-(define-module (gnu platforms hurd)
+(define-module (gnu platforms powerpc)
   #:use-module (gnu platform)
   #:use-module (gnu packages linux)
   #:use-module (guix records)
-  #:export (hurd))
+  #:export (powerpc-linux
+            powerpc64le-linux))
 
-(define hurd
+(define powerpc-linux
   (platform
-   (target "i586-pc-gnu")
-   (system "i586-gnu")))
+   (target "powerpc-linux-gnu")
+   (system "powerpc-linux")
+   (linux-architecture "powerpc")))
+
+(define powerpc64le-linux
+  (platform
+   (target "powerpc64le-linux-gnu")
+   (system "powerpc64le-linux")
+   (linux-architecture "powerpc")))
diff --git a/gnu/platforms/hurd.scm b/gnu/platforms/riscv.scm
similarity index 78%
copy from gnu/platforms/hurd.scm
copy to gnu/platforms/riscv.scm
index 0e5c58fd08..29a34402a2 100644
--- a/gnu/platforms/hurd.scm
+++ b/gnu/platforms/riscv.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org>
+;;; Copyright © 2022 Mathieu Othacehe <othacehe@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -16,13 +16,14 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
-(define-module (gnu platforms hurd)
+(define-module (gnu platforms riscv)
   #:use-module (gnu platform)
   #:use-module (gnu packages linux)
   #:use-module (guix records)
-  #:export (hurd))
+  #:export (riscv64-linux))
 
-(define hurd
+(define riscv64-linux
   (platform
-   (target "i586-pc-gnu")
-   (system "i586-gnu")))
+   (target "riscv64-linux-gnu")
+   (system "riscv64-linux")
+   (linux-architecture "riscv")))
diff --git a/gnu/platforms/hurd.scm b/gnu/platforms/s390.scm
similarity index 78%
copy from gnu/platforms/hurd.scm
copy to gnu/platforms/s390.scm
index 0e5c58fd08..c8caafbe45 100644
--- a/gnu/platforms/hurd.scm
+++ b/gnu/platforms/s390.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org>
+;;; Copyright © 2022 Mathieu Othacehe <othacehe@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -16,13 +16,14 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
-(define-module (gnu platforms hurd)
+(define-module (gnu platforms s390)
   #:use-module (gnu platform)
   #:use-module (gnu packages linux)
   #:use-module (guix records)
-  #:export (hurd))
+  #:export (s390x-linux))
 
-(define hurd
+(define s390x-linux
   (platform
-   (target "i586-pc-gnu")
-   (system "i586-gnu")))
+   (target "s390x-linux-gnu")
+   (system "s390x-linux")
+   (linux-architecture "s390")))
diff --git a/gnu/platforms/hurd.scm b/gnu/platforms/x86.scm
similarity index 60%
rename from gnu/platforms/hurd.scm
rename to gnu/platforms/x86.scm
index 0e5c58fd08..1a5d6a3284 100644
--- a/gnu/platforms/hurd.scm
+++ b/gnu/platforms/x86.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org>
+;;; Copyright © 2022 Mathieu Othacehe <othacehe@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -16,11 +16,36 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
-(define-module (gnu platforms hurd)
+(define-module (gnu platforms x86)
   #:use-module (gnu platform)
   #:use-module (gnu packages linux)
   #:use-module (guix records)
-  #:export (hurd))
+  #:export (i686-linux
+            x86_64-linux
+            i686-mingw
+            x86_64-mingw))
+
+(define i686-linux
+  (platform
+   (target "i686-linux-gnu")
+   (system "i686-linux")
+   (linux-architecture "i386")))
+
+(define x86_64-linux
+  (platform
+   (target "x86_64-linux-gnu")
+   (system "x86_64-linux")
+   (linux-architecture "x86_64")))
+
+(define i686-mingw
+  (platform
+   (target "i686-w64-mingw32")
+   (system #f)))
+
+(define x86_64-mingw
+  (platform
+   (target "x86_64-w64-mingw32")
+   (system #f)))
 
 (define hurd
   (platform