mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-11 22:31:12 +02:00
Code Activity

Check whether a triplet's OS part specifies an ABI.

Browse source 
* module/system/base/target.scm (cpu-word-size): Rename to...
  (triplet-pointer-size): ... this.  Update caller.  Take a triplet as
  the argument.  Check the `triplet-os' part when checking for equality
  with the host.  Add support "mips64.*-gnuabi64".
* test-suite/tests/asm-to-bytecode.test ("cross-compilation")
  [ "mips64el-unknown-linux-gnuabi64"]: New test.
This commit is contained in:
Ludovic Courtès 2013-02-27 20:36:52 +01:00
parent cc2948aa31
commit 9130ec74cf
2 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

35
module/system/base/target.scm
View file

@ -55,7 +55,7 @@
(let ((cpu (triplet-cpu target)))
(with-fluids ((%target-type target)
(%target-endianness (cpu-endianness cpu))
(%target-word-size (cpu-word-size cpu)))
(%target-word-size (triplet-pointer-size target)))
(thunk))))
(define (cpu-endianness cpu)
@ -75,21 +75,28 @@
(else
(error "unknown CPU endianness" cpu)))))
(define (cpu-word-size cpu)
"Return the word size for CPU."
(if (string=? cpu (triplet-cpu %host-type))
%native-word-size
(cond ((string-match "^i[0-9]86$" cpu) 4)
(define (triplet-pointer-size triplet)
"Return the size of pointers in bytes for TRIPLET."
(let ((cpu (triplet-cpu triplet)))
(cond ((and (string=? cpu (triplet-cpu %host-type))
(string=? (triplet-os triplet) (triplet-os %host-type)))
%native-word-size)
;; See <http://www.linux-mips.org/wiki/WhatsWrongWithO32N32N64>
;; for details on the MIPS ABIs.
((string-match "^mips64" cpu) 4) ; n32 or o32
((string-match "^i[0-9]86$" cpu) 4)
((string-match "64$" cpu) 8)
((string-match "64[lbe][lbe]$" cpu) 8)
((member cpu '("sparc" "powerpc" "mips" "mipsel")) 4)
((string-match "^arm.*" cpu) 4)
(else (error "unknown CPU word size" cpu)))))
;; Although GNU config.guess doesn't yet recognize them,
;; Debian (ab)uses the OS part to denote the specific ABI
;; being used: <http://wiki.debian.org/Multiarch/Tuples>.
;; See <http://www.linux-mips.org/wiki/WhatsWrongWithO32N32N64>
;; for details on the MIPS ABIs.
((string-match "^mips64.*-gnuabi64" triplet) 8) ; n64 ABI
((string-match "^mips64" cpu) 4) ; n32 or o32
((string-match "64$" cpu) 8)
((string-match "64[lbe][lbe]$" cpu) 8)
((member cpu '("sparc" "powerpc" "mips" "mipsel")) 4)
((string-match "^arm.*" cpu) 4)
(else (error "unknown CPU word size" cpu)))))
(define (triplet-cpu t)
(substring t 0 (string-index t #\-)))

2
test-suite/tests/asm-to-bytecode.test
View file

@ -196,6 +196,8 @@
(test-target "mips64el-unknown-linux-gnu" ; n32 or o32 ABI
(endianness little) 4)
(test-target "mips64el-unknown-linux-gnuabi64" ; n64 ABI (Debian tuplet)
(endianness little) 8)
(pass-if-exception "unknown target"
exception:miscellaneous-error