From 4f42d1c676533e1651a5bcdf2566f13ae4f20c84 Mon Sep 17 00:00:00 2001 From: Douglas Katzman Date: Thu, 26 Oct 2017 15:27:43 -0400 Subject: [PATCH] Fix crosssbuild-runner for hppa And run x86-64 crossbuild test without immobile-space feature. --- crossbuild-runner/backends/hppa/local-target-features | 2 +- crossbuild-runner/backends/x86-64/local-target-features | 2 +- crossbuild-runner/build-all.sh | 3 +-- src/compiler/hppa/vm.lisp | 3 ++- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crossbuild-runner/backends/hppa/local-target-features b/crossbuild-runner/backends/hppa/local-target-features index f2acd23b6..c876c8bcb 100644 --- a/crossbuild-runner/backends/hppa/local-target-features +++ b/crossbuild-runner/backends/hppa/local-target-features @@ -1 +1 @@ -:hppa :unix :elf :linux :cheneygc :stack-allocatable-vectors :stack-allocatable-fixed-objects :stack-allocatable-closures :stack-allocatable-lists :little-endian :os-provides-dlopen :os-provides-dladdr :os-provides-putwc :os-provides-blksize-t :os-provides-suseconds-t :os-provides-getprotoby-r :os-provides-poll +:hppa :unix :elf :linux :cheneygc :stack-allocatable-vectors :stack-allocatable-fixed-objects :stack-allocatable-closures :stack-allocatable-lists :big-endian :os-provides-dlopen :os-provides-dladdr :os-provides-putwc :os-provides-blksize-t :os-provides-suseconds-t :os-provides-getprotoby-r :os-provides-poll diff --git a/crossbuild-runner/backends/x86-64/local-target-features b/crossbuild-runner/backends/x86-64/local-target-features index d3db5771b..8070315ee 100644 --- a/crossbuild-runner/backends/x86-64/local-target-features +++ b/crossbuild-runner/backends/x86-64/local-target-features @@ -1 +1 @@ -:x86-64 :unix :elf :linux :sb-futex :largefile :64-bit :64-bit-registers :gencgc :stack-grows-downward-not-upward :c-stack-is-control-stack :linkage-table :compare-and-swap-vops :unwind-to-frame-and-call-vop :raw-instance-init-vops :precise-arg-count-error :fp-and-pc-standard-save :unbind-n-vop :stack-allocatable-closures :stack-allocatable-vectors :stack-allocatable-lists :stack-allocatable-fixed-objects :alien-callbacks :cycle-counter :complex-float-vops :raw-signed-word :float-eql-vops :integer-eql-vop :inline-constants :memory-barrier-vops :multiply-high-vops :sb-simd-pack :ash-right-vops :symbol-info-vops :immobile-space :immobile-code :compact-instance-header :little-endian :os-provides-dlopen :os-provides-dladdr :os-provides-putwc :os-provides-blksize-t :os-provides-suseconds-t :os-provides-getprotoby-r :os-provides-poll :sb-dynamic-core :immobile-symbols :sb-thread +:x86-64 :unix :elf :linux :sb-futex :largefile :64-bit :64-bit-registers :gencgc :stack-grows-downward-not-upward :c-stack-is-control-stack :linkage-table :compare-and-swap-vops :unwind-to-frame-and-call-vop :raw-instance-init-vops :precise-arg-count-error :fp-and-pc-standard-save :unbind-n-vop :stack-allocatable-closures :stack-allocatable-vectors :stack-allocatable-lists :stack-allocatable-fixed-objects :alien-callbacks :cycle-counter :complex-float-vops :raw-signed-word :float-eql-vops :integer-eql-vop :inline-constants :memory-barrier-vops :multiply-high-vops :sb-simd-pack :ash-right-vops :symbol-info-vops :little-endian :os-provides-dlopen :os-provides-dladdr :os-provides-putwc :os-provides-blksize-t :os-provides-suseconds-t :os-provides-getprotoby-r :os-provides-poll :sb-dynamic-core :sb-thread diff --git a/crossbuild-runner/build-all.sh b/crossbuild-runner/build-all.sh index 6452840d1..905d2919c 100755 --- a/crossbuild-runner/build-all.sh +++ b/crossbuild-runner/build-all.sh @@ -8,8 +8,7 @@ set -e # since we don't assume the presence of either a C cross-compiler # or a host machine on which to run its native compiler. -# FIXME: hppa -for arch in alpha arm arm64 mips ppc sparc x86 x86-64 +for arch in alpha arm arm64 hppa mips ppc sparc x86 x86-64 do echo TESTING $arch ltf=local-target-features.lisp-expr diff --git a/src/compiler/hppa/vm.lisp b/src/compiler/hppa/vm.lisp index 6a4e8555c..e6aa7a994 100644 --- a/src/compiler/hppa/vm.lisp +++ b/src/compiler/hppa/vm.lisp @@ -292,7 +292,8 @@ (null (sc-number-or-lose 'null)) ((or (integer #.sb!xc:most-negative-fixnum #.sb!xc:most-positive-fixnum) - system-area-pointer character) + #-sb-xc-host system-area-pointer ; no object can be a SAP in the host + character) (sc-number-or-lose 'immediate)) (symbol (if (static-symbol-p value) -- 2.11.4.GIT