Ignore:
Timestamp:
Oct 4, 2008, 6:07:35 PM (13 years ago)
Author:
gz
Message:

Merge a bunch of changes from trunk mostly having to do with x8632 and/or Windows and/or Solaris ports, not relevant here but keep synch'ed to get keep diffs smaller.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/working-0711/ccl/lib/compile-ccl.lisp

    r10938 r10972  
    5555
    5656(defparameter *x86-compiler-modules*
    57   '(x86-arch
     57  '(x8632-arch
     58    x8664-arch
     59    x86-arch
     60    x8632env
     61    x8664env
    5862    x86-asm
    5963    x86-lap
    60     x8664-arch
    61     x8664env
    6264    x86-backend
    63     )
    64   )
     65))
    6566
    6667(defparameter *ppc32-compiler-backend-modules*
     
    8889
    8990(defparameter *ppc-xload-modules* '(xppcfasload xfasload heap-image ))
     91(defparameter *x8632-xload-modules* '(xx8632fasload xfasload heap-image ))
    9092(defparameter *x8664-xload-modules* '(xx8664fasload xfasload heap-image ))
    9193
     
    106108  (case target
    107109    ((:ppc32 :ppc64) *ppc-xload-modules*)
     110    (:x8632 *x8632-xload-modules*)
    108111    (:x8664 *x8664-xload-modules*)))
    109112
     
    131134             (:darwinppc64 'ffi-darwinppc64)
    132135             (:linuxppc64 'ffi-linuxppc64)
     136             (:darwinx8632 'ffi-darwinx8632)
    133137             (:linuxx8664 'ffi-linuxx8664)
    134138             (:darwinx8664 'ffi-darwinx8664)
    135              (:freebsdx8664 'ffi-freebsdx8664)))))
     139             (:freebsdx8664 'ffi-freebsdx8664)
     140             (:solarisx8664 'ffi-solarisx8664)
     141             (:win64 'ffi-win64)
     142             (:linuxx8632 'ffi-linuxx8632)
     143             (:win32 'ffi-win32)))))
    136144
    137145
     
    146154                    *ppc64-compiler-backend-modules*
    147155                    *ppc-compiler-backend-modules*))
     156    (:x8632 (append *x86-compiler-modules*
     157                    *x8632-compiler-backend-modules*
     158                    *x86-compiler-backend-modules*))
    148159    (:x8664 (append *x86-compiler-modules*
    149160                    *x8664-compiler-backend-modules*
     
    162173          (case target
    163174            ((:ppc32 :ppc64) '(ppc-backtrace ppc-disassemble))
    164             (:x8664 '(x86-backtrace x86-disassemble)))))
     175            ((:x8632 :x8664) '(x86-backtrace x86-disassemble)))))
    165176         
    166177
     
    212223             '(ppc-error-signal ppc-trap-support
    213224               ppc-threads-utils ppc-callback-support))
    214             ((:linuxx8664 :freebsdx8664 :darwinx8664)
     225            ((:linuxx8664 :freebsdx8664 :darwinx8664 :solarisx8664
     226              :darwinx8632 :win64  :linuxx8632 :win32)
    215227             '(x86-error-signal x86-trap-support
    216228               x86-threads-utils x86-callback-support)))))
     
    419431    (:darwinppc64 "ppc-boot64.image")
    420432    (:linuxppc64 "ppc-boot64")
     433    (:darwinx8632 "x86-boot32.image")
    421434    (:linuxx8664 "x86-boot64")
    422435    (:freebsdx8664 "fx86-boot64")
    423     (:darwinx8664 "x86-boot64.image")))
     436    (:darwinx8664 "x86-boot64.image")
     437    (:solarisx8664 "sx86-boot64")
     438    (:win64 "wx86-boot64.image")
     439    (:linuxx8632 "x86-boot32")))
    424440
    425441(defun standard-kernel-name (&optional (target (backend-name *host-backend*)))
     
    428444    (:linuxppc32 "ppccl")
    429445    (:darwinppc64 "dppccl64")
     446    (:darwinx8632 "dx86cl")
    430447    (:linuxppc64 "ppccl64")
    431448    (:linuxx8664 "lx86cl64")
    432449    (:freebsdx8664 "fx86cl64")
    433     (:darwinx8664 "dx86cl64")))
     450    (:darwinx8664 "dx86cl64")
     451    (:solarisx8664 "sx86cl64")
     452    (:win64 "wx86cl64.exe")
     453    (:linuxx8632 "lx86cl")))
    434454
    435455(defun standard-image-name (&optional (target (backend-name *host-backend*)))
     
    439459    (:darwinppc64 "dppccl64.image")
    440460    (:linuxppc64 "PPCCL64")
     461    (:darwinx8632 "dx86cl.image")
    441462    (:linuxx8664 "LX86CL64")
    442463    (:freebsdx8664 "FX86CL64")
    443     (:darwinx8664 "dx86cl64.image")))
     464    (:darwinx8664 "dx86cl64.image")
     465    (:solarisx8664 "SX86CL64")
     466    (:win64 "wx86cl64.image")
     467    (:linuxx8632 "LX86CL")))
    444468
    445469(defun kernel-build-directory (&optional (target (backend-name *host-backend*)))
     
    449473    (:darwinppc64 "darwinppc64")
    450474    (:linuxppc64 "linuxppc64")
     475    (:darwinx8632 "darwinx8632")
    451476    (:linuxx8664 "linuxx8664")
    452477    (:freebsdx8664 "freebsdx8664")
    453     (:darwinx8664 "darwinx8664")))
     478    (:darwinx8664 "darwinx8664")
     479    (:solarisx8664 "solarisx64")
     480    (:win64 "win64")
     481    (:linuxx8632 "linuxx8632")))
     482
     483;;; If we distribute (e.g.) 32- and 64-bit versions for the same
     484;;; machine and OS in the same svn directory, return the name of the
     485;;; peer backend, or NIL. For example., the peer of :linuxppc64 is
     486;;; :linuxppc32.  Note that this may change over time.
     487;;; Return NIL if the concept doesn't apply.
     488(defun peer-platform (&optional (target (backend-name *host-backend*)))
     489  (let* ((pairs '((:darwinppc32 . :darwinppc64)
     490                  (:linuxppc32 . :linuxppc64)
     491                  (:darwinx8632 . :darwinx8664))))
     492    (or (cdr (assoc target pairs))
     493        (car (rassoc target pairs)))))
     494
     495(defun make-program (&optional (target (backend-name *host-backend*)))
     496  ;; The Solaris "make" program is too clever to understand -C, so
     497  ;; use GNU make (installed as "gmake").
     498  (case target
     499    (:solarisx8664 "gmake")
     500    (t "make")))
    454501
    455502(defparameter *known-optional-features* '(:lock-accouting :count-gf-calls :monitor-futex-wait :unique-dcode))
Note: See TracChangeset for help on using the changeset viewer.