mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-16 16:50:21 +02:00
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts: libguile/__scm.h libguile/array-map.c libguile/procprop.c libguile/tags.h module/ice-9/deprecated.scm module/ice-9/psyntax-pp.scm module/ice-9/psyntax.scm test-suite/standalone/test-num2integral.c test-suite/tests/regexp.test
This commit is contained in:
commit
91ee7515da
64 changed files with 1024 additions and 648 deletions
|
@ -93,7 +93,7 @@
|
|||
;;; This function is among the trickiest I've ever written. I tried many
|
||||
;;; variants. In the end, simple is best, of course.
|
||||
;;;
|
||||
;;; After turning this around a number of times, it seems that the the
|
||||
;;; After turning this around a number of times, it seems that the
|
||||
;;; desired behavior is that .go files should exist in a path, for
|
||||
;;; searching. That is orthogonal to this function. For writing .go
|
||||
;;; files, either you know where they should go, in which case you tell
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
;;; Compilation targets
|
||||
|
||||
;; Copyright (C) 2011 Free Software Foundation, Inc.
|
||||
;; Copyright (C) 2011, 2012 Free Software Foundation, Inc.
|
||||
|
||||
;; This library is free software; you can redistribute it and/or
|
||||
;; modify it under the terms of the GNU Lesser General Public
|
||||
|
@ -82,9 +82,9 @@
|
|||
(cond ((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")) 4)
|
||||
((member cpu '("sparc" "powerpc" "mips" "mipsel")) 4)
|
||||
((string-match "^arm.*" cpu) 4)
|
||||
(else "unknown CPU word size" cpu))))
|
||||
(else (error "unknown CPU word size" cpu)))))
|
||||
|
||||
(define (triplet-cpu t)
|
||||
(substring t 0 (string-index t #\-)))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue