More SB!XC:DEFMACRO -> DEFMACRO and dial the tree-shaking knob up a notch

SB-PRETTY was in the (default) set of packages in which to retain any symbol
having any "attachment" at all (macro, type, etc).  It is now in the list of
packages in which to retain only external symbols.

make-target-2-load.lisp

@@ -264,6 +264,7 @@
         #.(find-package "SB-ASSEM")
         #.(find-package "SB-DISASSEM")
         #.(find-package "SB-IMPL")
+        #.(find-package "SB-PRETTY")
         #.(find-package "SB-KERNEL"))
        ;; Assume all and only external symbols must be retained
        (eq accessibility :external))

make-target-2.sh

@@ -69,6 +69,7 @@ echo //checking for leftover cold-init symbols
           (mapcan (quote apropos-list)
            (quote ("DEFINE-INFO-TYPE" "LVAR-TYPE-USING"
                    "COPY-LIST-MACRO" "TWO-ARG-+/-"
+                   "PPRINT-TAGBODY-GUTS" "WITH-DESCRIPTOR-HANDLERS"
                    "SUBTRACT-BIGNUM-LOOP" "BIGNUM-REPLACE" "WITH-BIGNUM-BUFFERS"
                    "GCD-ASSERT" "MODULARLY" "BIGNUM-NEGATE-LOOP"
                    "SHIFT-RIGHT-UNALIGNED"

src/code/pprint.lisp

@@ -1119,8 +1119,7 @@ line break."
        (write-char #\space stream)
        (pprint-newline :mandatory stream)))))
 
-(eval-when (:compile-toplevel :execute)
-(sb!xc:defmacro pprint-tagbody-guts (stream)
+(defmacro pprint-tagbody-guts (stream)
   `(loop
      (pprint-exit-if-list-exhausted)
      (write-char #\space ,stream)
@@ -1129,7 +1128,7 @@ line break."
                       (if (atom form-or-tag) 0 1)
                       ,stream)
        (pprint-newline :linear ,stream)
-       (output-object form-or-tag ,stream)))))
+       (output-object form-or-tag ,stream))))
 
 (defun pprint-tagbody (stream list &rest noise)
   (declare (ignore noise))
@@ -1344,8 +1343,7 @@ line break."
 
 ;;;; the interface seen by regular (ugly) printer and initialization routines
 
-(eval-when (:compile-toplevel :execute)
-(sb!xc:defmacro with-pretty-stream ((stream-var
+(defmacro with-pretty-stream ((stream-var
                                      &optional (stream-expression stream-var))
                                     &body body)
   (let ((flet-name (sb!xc:gensym "WITH-PRETTY-STREAM")))
@@ -1358,7 +1356,7 @@ line break."
                (let ((stream (make-pretty-stream stream)))
                  (,flet-name stream)
                  (force-pretty-output stream)))))
-       nil))))
+       nil)))
 
 (defun call-logical-block-printer (proc stream prefix per-line-p suffix
                                    &optional (object nil obj-supplied-p))

src/code/serve-event.lisp

@@ -57,7 +57,7 @@
 (!define-thread-local *descriptor-handlers* nil
   "List of all the currently active handlers for file descriptors")
 
-(sb!xc:defmacro with-descriptor-handlers (&body forms)
+(defmacro with-descriptor-handlers (&body forms)
   ;; FD-STREAM functionality can add and remove descriptors on it's
   ;; own, so getting an interrupt while modifying this and the
   ;; starting to recursively modify it could lose...