From: Mathieu Othacehe <othacehe@gnu.org>
To: 55220@debbugs.gnu.org
Cc: Mathieu Othacehe <othacehe@gnu.org>
Subject: [bug#55220] [PATCH v2 5/6] platform: Add glibc-dynamic-linker field.
Date: Sat, 7 May 2022 18:11:25 +0200 [thread overview]
Message-ID: <20220507161126.14553-6-othacehe@gnu.org> (raw)
In-Reply-To: <20220507161126.14553-1-othacehe@gnu.org>
* gnu/platform.scm (<platform>)[glibc-dynamic-linker]: New field.
(platform-glibc-dynamic-linker, lookup-platform-by-system): New procedures.
* gnu/platforms/arm.scm (armhf-linux, aarch64-linux): Add the glibc-dynamic-linker field.
* gnu/platforms/hurd.scm (hurd): Ditto.
* gnu/platforms/intel.scm (intel32-linux, intel64-linux, intel32-mingw, intel64-linux): Ditto.
* gnu/platforms/mips.scm (mips64el-linux): Ditto.
* gnu/platforms/powerpc.scm (powerpc-linux, powerpc64-linux): Ditto.
* gnu/platforms/riscv.scm (riscv64-linux): Ditto.
* gnu/platforms/s390.scm (riscv64-linux): Ditto.
* gnu/packages/bootstrap.scm (glibc-dynamic-linker): Adapt it.
---
gnu/packages/bootstrap.scm | 47 ++++++++++++++++++--------------------
gnu/platform.scm | 14 ++++++++----
gnu/platforms/arm.scm | 6 +++--
gnu/platforms/hurd.scm | 3 ++-
gnu/platforms/intel.scm | 12 ++++++----
gnu/platforms/mips.scm | 3 ++-
gnu/platforms/powerpc.scm | 6 +++--
gnu/platforms/riscv.scm | 3 ++-
gnu/platforms/s390.scm | 3 ++-
9 files changed, 56 insertions(+), 41 deletions(-)
diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index 8bd0c4eaf3..5337617a53 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -26,6 +26,7 @@
(define-module (gnu packages bootstrap)
#:use-module (guix licenses)
#:use-module (gnu packages)
+ #:use-module (gnu platform)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system)
@@ -314,33 +315,29 @@ (define* (glibc-dynamic-linker
(%current-system))))
"Return the name of Glibc's dynamic linker for SYSTEM."
;; See the 'SYSDEP_KNOWN_INTERPRETER_NAMES' cpp macro in libc.
- (cond ((string=? system "x86_64-linux") "/lib/ld-linux-x86-64.so.2")
- ((string=? system "i686-linux") "/lib/ld-linux.so.2")
- ((string=? system "armhf-linux") "/lib/ld-linux-armhf.so.3")
- ((string=? system "mips64el-linux") "/lib/ld.so.1")
- ((string=? system "i586-gnu") "/lib/ld.so.1")
- ((string=? system "i686-gnu") "/lib/ld.so.1")
- ((string=? system "aarch64-linux") "/lib/ld-linux-aarch64.so.1")
- ((string=? system "powerpc-linux") "/lib/ld.so.1")
- ((string=? system "powerpc64-linux") "/lib/ld64.so.1")
- ((string=? system "powerpc64le-linux") "/lib/ld64.so.2")
- ((string=? system "alpha-linux") "/lib/ld-linux.so.2")
- ((string=? system "s390x-linux") "/lib/ld64.so.1")
- ((string=? system "riscv64-linux") "/lib/ld-linux-riscv64-lp64d.so.1")
+ (let ((platform (lookup-platform-by-system system)))
+ (cond
+ ((platform? platform)
+ (platform-glibc-dynamic-linker platform))
- ;; XXX: This one is used bare-bones, without a libc, so add a case
- ;; here just so we can keep going.
- ((string=? system "arm-elf") "no-ld.so")
- ((string=? system "arm-eabi") "no-ld.so")
- ((string=? system "xtensa-elf") "no-ld.so")
- ((string=? system "avr") "no-ld.so")
- ((string=? system "propeller-elf") "no-ld.so")
- ((string=? system "i686-mingw") "no-ld.so")
- ((string=? system "x86_64-mingw") "no-ld.so")
- ((string=? system "vc4-elf") "no-ld.so")
+ ;; TODO: Define those as platforms.
+ ((string=? system "i686-gnu") "/lib/ld.so.1")
+ ((string=? system "powerpc64-linux") "/lib/ld64.so.1")
+ ((string=? system "alpha-linux") "/lib/ld-linux.so.2")
- (else (error "dynamic linker name not known for this system"
- system))))
+ ;; XXX: This one is used bare-bones, without a libc, so add a case
+ ;; here just so we can keep going.
+ ((string=? system "arm-elf") "no-ld.so")
+ ((string=? system "arm-eabi") "no-ld.so")
+ ((string=? system "xtensa-elf") "no-ld.so")
+ ((string=? system "avr") "no-ld.so")
+ ((string=? system "propeller-elf") "no-ld.so")
+ ((string=? system "i686-mingw") "no-ld.so")
+ ((string=? system "x86_64-mingw") "no-ld.so")
+ ((string=? system "vc4-elf") "no-ld.so")
+
+ (else (error "dynamic linker name not known for this system"
+ system)))))
\f
;;;
diff --git a/gnu/platform.scm b/gnu/platform.scm
index 4c5211e107..fdc3685e7c 100644
--- a/gnu/platform.scm
+++ b/gnu/platform.scm
@@ -27,6 +27,7 @@ (define-module (gnu platform)
platform-target
platform-system
platform-linux-architecture
+ platform-glibc-dynamic-linker
platform-modules
platforms
@@ -58,12 +59,17 @@ (define-module (gnu platform)
;;
;; The 'linux-architecture' is only relevant if the kernel is Linux. In that
;; case, it corresponds to the ARCH variable used when building Linux.
+;;
+;; The 'glibc-dynamic-linker' field is the name of Glibc's dynamic linker for
+;; the corresponding system.
(define-record-type* <platform> platform make-platform
platform?
- (target platform-target) ;"x86_64-linux-gnu"
- (system platform-system) ;"x86_64-linux"
- (linux-architecture platform-linux-architecture ;"x86"
- (default #f)))
+ (target platform-target)
+ (system platform-system)
+ (linux-architecture platform-linux-architecture
+ (default #f))
+ (glibc-dynamic-linker platform-glibc-dynamic-linker))
+
\f
;;;
;;; Platforms.
diff --git a/gnu/platforms/arm.scm b/gnu/platforms/arm.scm
index 1e61741a35..bf68b2d00f 100644
--- a/gnu/platforms/arm.scm
+++ b/gnu/platforms/arm.scm
@@ -27,10 +27,12 @@ (define armv7-linux
(platform
(target "arm-linux-gnueabihf")
(system "armhf-linux")
- (linux-architecture "arm")))
+ (linux-architecture "arm")
+ (glibc-dynamic-linker "/lib/ld-linux-armhf.so.3")))
(define aarch64-linux
(platform
(target "aarch64-linux-gnu")
(system "aarch64-linux")
- (linux-architecture "arm64")))
+ (linux-architecture "arm64")
+ (glibc-dynamic-linker "/lib/ld-linux-aarch64.so.1")))
diff --git a/gnu/platforms/hurd.scm b/gnu/platforms/hurd.scm
index 0e5c58fd08..328e9818ad 100644
--- a/gnu/platforms/hurd.scm
+++ b/gnu/platforms/hurd.scm
@@ -25,4 +25,5 @@ (define-module (gnu platforms hurd)
(define hurd
(platform
(target "i586-pc-gnu")
- (system "i586-gnu")))
+ (system "i586-gnu")
+ (glibc-dynamic-linker "/lib/ld.so.1")))
diff --git a/gnu/platforms/intel.scm b/gnu/platforms/intel.scm
index ee9fe003a7..5b58d953ae 100644
--- a/gnu/platforms/intel.scm
+++ b/gnu/platforms/intel.scm
@@ -29,20 +29,24 @@ (define intel32-linux
(platform
(target "i686-linux-gnu")
(system "i686-linux")
- (linux-architecture "i386")))
+ (linux-architecture "i386")
+ (glibc-dynamic-linker "/lib/ld-linux.so.2")))
(define intel64-linux
(platform
(target "x86_64-linux-gnu")
(system "x86_64-linux")
- (linux-architecture "x86_64")))
+ (linux-architecture "x86_64")
+ (glibc-dynamic-linker "/lib/ld-linux-x86-64.so.2")))
(define intel32-mingw
(platform
(target "i686-w64-mingw32")
- (system #f)))
+ (system #f)
+ (glibc-dynamic-linker #f)))
(define intel64-mingw
(platform
(target "x86_64-w64-mingw32")
- (system #f)))
+ (system #f)
+ (glibc-dynamic-linker #f)))
diff --git a/gnu/platforms/mips.scm b/gnu/platforms/mips.scm
index 84a492699d..174657da13 100644
--- a/gnu/platforms/mips.scm
+++ b/gnu/platforms/mips.scm
@@ -26,4 +26,5 @@ (define mips64-linux
(platform
(target "mips64el-linux-gnu")
(system "mips64el-linux")
- (linux-architecture "mips")))
+ (linux-architecture "mips")
+ (glibc-dynamic-linker "/lib/ld.so.1")))
diff --git a/gnu/platforms/powerpc.scm b/gnu/platforms/powerpc.scm
index 8fadfe88de..1d0b5cb666 100644
--- a/gnu/platforms/powerpc.scm
+++ b/gnu/platforms/powerpc.scm
@@ -27,10 +27,12 @@ (define powerpc-linux
(platform
(target "powerpc-linux-gnu")
(system "powerpc-linux")
- (linux-architecture "powerpc")))
+ (linux-architecture "powerpc")
+ (glibc-dynamic-linker "/lib/ld.so.1")))
(define powerpc64le-linux
(platform
(target "powerpc64le-linux-gnu")
(system "powerpc64le-linux")
- (linux-architecture "powerpc")))
+ (linux-architecture "powerpc")
+ (glibc-dynamic-linker "/lib/ld64.so.2")))
diff --git a/gnu/platforms/riscv.scm b/gnu/platforms/riscv.scm
index 29a34402a2..c2b4850e55 100644
--- a/gnu/platforms/riscv.scm
+++ b/gnu/platforms/riscv.scm
@@ -26,4 +26,5 @@ (define riscv64-linux
(platform
(target "riscv64-linux-gnu")
(system "riscv64-linux")
- (linux-architecture "riscv")))
+ (linux-architecture "riscv")
+ (glibc-dynamic-linker "/lib/ld-linux-riscv64-lp64d.so.1")))
diff --git a/gnu/platforms/s390.scm b/gnu/platforms/s390.scm
index c8caafbe45..d3b1133974 100644
--- a/gnu/platforms/s390.scm
+++ b/gnu/platforms/s390.scm
@@ -26,4 +26,5 @@ (define s390x-linux
(platform
(target "s390x-linux-gnu")
(system "s390x-linux")
- (linux-architecture "s390")))
+ (linux-architecture "s390")
+ (glibc-dynamic-linker "/lib/ld64.so.1")))
--
2.36.0
next prev parent reply other threads:[~2022-05-07 16:12 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-02 11:17 [bug#55220] [PATCH 0/4] Add --list-systems and --list-targets options Mathieu Othacehe
2022-05-02 11:18 ` [bug#55220] [PATCH 1/4] platform: Introduce new platforms Mathieu Othacehe
2022-05-02 11:18 ` [bug#55220] [PATCH 2/4] platform: Add discovery support Mathieu Othacehe
2022-05-06 14:41 ` [bug#55220] [PATCH 0/4] Add --list-systems and --list-targets options Ludovic Courtès
2022-05-07 15:53 ` Mathieu Othacehe
2022-05-02 11:18 ` [bug#55220] [PATCH 3/4] ci: Do not rely on hardcoded cross-targets lists Mathieu Othacehe
2022-05-02 11:18 ` [bug#55220] [PATCH 4/4] scripts: Add --list-systems and --list-targets options Mathieu Othacehe
2022-05-06 14:54 ` [bug#55220] [PATCH 0/4] " Ludovic Courtès
2022-05-07 16:04 ` Mathieu Othacehe
2022-05-22 1:30 ` Maxim Cournoyer
2022-05-22 1:25 ` Maxim Cournoyer
2022-05-22 13:09 ` Mathieu Othacehe
2022-05-06 14:39 ` Ludovic Courtès
2022-05-07 15:50 ` Mathieu Othacehe
2022-05-06 14:37 ` Ludovic Courtès
2022-05-07 16:11 ` [bug#55220] [PATCH v2 0/6] " Mathieu Othacehe
2022-05-07 16:11 ` [bug#55220] [PATCH v2 1/6] platform: Introduce new platforms Mathieu Othacehe
2022-05-09 20:44 ` Maxime Devos
2022-05-22 1:39 ` [bug#55220] [PATCH 0/4] Add --list-systems and --list-targets options Maxim Cournoyer
2022-05-22 13:12 ` Mathieu Othacehe
2022-05-22 13:42 ` Maxim Cournoyer
2022-05-22 13:01 ` [bug#55220] [PATCH v2 1/6] platform: Introduce new platforms Mathieu Othacehe
2022-05-09 20:50 ` Maxime Devos
2022-05-22 13:02 ` Mathieu Othacehe
2022-05-07 16:11 ` [bug#55220] [PATCH v2 2/6] platform: Add discovery support Mathieu Othacehe
2022-05-09 20:58 ` Maxime Devos
2022-05-22 1:34 ` [bug#55220] [PATCH 0/4] Add --list-systems and --list-targets options Maxim Cournoyer
2022-05-22 13:06 ` [bug#55220] [PATCH v2 2/6] platform: Add discovery support Mathieu Othacehe
2022-05-07 16:11 ` [bug#55220] [PATCH v2 3/6] ci: Do not rely on hardcoded cross-targets lists Mathieu Othacehe
2022-05-07 16:11 ` [bug#55220] [PATCH v2 4/6] scripts: Add --list-systems and --list-targets options Mathieu Othacehe
2022-05-07 16:11 ` Mathieu Othacehe [this message]
2022-05-07 16:11 ` [bug#55220] [PATCH v2 6/6] linux: Remove system->linux-architecture procedure Mathieu Othacehe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220507161126.14553-6-othacehe@gnu.org \
--to=othacehe@gnu.org \
--cc=55220@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).