me
/
guix
Archived
1
0
Fork 0
Code

utils: Define a target-x86-32? and target-x86-64? predicate. 

* guix/utils.scm (target-x86-32?, target-x86-64?): New predicates.
* tests/utils.scm ("target-x86-32?", "target-x86-64?"): New tests.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
master
Maxime Devos 2021-07-14 13:12:49 +02:00 committed by Mathieu Othacehe
parent 42e4118150
commit f54852be22
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
2 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
guix/utils.scm
View File

@ -87,6 +87,8 @@
target-linux? target-linux?
target-hurd? target-hurd?
target-mingw? target-mingw?
target-x86-32?
target-x86-64?
target-arm32? target-arm32?
target-aarch64? target-aarch64?
target-arm? target-arm?
@ -654,6 +656,24 @@ a character other than '@'."
;; are 64-bit. ;; are 64-bit.
(string-suffix? "-mingw32" target))) (string-suffix? "-mingw32" target)))
(define* (target-x86-32? #:optional (target (or (%current-target-system)
(%current-system))))
"Is the architecture of TARGET a variant of Intel's 32-bit architecture
(IA32)?"
;; Intel also has a 16-bit architecture in the iN86 series, i286
;; (see, e.g. https://en.wikipedia.org/wiki/Intel/808286) so this
;; procedure is not named target-x86?.
(or (string-prefix? "i386-" target)
(string-prefix? "i486-" target)
(string-prefix? "i586-" target)
(string-prefix? "i686-" target)))
(define* (target-x86-64? #:optional (target (or (%current-target-system)
(%current-system))))
"Is the architecture of TARGET a variant of Intel/AMD's 64-bit
architecture (x86_64)?"
(string-prefix? "x86_64-" target))
(define* (target-arm32? #:optional (target (or (%current-target-system) (define* (target-arm32? #:optional (target (or (%current-target-system)
(%current-system)))) (%current-system))))
(string-prefix? "arm" target)) (string-prefix? "arm" target))

23
tests/utils.scm
View File

@ -306,6 +306,29 @@ skip these tests."
'("i686-linux-gnu" "i686-pc-gnu" '("i686-linux-gnu" "i686-pc-gnu"
"i686-w64-mingw32"))) "i686-w64-mingw32")))
(test-equal "target-x86-32?"
'(#f #f #f #t #t #t #t #f)
;; These are (according to Wikipedia) two RISC architectures
;; by Intel and presumably not compatible with the x86-32 series.
(map target-x86-32?
'("i860-gnu" "i960-gnu"
;; This is a 16-bit architecture
"i286-gnu"
;; These are part of the x86-32 series.
"i386-gnu" "i486-gnu" "i586-gnu" "i686-gnu"
;; Maybe this one will exist some day, but not yet.
"i786-gnu")))
(test-equal "target-x86-64?"
'(#t #f #f #f)
(map target-x86-64?
`("x86_64-linux-gnu" "i386-linux-gnu"
;; Just because it includes "64" doesn't make it 64-bit.
"aarch64-linux-gnu"
;; Note that (expt 2 109) in decimal notation starts with 64.
;; However, it isn't 32-bit.
,(format #f "x86_~a-linux-gnu" (expt 2 109)))))
(test-end) (test-end)
(false-if-exception (delete-file temp-file)) (false-if-exception (delete-file temp-file))