master: Silence some output of make-target-2 if --noinform was given
snuglas via Sbcl-commits <[email protected]>
| Newsgroups | gmane.lisp.steel-bank.cvs |
|---|---|
| Message-ID | <[email protected]> |
The branch "master" has been updated in SBCL:
via 2df1a2bb309f96c75fb2905edc9a00179585de58 (commit)
from 4189ab7f19e64417304a9c0fb6e0314158462bbb (commit)
- Log -----------------------------------------------------------------
commit 2df1a2bb309f96c75fb2905edc9a00179585de58
Author: Douglas Katzman <[email protected]>
Date: Mon Aug 10 17:02:08 2026 +0000
Silence some output of make-target-2 if --noinform was given
---
make-target-2-load.lisp | 37 +++++++++++++++++++------------------
src/code/cold-init.lisp | 7 ++++---
src/cold/warm.lisp | 3 ++-
3 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/make-target-2-load.lisp b/make-target-2-load.lisp
index 36c4de3dc..e1a942561 100644
--- a/make-target-2-load.lisp
+++ b/make-target-2-load.lisp
@@ -488,24 +488,25 @@ Please check that all strings which were not recognizable to the compiler
(and (boundp symbol) (not (keywordp symbol)))))))))
:verbose nil :print nil)
(unintern 'sb-impl::shake-packages 'sb-impl)
- (let ((sum-delta-ext 0)
- (sum-delta-int 0))
- (format t "~&~26TExternal | Internal~%")
- (dolist (entry counts)
- (let* ((ext (sb-impl::package-external-symbol-count (car entry)))
- (int (sb-impl::package-internal-symbol-count (car entry)))
- (delta-ext (- ext (cadr entry)))
- (delta-int (- int (caddr entry))))
- (incf sum-delta-ext delta-ext)
- (incf sum-delta-int delta-int)
- (assert (<= delta-ext 0))
- (assert (<= delta-int 0))
- (format t "~20a | ~5d (~5@d) | ~5d (~5@d)~%"
- (package-name (car entry))
- ext delta-ext int delta-int)))
- (format t "~28t (~5@d) | (~5@d) = (~d)~%"
- sum-delta-ext sum-delta-int
- (+ sum-delta-ext sum-delta-int))))
+ (when (zerop (extern-alien "lisp_startup_options" char))
+ (let ((sum-delta-ext 0)
+ (sum-delta-int 0))
+ (format t "~&~26TExternal | Internal~%")
+ (dolist (entry counts)
+ (let* ((ext (sb-impl::package-external-symbol-count (car entry)))
+ (int (sb-impl::package-internal-symbol-count (car entry)))
+ (delta-ext (- ext (cadr entry)))
+ (delta-int (- int (caddr entry))))
+ (incf sum-delta-ext delta-ext)
+ (incf sum-delta-int delta-int)
+ (assert (<= delta-ext 0))
+ (assert (<= delta-int 0))
+ (format t "~20a | ~5d (~5@d) | ~5d (~5@d)~%"
+ (package-name (car entry))
+ ext delta-ext int delta-int)))
+ (format t "~28t (~5@d) | (~5@d) = (~d)~%"
+ sum-delta-ext sum-delta-int
+ (+ sum-delta-ext sum-delta-int)))))
(scan-format-control-strings)
diff --git a/src/code/cold-init.lisp b/src/code/cold-init.lisp
index 46a4db48b..ac1b5d777 100644
--- a/src/code/cold-init.lisp
+++ b/src/code/cold-init.lisp
@@ -190,9 +190,10 @@
;; The readtable needs to be initialized for printing symbols early,
;; which is useful for debugging.
(!readtable-cold-init)
- (write-string "Checking symbol printer: ")
- (write 't)
- (terpri)
+ (unless (!c-runtime-noinform-p)
+ (write-string "Checking symbol printer: ")
+ (write 't)
+ (terpri))
;; *RAW-SLOT-DATA* is essentially a compile-time constant
;; but isn't dumpable as such because it has functions in it.
diff --git a/src/cold/warm.lisp b/src/cold/warm.lisp
index 052bc815a..18fba5528 100644
--- a/src/cold/warm.lisp
+++ b/src/cold/warm.lisp
@@ -240,7 +240,8 @@ sb-kernel::
(dolist (cell (sort list #'> :key #'car))
(format output "~7d ~s~%" (car cell) (cdr cell))))))
-(when (sb-sys:find-dynamic-foreign-symbol-address "tot_gc_nsec")
+(when (and (sb-sys:find-dynamic-foreign-symbol-address "tot_gc_nsec")
+ (zerop (extern-alien "lisp_startup_options" char)))
(let* ((run-sec (/ (get-internal-real-time) internal-time-units-per-second))
(gc-nsec (extern-alien "tot_gc_nsec" unsigned))
(gc-msec (/ (float gc-nsec) 1000000)))
-----------------------------------------------------------------------
hooks/post-receive
--
SBCL