From bf77540f53dbb693d87b9ff4fbfd09d3de7fb2d9 Mon Sep 17 00:00:00 2001 From: Nikodemus Siivola Date: Wed, 31 Dec 2008 09:51:47 +0000 Subject: [PATCH] 1.0.23.71: fix overlapping spaces on OpenBSD * Patch by Josh Elsasser. Going is despite the freeze since overlapping spaces are just plain broken. * Also mark THROW NO-SUCH-TAG failing on OpenBSD. --- NEWS | 2 ++ src/compiler/x86/parms.lisp | 16 ++++++++-------- tests/debug.impure.lisp | 1 + version.lisp-expr | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/NEWS b/NEWS index d06d739..56cb5b0 100644 --- a/NEWS +++ b/NEWS @@ -55,6 +55,8 @@ * bug fix: compiler error when attempting to derive return value of ARRAY-ELEMENT-TYPE when the array type was a union of intersection types. + * bug fix: address-spaces overlapped on OpenBSD. (thanks to Josh + Elsasser) changes in sbcl-1.0.23 relative to 1.0.22: * enhancement: when disassembling method functions, disassembly diff --git a/src/compiler/x86/parms.lisp b/src/compiler/x86/parms.lisp index ff801c5..8e0623c 100644 --- a/src/compiler/x86/parms.lisp +++ b/src/compiler/x86/parms.lisp @@ -225,18 +225,18 @@ #!+openbsd (progn - (def!constant read-only-space-start #x7b000000) - (def!constant read-only-space-end #x7b0ff000) + (def!constant read-only-space-start #x47000000) + (def!constant read-only-space-end #x470ff000) - (def!constant static-space-start #x7b100000) - (def!constant static-space-end #x7b1ff000) + (def!constant static-space-start #x47100000) + (def!constant static-space-end #x471ff000) - (def!constant dynamic-space-start #x4c000000) - (def!constant dynamic-space-end #x7b0ff000) + (def!constant dynamic-space-start #x48000000) + (def!constant dynamic-space-end #x78000000) ;; In CMUCL: 0xB0000000->0xB1000000 - (def!constant linkage-table-space-start #x7b200000) - (def!constant linkage-table-space-end #x7b2ff000)) + (def!constant linkage-table-space-start #x47200000) + (def!constant linkage-table-space-end #x472ff000)) #!+netbsd (progn diff --git a/tests/debug.impure.lisp b/tests/debug.impure.lisp index e0ca3b9..22b05eb 100644 --- a/tests/debug.impure.lisp +++ b/tests/debug.impure.lisp @@ -207,6 +207,7 @@ (with-test (:name (:throw :no-such-tag) :fails-on '(or + (and :x86 :openbsd) (and :x86 :sunos) (and :x86 :darwin) (and :x86-64 :darwin) diff --git a/version.lisp-expr b/version.lisp-expr index 288a527..fa58be3 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"1.0.23.70" +"1.0.23.71" -- 1.7.10.4