projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sb-bsd-sockets: Fix type of canonname in addrinfo.
[sbcl.git]
/
src
/
code
/
cold-init.lisp
diff --git
a/src/code/cold-init.lisp
b/src/code/cold-init.lisp
index
c343f4a
..
edeb787
100644
(file)
--- a/
src/code/cold-init.lisp
+++ b/
src/code/cold-init.lisp
@@
-230,7
+230,8
@@
(show-and-call stream-cold-init-or-reset)
(show-and-call !loader-cold-init)
(show-and-call !foreign-cold-init)
(show-and-call stream-cold-init-or-reset)
(show-and-call !loader-cold-init)
(show-and-call !foreign-cold-init)
- #!-win32 (show-and-call signal-cold-init-or-reinit)
+ #!-(and win32 (not sb-thread))
+ (show-and-call signal-cold-init-or-reinit)
(/show0 "enabling internal errors")
(setf (sb!alien:extern-alien "internal_errors_enabled" boolean) t)
(/show0 "enabling internal errors")
(setf (sb!alien:extern-alien "internal_errors_enabled" boolean) t)
@@
-348,10
+349,11
@@
process to continue normally."
(setf sb!alien::*default-c-string-external-format* nil)
;; WITHOUT-GCING implies WITHOUT-INTERRUPTS.
(without-gcing
(setf sb!alien::*default-c-string-external-format* nil)
;; WITHOUT-GCING implies WITHOUT-INTERRUPTS.
(without-gcing
+ ;; Initialize streams first, so that any errors can be printed later
+ (stream-reinit t)
(os-cold-init-or-reinit)
(thread-init-or-reinit)
(os-cold-init-or-reinit)
(thread-init-or-reinit)
- (stream-reinit t)
- #!-win32
+ #!-(and win32 (not sb-thread))
(signal-cold-init-or-reinit)
(setf (sb!alien:extern-alien "internal_errors_enabled" boolean) t)
(float-cold-init-or-reinit))
(signal-cold-init-or-reinit)
(setf (sb!alien:extern-alien "internal_errors_enabled" boolean) t)
(float-cold-init-or-reinit))
@@
-407,4
+409,4
@@
process to continue normally."
(t
(sb!sys:%primitive print (hexstr x)))))))
(%cold-print x 0))
(t
(sb!sys:%primitive print (hexstr x)))))))
(%cold-print x 0))
- (values))
\ No newline at end of file
+ (values))