[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.7-133-gaacc689

[Ludovic Courtès]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=aacc689677316ebb1ea45bb8fb22f921ebaf97d5

The branch, stable-2.0 has been updated
       via  aacc689677316ebb1ea45bb8fb22f921ebaf97d5 (commit)
      from  a5d8f98c60344548f0b6a70828b95f2b2e1f7553 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit aacc689677316ebb1ea45bb8fb22f921ebaf97d5
Author: Ludovic Courtès <address@hidden>
Date:   Thu Feb 28 09:42:31 2013 +0100

    Fix handling of the *-gnux32 target.
    
    * 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.

-----------------------------------------------------------------------

Summary of changes:
 module/system/base/target.scm         |    2 +-
 test-suite/tests/asm-to-bytecode.test |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/module/system/base/target.scm b/module/system/base/target.scm
index 762894c..c74ae67 100644
--- a/module/system/base/target.scm
+++ b/module/system/base/target.scm
@@ -92,7 +92,7 @@
           ((string-match "^mips64.*-gnuabi64" triplet) 8) ; n64 ABI
           ((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[lbe][lbe]$" cpu) 8)
diff --git a/test-suite/tests/asm-to-bytecode.test 
b/test-suite/tests/asm-to-bytecode.test
index 3bd8a92..6d2f20e 100644
--- a/test-suite/tests/asm-to-bytecode.test
+++ b/test-suite/tests/asm-to-bytecode.test
@@ -132,6 +132,9 @@
 (define (native-cpu)
   (with-target %host-type target-cpu))
 
+(define (native-os)
+  (with-target %host-type target-os))
+
 (define (native-word-size)
   ((@ (system foreign) sizeof) '*))
 
@@ -152,7 +155,8 @@
                    ;; actually has a 32-bit user-land, for instance (see
                    ;; <http://www.debian.org/ports/sparc/#sparc64bit>
                    ;; for details.)
-                   (if (string=? (native-cpu) (target-cpu))
+                   (if (and (string=? (native-cpu) (target-cpu))
+                            (string=? (native-os) (target-os)))
                        (native-word-size)
                        word-size))
                   (b (compile-bytecode


hooks/post-receive
-- 
GNU Guile