Skip to content

Commit

Permalink
Fix ppc64 failure-to-build (from a few weeks ago)
Browse files Browse the repository at this point in the history
Git rev 7354472 caused NIL to get a bogus widetag.
  • Loading branch information
snuglas committed Jan 2, 2024
1 parent c4b6904 commit 255f3ea
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
8 changes: 7 additions & 1 deletion make-target-2-load.lisp
Expand Up @@ -339,7 +339,13 @@ Please check that all strings which were not recognizable to the compiler


(do-all-symbols (symbol)
(sb-kernel:logior-header-bits symbol sb-vm::+symbol-initial-core+)
;; Don't futz with the header of static symbols.
;; Technically LOGIOR-HEADER-BITS can only be used on an OTHER-POINTER-LOWTAG
;; objects, so modifying NIL should not ever work, but it's especially wrong
;; on ppc64 where OTHER- and LIST- pointer lowtags are 10 bytes apart instead
;; of 8, so this was making a random alteration to the header.
(unless (eq (heap-allocated-p symbol) :static)
(sb-kernel:logior-header-bits symbol sb-vm::+symbol-initial-core+))

;; A symbol whose INFO slot underwent any kind of manipulation
;; such that it now has neither properties nor globaldb info,
Expand Down
8 changes: 8 additions & 0 deletions xfloat-math.lisp-expr
Expand Up @@ -2883,6 +2883,8 @@
(<= (32766 #.(D #x7FEFFFFF #xFFFFFFFF)) T)
(<= (32767 #.(S #x7F7FFFFF)) T)
(<= (32767 #.(D #x7FEFFFFF #xFFFFFFFF)) T)
(<= (37449 #.(S #x7F7FFFFF)) T)
(<= (37449 #.(D #x7FEFFFFF #xFFFFFFFF)) T)
(<= (43360 #.(S #x7F7FFFFF)) T)
(<= (43360 #.(D #x7FEFFFFF #xFFFFFFFF)) T)
(<= (43690 #.(S #x7F7FFFFF)) T)
Expand Down Expand Up @@ -3754,6 +3756,7 @@
(<= (#.(S #x-800001) 16383) T)
(<= (#.(S #x-800001) 32766) T)
(<= (#.(S #x-800001) 32767) T)
(<= (#.(S #x-800001) 37449) T)
(<= (#.(S #x-800001) 43360) T)
(<= (#.(S #x-800001) 43690) T)
(<= (#.(S #x-800001) 44032) T)
Expand Down Expand Up @@ -5521,6 +5524,7 @@
(<= (#.(D #x-100001 #xFFFFFFFF) 16383) T)
(<= (#.(D #x-100001 #xFFFFFFFF) 32766) T)
(<= (#.(D #x-100001 #xFFFFFFFF) 32767) T)
(<= (#.(D #x-100001 #xFFFFFFFF) 37449) T)
(<= (#.(D #x-100001 #xFFFFFFFF) 43360) T)
(<= (#.(D #x-100001 #xFFFFFFFF) 43690) T)
(<= (#.(D #x-100001 #xFFFFFFFF) 44032) T)
Expand Down Expand Up @@ -7126,6 +7130,7 @@
(<= (#.(S #x-800001) 16383 #.(S #x7F7FFFFF)) T)
(<= (#.(S #x-800001) 32766 #.(S #x7F7FFFFF)) T)
(<= (#.(S #x-800001) 32767 #.(S #x7F7FFFFF)) T)
(<= (#.(S #x-800001) 37449 #.(S #x7F7FFFFF)) T)
(<= (#.(S #x-800001) 43360 #.(S #x7F7FFFFF)) T)
(<= (#.(S #x-800001) 43690 #.(S #x7F7FFFFF)) T)
(<= (#.(S #x-800001) 44032 #.(S #x7F7FFFFF)) T)
Expand Down Expand Up @@ -7899,6 +7904,7 @@
(<= (#.(D #x-100001 #xFFFFFFFF) 16383 #.(D #x7FEFFFFF #xFFFFFFFF)) T)
(<= (#.(D #x-100001 #xFFFFFFFF) 32766 #.(D #x7FEFFFFF #xFFFFFFFF)) T)
(<= (#.(D #x-100001 #xFFFFFFFF) 32767 #.(D #x7FEFFFFF #xFFFFFFFF)) T)
(<= (#.(D #x-100001 #xFFFFFFFF) 37449 #.(D #x7FEFFFFF #xFFFFFFFF)) T)
(<= (#.(D #x-100001 #xFFFFFFFF) 43360 #.(D #x7FEFFFFF #xFFFFFFFF)) T)
(<= (#.(D #x-100001 #xFFFFFFFF) 43690 #.(D #x7FEFFFFF #xFFFFFFFF)) T)
(<= (#.(D #x-100001 #xFFFFFFFF) 44032 #.(D #x7FEFFFFF #xFFFFFFFF)) T)
Expand Down Expand Up @@ -14247,6 +14253,8 @@
(COERCE (32766 SINGLE-FLOAT) #.(S #x46FFFC00))
(COERCE (32767 DOUBLE-FLOAT) #.(D #x40DFFFC0 0))
(COERCE (32767 SINGLE-FLOAT) #.(S #x46FFFE00))
(COERCE (37449 DOUBLE-FLOAT) #.(D #x40E24920 0))
(COERCE (37449 SINGLE-FLOAT) #.(S #x47124900))
(COERCE (43360 DOUBLE-FLOAT) #.(D #x40E52C00 0))
(COERCE (43360 SINGLE-FLOAT) #.(S #x47296000))
(COERCE (43690 DOUBLE-FLOAT) #.(D #x40E55540 0))
Expand Down

0 comments on commit 255f3ea

Please sign in to comment.