mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-18 10:10:23 +02:00
Code Activity

Fix handling of the *-gnux32 target.

Browse source 
* module/system/base/target.scm (triplet-pointer-size): Fix typo in the
  x32 triplet name.
* test-suite/tests/asm-to-bytecode.test (native-os): New procedure.
  (test-target): Use (native-word-size) only when both the CPU and OS
  match.
This commit is contained in:
Ludovic Courtès 2013-02-28 09:42:31 +01:00
parent a5d8f98c60
commit aacc689677
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -92,7 +92,7 @@
((string-match "^mips64.*-gnuabi64" triplet) 8) ; n64 ABI ((string-match "^mips64.*-gnuabi64" triplet) 8) ; n64 ABI
((string-match "^mips64" cpu) 4) ; n32 or o32 ((string-match "^mips64" cpu) 4) ; n32 or o32
((string-match "^x64_64-.*-gnux32" triplet) 4) ; x32 ((string-match "^x86_64-.*-gnux32" triplet) 4) ; x32
((string-match "64$" cpu) 8) ((string-match "64$" cpu) 8)
((string-match "64[lbe][lbe]$" cpu) 8) ((string-match "64[lbe][lbe]$" cpu) 8)

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

@ -132,6 +132,9 @@
(define (native-cpu) (define (native-cpu)
(with-target %host-type target-cpu)) (with-target %host-type target-cpu))
(define (native-os)
(with-target %host-type target-os))
(define (native-word-size) (define (native-word-size)
((@ (system foreign) sizeof) '*)) ((@ (system foreign) sizeof) '*))
@ -152,7 +155,8 @@
;; actually has a 32-bit user-land, for instance (see ;; actually has a 32-bit user-land, for instance (see
;; <http://www.debian.org/ports/sparc/#sparc64bit> ;; <http://www.debian.org/ports/sparc/#sparc64bit>
;; for details.) ;; for details.)
(if (string=? (native-cpu) (target-cpu)) (if (and (string=? (native-cpu) (target-cpu))
(string=? (native-os) (target-os)))
(native-word-size) (native-word-size)
word-size)) word-size))
(b (compile-bytecode (b (compile-bytecode