Raymond Toy pushed to branch sparc64-dev at cmucl / cmucl
Commits: 5dafa396 by Raymond Toy at 2016-12-17T20:11:17-08:00 Set paths correctly for sparc64.
We still have :sparc, so we need to distinguish between just sparc and sparc64. We'll fix this later. Just want to be able to do a 32-bit build using all the sparc64 files.
- - - - -
3 changed files:
- src/tools/worldbuild.lisp - src/tools/worldcom.lisp - src/tools/worldload.lisp
Changes:
===================================== src/tools/worldbuild.lisp ===================================== --- a/src/tools/worldbuild.lisp +++ b/src/tools/worldbuild.lisp @@ -27,11 +27,17 @@ "target:assembly/mips/array.assem" "target:assembly/mips/arith.assem" "target:assembly/mips/alloc.assem")) - ,@(when (c:backend-featurep :sparc) + ,@(when (and (c:backend-featurep :sparc) + (not (c:backend-featurep :sparc64))) '("target:assembly/sparc/assem-rtns.assem" "target:assembly/sparc/array.assem" "target:assembly/sparc/arith.assem" "target:assembly/sparc/alloc.assem")) + ,@(when (c:backend-featurep :sparc64) + '("target:assembly/sparc64/assem-rtns.assem" + "target:assembly/sparc64/array.assem" + "target:assembly/sparc64/arith.assem" + "target:assembly/sparc64/alloc.assem")) ,@(when (c:backend-featurep :rt) '("target:assembly/rt/assem-rtns.assem" "target:assembly/rt/array.assem"
===================================== src/tools/worldcom.lisp ===================================== --- a/src/tools/worldcom.lisp +++ b/src/tools/worldcom.lisp @@ -58,12 +58,19 @@ (comf "target:assembly/mips/arith" :assem t) (comf "target:assembly/mips/alloc" :assem t))
-(when (c:backend-featurep :sparc) +(when (and (c:backend-featurep :sparc) + (not (c:backend-featurep :sparc64))) (comf "target:assembly/sparc/assem-rtns" :assem t) (comf "target:assembly/sparc/array" :assem t) (comf "target:assembly/sparc/arith" :assem t) (comf "target:assembly/sparc/alloc" :assem t))
+(when (c:backend-featurep :sparc64) + (comf "target:assembly/sparc64/assem-rtns" :assem t) + (comf "target:assembly/sparc64/array" :assem t) + (comf "target:assembly/sparc64/arith" :assem t) + (comf "target:assembly/sparc64/alloc" :assem t)) + (when (c:backend-featurep :rt) (comf "target:assembly/rt/assem-rtns" :assem t) (comf "target:assembly/rt/array" :assem t)
===================================== src/tools/worldload.lisp ===================================== --- a/src/tools/worldload.lisp +++ b/src/tools/worldload.lisp @@ -59,7 +59,8 @@ (setf (ext:search-list "c:") '("target:compiler/")) (setf (ext:search-list "vm:") '(#+(or pmax sgi) "c:mips/" - #+sparc "c:sparc/" + #+(and sparc (not sparc64)) "c/sparc/" + #+sparc64 "c/sparc64/" #+rt "c:rt/" #+hppa "c:hppa/" #+x86 "c:x86/" @@ -69,7 +70,8 @@ "c:generic/")) (setf (ext:search-list "assem:") '(#+(or pmax sgi) "target:assembly/mips/" - #+sparc "target:assembly/sparc/" + #+sparc64 "target:assembly/sparc64/" + #+(and sparc (not sparc64)) "target:assembly/sparc/" #+rt "target:assembly/rt/" #+hppa "target:assembly/hppa/" #+x86 "target:assembly/x86/"
View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/5dafa396dadbffead16fd9d6e8...