Get rid of src/runtime/sbcl.h

Can't see any value in having a 'make' recipe for it.

.gitignore

@@ -26,7 +26,6 @@ src/runtime/openbsd-sigcontext.h
 src/runtime/sbcl
 src/runtime/ldb
 src/runtime/sbcl.exe
-src/runtime/sbcl.h
 src/runtime/sbcl.mk
 src/runtime/shrinkwrap-sbcl*
 src/runtime/target-arch-os.h

clean.sh

@@ -5,9 +5,6 @@ set -e
 # In most cases, we can remove the directories, too.
 #
 # Preserving the skeletons of some directories might or might not not be relevant.
-# The supposed explanation definitely no longer holds - there is no "src/c-runtime/sbcl.h"
-# as a symlink into "output/". The sbcl.h file is a plain file, and it's been that way
-# for quite some time.
 rm -rf obj/* src/runtime/genesis/ src/runtime/sbcl.mk src/runtime/*.dSYM
 
 if [ -z "$SBCL_LEAVE_OUTPUT" ]
@@ -44,9 +41,6 @@ done
 # files. Some explanations:
 #   sbcl
 #     the runtime environment, created by compiling C code
-#   sbcl.h
-#     information about Lisp code needed to build the runtime environment,
-#     created by running GENESIS
 #   Config, target
 #     architecture-dependent or OS-dependent symlinks
 #   core
@@ -116,7 +110,6 @@ find . \( \
         -name 'test.log' -o \
         -name 'a.out' -o \
         -name 'sbcl' -o \
-        -name 'sbcl.h' -o \
         -name 'ppc-linux-mcontext.h' -o \
         -name 'depend' -o \
         -name 'TAGS' -o \

make-host-1.sh

@@ -28,7 +28,7 @@ export LANG LC_ALL
 # file will be loaded before the following file is compiled.)
 #
 # Also take the opportunity to compile and load genesis, to create the
-# header file sbcl.h which will be needed to create the C runtime
+# header files which will be needed to create the C runtime
 # environment.
 echo //building cross-compiler, and doing first genesis
 echo '(load "loader.lisp") (load-sbcl-file "make-host-1.lisp")' | $SBCL_XC_HOST

src/compiler/generic/genesis.lisp

@@ -3013,7 +3013,6 @@ Legal values for OFFSET are -4, -8, -12, ..."
   (format t "/*~%")
   (dolist (line
            '("This is a machine-generated file. Please do not edit it by hand."
-             "(As of sbcl-0.8.14, it came from WRITE-CONFIG-H in genesis.lisp.)"
              nil
              "This file contains low-level information about the"
              "internals of a particular version and configuration"
@@ -4324,8 +4323,7 @@ static inline uword_t word_has_stickymark(uword_t word) {
                     (funcall lambda stream)
                     (when inclusion-guardp
                       (format stream "#endif~%"))))))
-        (out-to "config" (write-config-h stream))
-        (out-to "constants" (write-constants-h stream))
+        (out-to "sbcl" (write-config-h stream) (write-constants-h stream))
         (out-to "regnames" (write-regnames-h stream))
         (out-to "errnames" (write-errnames-h stream))
         (out-to "gc-tables" (sb-vm::write-gc-tables stream))

src/runtime/GNUmakefile

@@ -172,10 +172,6 @@ sbcl.mk: Config
 	  fi ; \
 	  : ) > $@
 
-sbcl.h: $(wildcard genesis/*.h)
-	echo '#include "genesis/config.h"' >sbcl.h
-	echo '#include "genesis/constants.h"' >>sbcl.h
-
 # || true because we don't want the build to break if etags isn't there.
 # ...but it's still nice to have it done by default.
 HEADERS=$(wildcard *.h genesis/*.h)
@@ -184,15 +180,15 @@ TAGS tags: $(SRCS) $(HEADERS) $(INC)
 	@etags --language=c $(SRCS) $(HEADERS) $(INC) || true
 
 clean:
-	-rm -f *.[do] ../../tlsf-bsd/tlsf/tlsf.o $(TARGET) *.tmp libsbcl.a sbcl.h \
+	-rm -f *.[do] ../../tlsf-bsd/tlsf/tlsf.o $(TARGET) *.tmp libsbcl.a \
  ldb unit-tests libsbcl.a shrinkwrap-sbcl* sbcl.mk core
 
-%.d: %.c sbcl.h
+%.d: %.c
 	@$(CC) $(DEPEND_FLAGS) $(CPPFLAGS) $< > $@.tmp; \
 	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.tmp > $@; \
 	rm -f $@.tmp
 
-%.d: %.S sbcl.h
+%.d: %.S
 	@$(CC) $(DEPEND_FLAGS) $(CPPFLAGS) $< > $@.tmp; \
 	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.tmp > $@; \
 	rm -f $@.tmp

src/runtime/arena.c

@@ -3,7 +3,7 @@
 #include <errno.h>
 #include <string.h>
 #include <inttypes.h>
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "runtime.h"
 #include "globals.h"
 #include "gc.h"

src/runtime/arm-arch.c

@@ -10,7 +10,7 @@
  */
 #include <stdio.h>
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "runtime.h"
 #include "arch.h"
 #include "globals.h"

src/runtime/arm-assem.S

@@ -1,6 +1,6 @@
 #include "lispregs.h"
 #include "globals.h"
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 
 #include "genesis/closure.h"
 #include "genesis/static-symbols.h"

src/runtime/arm-bsd-os.c

@@ -17,7 +17,7 @@
 #include <stdio.h>
 #include <sys/param.h>
 #include <sys/file.h>
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "os.h"
 #include "arch.h"
 #include "globals.h"

src/runtime/arm-linux-os.c

@@ -17,7 +17,7 @@
 #include <stdio.h>
 #include <sys/param.h>
 #include <sys/file.h>
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "os.h"
 #include "arch.h"
 #include "globals.h"

src/runtime/arm64-arch.c

@@ -10,7 +10,7 @@
  */
 #include <stdio.h>
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "runtime.h"
 #include "arch.h"
 #include "globals.h"

src/runtime/arm64-bsd-os.c

@@ -17,7 +17,7 @@
 #include <stdio.h>
 #include <sys/param.h>
 #include <sys/file.h>
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "os.h"
 #include "arch.h"
 #include "globals.h"

src/runtime/arm64-linux-os.c

@@ -17,7 +17,7 @@
 #include <stdio.h>
 #include <sys/param.h>
 #include <sys/file.h>
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "os.h"
 #include "arch.h"
 #include "globals.h"

src/runtime/backtrace.c

@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include <signal.h>
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "runtime.h"
 #include "globals.h"
 #include "os.h"

src/runtime/breakpoint.c

@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <signal.h>
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "genesis/sap.h"
 #include "runtime.h"
 #include "os.h"

src/runtime/bsd-os.c

@@ -25,7 +25,7 @@
 #include <utime.h>
 #include <assert.h>
 #include <errno.h>
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "os.h"
 #include "arch.h"
 #include "globals.h"

src/runtime/cheneygc.c

@@ -18,7 +18,7 @@
 #include <sys/resource.h>
 #include <signal.h>
 #include <stdlib.h>
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "runtime.h"
 #include "os.h"
 #include "gc.h"

src/runtime/coalesce.c

@@ -14,7 +14,7 @@
  */
 
 #include <stdbool.h>
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "gc.h"
 #include "genesis/vector.h"
 #include "genesis/gc-tables.h"

src/runtime/core.h

@@ -12,7 +12,7 @@
 #ifndef _CORE_H_
 #define _CORE_H_
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "runtime.h"
 
 typedef sword_t core_entry_elt_t;

src/runtime/coreparse.c

@@ -14,7 +14,7 @@
  * files for more information.
  */
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 
 #ifndef LISP_FEATURE_WIN32
 #include <sys/mman.h>

src/runtime/darwin-os.c

@@ -15,7 +15,7 @@
  */
 
 #include "thread.h"
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "globals.h"
 #include "runtime.h"
 #include "interr.h"

src/runtime/dynbind.c

@@ -17,7 +17,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "runtime.h"
 #include "globals.h"
 #include "dynbind.h"

src/runtime/funcall.c

@@ -15,7 +15,7 @@
 
 #include <stdio.h>
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "runtime.h"
 #include "globals.h"
 #include "interrupt.h"

src/runtime/gc-common.c

@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <signal.h>
 #include <string.h>
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "runtime.h"
 #include "os.h"
 #include "interr.h"

src/runtime/gc.h

@@ -16,7 +16,7 @@
 #ifndef _GC_H_
 #define _GC_H_
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "gc-assert.h"
 #include "gc-typedefs.h"
 #include <stdbool.h>

src/runtime/gencgc.c

@@ -27,7 +27,7 @@
 #include <errno.h>
 #include <string.h>
 #include <inttypes.h>
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "runtime.h"
 #include "os.h"
 #include "interr.h"

src/runtime/globals.c

@@ -17,7 +17,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "runtime.h"
 #include "globals.h"
 #include "validate.h"

src/runtime/globals.h

@@ -20,7 +20,7 @@
 # include "os.h"
 #endif
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 
 #ifndef __ASSEMBLER__
 

src/runtime/interr.c

@@ -17,7 +17,7 @@
 #include <stdarg.h>
 #include <stdlib.h>
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "arch.h"
 #include <signal.h>
 

src/runtime/interrupt.c

@@ -40,7 +40,7 @@
  *
  * - WHN 20000728, dan 20010128 */
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 
 #include <stdio.h>
 #include <stdlib.h>

src/runtime/largefile.c

@@ -16,7 +16,7 @@
  * files for more information.
  */
 
-#include "genesis/config.h"
+#include "genesis/sbcl.h"
 
 #ifdef LISP_FEATURE_LARGEFILE
 

src/runtime/linux-mman.c

@@ -2,8 +2,7 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include "genesis/config.h"
-#include "genesis/constants.h"
+#include "genesis/sbcl.h"
 #include "globals.h"
 #include "os.h"
 #include "interr.h"

src/runtime/linux-os.c

@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <sys/param.h>
 #include <sys/file.h>
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "os.h"
 #include "arch.h"
 #include "globals.h"

src/runtime/lispobj.h

@@ -6,7 +6,7 @@ typedef intptr_t sword_t;
 typedef uintptr_t uword_t;
 typedef uword_t lispobj;
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 
 static inline int fixnump(lispobj obj)
 {

src/runtime/mips-arch.c

@@ -7,7 +7,7 @@
 
 #include <stdio.h>
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "runtime.h"
 #include "arch.h"
 #include "globals.h"
@@ -20,8 +20,6 @@
 #include "interr.h"
 #include "breakpoint.h"
 
-#include "genesis/constants.h"
-
 #define INSN_LEN sizeof(unsigned int)
 
 os_vm_address_t

src/runtime/mips-assem.S

@@ -18,7 +18,7 @@
 .section .note.GNU-stack,"",%progbits
 #endif
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "lispregs.h"
 #include "genesis/closure.h"
 #include "genesis/static-symbols.h"

src/runtime/mips-linux-os.c

@@ -20,7 +20,7 @@
 /* for cacheflush() */
 #include <sys/cachectl.h>
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "os.h"
 #include "arch.h"
 

src/runtime/monitor.c

@@ -9,7 +9,7 @@
  * files for more information.
  */
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "lispobj.h"
 
 #include <stdio.h>
@@ -35,7 +35,6 @@
 #include "lispregs.h"
 #include "interrupt.h"
 #include "thread.h"
-#include "genesis/constants.h"
 #include "genesis/instance.h"
 #include "genesis/static-symbols.h"
 #include "genesis/primitive-objects.h"

src/runtime/murmur_hash.c

@@ -16,7 +16,7 @@
  *
  */
 
-#include "genesis/config.h"
+#include "genesis/sbcl.h"
 #include "murmur_hash.h"
 #include <string.h>
 

src/runtime/os-common.c

@@ -14,11 +14,9 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "globals.h"
 #include "runtime.h"
-#include "genesis/config.h"
-#include "genesis/constants.h"
 #include "genesis/cons.h"
 #include "genesis/vector.h"
 #include "genesis/symbol.h"

src/runtime/os.h

@@ -17,7 +17,7 @@
 
 #define _OS_H_INCLUDED_
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "runtime.h"
 
 #include <inttypes.h>

src/runtime/parse.c

@@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #ifdef LISP_FEATURE_WIN32
 #include "pthreads_win32.h"
 #else

src/runtime/pmrgc.c

@@ -15,7 +15,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "lispregs.h"
 #include "gc.h"
 #include "code.h"

src/runtime/ppc-arch.c

@@ -11,7 +11,7 @@
 
 #include <stdio.h>
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "arch.h"
 #include "globals.h"
 #include "validate.h"

src/runtime/ppc-assem.S

@@ -3,7 +3,7 @@
 .section .note.GNU-stack,"",%progbits
 #endif
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "lispregs.h"
 #include "genesis/closure.h"
 #include "genesis/static-symbols.h"

src/runtime/ppc-bsd-os.c

@@ -1,7 +1,7 @@
 #include <signal.h>
 #include <machine/cpu.h>
 #include <errno.h>
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "interr.h"
 #include "runtime.h"
 #include "thread.h"

src/runtime/ppc-darwin-os.c

@@ -14,7 +14,7 @@
  * files for more information.
  */
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "globals.h"
 #include "runtime.h"
 #include <signal.h>

src/runtime/ppc-linux-os.c

@@ -18,7 +18,7 @@
 #include <stdio.h>
 #include <sys/param.h>
 #include <sys/file.h>
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "os.h"
 #include "arch.h"
 #include "globals.h"

src/runtime/ppc64-assem.S

@@ -1,4 +1,4 @@
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "lispregs.h"
 #include "genesis/closure.h"
 #include "genesis/static-symbols.h"

src/runtime/print.c

@@ -11,16 +11,10 @@
  * files for more information.
  */
 
-/*
- * FIXME:
- *   Some of the code in here is deeply broken, depending on guessing
- *   already out-of-date values instead of getting them from sbcl.h.
- */
-
 #include <stdio.h>
 #include <string.h>
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "print.h"
 #include "runtime.h"
 #include "code.h"

src/runtime/print.h

@@ -12,7 +12,7 @@
 #ifndef _PRINT_H_
 #define _PRINT_H_
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "runtime.h"
 
 extern void print(lispobj obj);

src/runtime/purify.c

@@ -19,7 +19,7 @@
 #include <strings.h>
 #include <errno.h>
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "runtime.h"
 #include "os.h"
 #include "globals.h"

src/runtime/riscv-arch.c

@@ -10,7 +10,7 @@
  */
 #include <stdio.h>
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "runtime.h"
 #include "arch.h"
 #include "globals.h"

src/runtime/riscv-linux-os.c

@@ -18,7 +18,7 @@
 #include <sys/cachectl.h>
 #include <sys/param.h>
 #include <sys/file.h>
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "os.h"
 #include "arch.h"
 #include "globals.h"

src/runtime/run-program.c

@@ -18,7 +18,7 @@
 #define _GNU_SOURCE
 #endif
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include <stdlib.h>
 #include <sys/file.h>
 #include <sys/types.h>

src/runtime/runtime.c

@@ -13,7 +13,7 @@
  * files for more information.
  */
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 
 #include <stdio.h>
 #include <string.h>

src/runtime/safepoint.c

@@ -8,7 +8,7 @@
  * provided with absolutely no warranty. See the COPYING and CREDITS
  * files for more information.
  */
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 
 #ifdef LISP_FEATURE_SB_SAFEPOINT /* entire file */
 #include <stdlib.h>

src/runtime/save.c

@@ -18,7 +18,7 @@
 #include <string.h>
 #include <sys/file.h>
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #ifdef LISP_FEATURE_WIN32
 #include "pthreads_win32.h"
 #else

src/runtime/search.c

@@ -13,8 +13,7 @@
 #include <ctype.h>
 #include <stdint.h>
 
-#include "genesis/config.h"
-#include "genesis/constants.h"
+#include "genesis/sbcl.h"
 #include "interr.h"
 #include "lispobj.h"
 #include "os.h"

src/runtime/sparc-arch.c

@@ -10,7 +10,7 @@
  */
 #include <stdio.h>
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "runtime.h"
 #include "arch.h"
 #include "globals.h"

src/runtime/sparc-assem.S

@@ -6,7 +6,7 @@
 #define _ASM
 
 #include "lispregs.h"
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "genesis/closure.h"
 #include "genesis/static-symbols.h"
 #include "genesis/thread.h"

src/runtime/sparc-bsd-os.c

@@ -17,7 +17,7 @@
 #include <stdio.h>
 #include <sys/param.h>
 #include <sys/file.h>
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "os.h"
 #include "arch.h"
 #include "globals.h"

src/runtime/sparc-linux-os.c

@@ -17,7 +17,7 @@
 #include <stdio.h>
 #include <sys/param.h>
 #include <sys/file.h>
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "os.h"
 #include "arch.h"
 #include "globals.h"

src/runtime/sparc-sunos-os.c

@@ -17,7 +17,7 @@
 #include <stdio.h>
 #include <sys/param.h>
 #include <sys/file.h>
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "os.h"
 #include "arch.h"
 #include "globals.h"

src/runtime/sunos-os.c

@@ -8,7 +8,7 @@
 #include <errno.h>
 #include <sys/param.h>
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "os.h"
 #include "arch.h"
 #include "interr.h"

src/runtime/thread.c

@@ -12,7 +12,7 @@
 #ifdef __linux__
 #define _GNU_SOURCE // for pthread_setname_np()
 #endif
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 
 #include <stdlib.h>
 #include <stdio.h>

src/runtime/thread.h

@@ -5,7 +5,7 @@
 #include <stdbool.h>
 #include <unistd.h>
 #include <stddef.h>
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "globals.h"
 #include "runtime.h"
 #include "os.h"

src/runtime/time.c

@@ -15,7 +15,7 @@
 
 #include <stdio.h>
 #include <time.h>
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "runtime.h"
 
 int get_timezone(time_t when, unsigned int *dst)

src/runtime/traceroot.c

@@ -1,4 +1,4 @@
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "arch.h"
 #include "runtime.h"
 #include "lispregs.h"
@@ -6,7 +6,6 @@
 #include "code.h"
 #include "genesis/closure.h"
 #include "genesis/cons.h"
-#include "genesis/constants.h"
 #include "genesis/fdefn.h"
 #include "genesis/gc-tables.h"
 #include "genesis/hash-table.h"

src/runtime/validate.c

@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "runtime.h"
 #include "os.h"
 #include "globals.h"

src/runtime/vars.c

@@ -14,7 +14,7 @@
 #include <sys/types.h>
 #include <stdlib.h>
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "runtime.h"
 #include "vars.h"
 #include "os.h"

src/runtime/win32-os.c

@@ -32,7 +32,7 @@
 #include <sys/param.h>
 #include <sys/file.h>
 #include <io.h>
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "os.h"
 #include "arch.h"
 #include "globals.h"

src/runtime/wrap.c

@@ -5,12 +5,7 @@
  * The functions in this file are typically called directly from Lisp.
  * Thus, when their signature changes, they don't need updates in a .h
  * file somewhere, but they do need updates in the Lisp code. FIXME:
- * It would be nice to enforce this at compile time. It mighn't even
- * be all that hard: make the cross-compiler versions of DEFINE-ALIEN-FOO
- * macros accumulate strings in a list which then gets written out at
- * the end of sbcl2.h at the end of cross-compilation, then rerun
- * 'make' in src/runtime/ using the new sbcl2.h as sbcl.h (and make
- * sure that all the files in src/runtime/ include sbcl.h). */
+ * It would be nice to enforce this at compile time. */
 
 /*
  * This software is part of the SBCL system. See the README file for
@@ -23,7 +18,7 @@
  * files for more information.
  */
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 
 #include <sys/types.h>
 #include <dirent.h>

src/runtime/wrap.h

@@ -32,7 +32,7 @@
  * shouldn't be used for any purpose for which the real type can be
  * employed. */
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 
 /* We use an extra layer of aliasing because Linux/MIPS struct stat
    doesn't use dev_t. This type is not defined on the Lisp side. */

src/runtime/x86-64-arch.c

@@ -13,7 +13,7 @@
 
 #include <stdio.h>
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "runtime.h"
 #include "globals.h"
 #include "validate.h"

src/runtime/x86-64-assem.S

@@ -18,9 +18,8 @@
 .section .note.GNU-stack,"",%progbits
 #endif
 
-#include "genesis/config.h"
+#include "genesis/sbcl.h"
 #include "validate.h"
-#include "sbcl.h"
 #include "genesis/closure.h"
 #include "genesis/fdefn.h"
 #include "genesis/static-symbols.h"

src/runtime/x86-64-bsd-os.c

@@ -1,6 +1,6 @@
 #include <signal.h>
 #include <errno.h>
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "runtime.h"
 #include "thread.h"
 #include "interr.h"

src/runtime/x86-64-linux-os.c

@@ -32,7 +32,7 @@
 #include "interrupt.h"
 #include "interr.h"
 #include "lispregs.h"
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 
 #include <sys/types.h>
 #include <signal.h>

src/runtime/x86-64-sunos-os.c

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <sys/param.h>
 #include <sys/file.h>
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "os.h"
 #include "arch.h"
 #include "globals.h"

src/runtime/x86-64-win32-os.c

@@ -28,7 +28,7 @@
 #include "interrupt.h"
 #include "interr.h"
 #include "lispregs.h"
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 
 #include <sys/types.h>
 #include "runtime.h"

src/runtime/x86-arch.c

@@ -11,7 +11,7 @@
 
 #include <stdio.h>
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "runtime.h"
 #include "globals.h"
 #include "validate.h"

src/runtime/x86-assem.S

@@ -18,7 +18,7 @@
 .section .note.GNU-stack,"",%progbits
 #endif
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "genesis/closure.h"
 #include "genesis/static-symbols.h"
 #include "genesis/symbol.h"

src/runtime/x86-bsd-os.c

@@ -1,7 +1,7 @@
 #include <signal.h>
 #include <stdio.h>
 #include <errno.h>
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "interr.h"
 #include "runtime.h"
 #include "thread.h"

src/runtime/x86-linux-os.c

@@ -22,7 +22,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "os.h"
 #include "arch.h"
 #include "globals.h"

src/runtime/x86-sunos-os.c

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <sys/param.h>
 #include <sys/file.h>
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "os.h"
 #include "arch.h"
 #include "globals.h"

src/runtime/x86-win32-os.c

@@ -28,7 +28,7 @@
 #include "interrupt.h"
 #include "interr.h"
 #include "lispregs.h"
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 
 #include <sys/types.h>
 #include "runtime.h"

tests/fcb-threads.c

@@ -1,5 +1,5 @@
 /* In as much as this file simulates "foreign" code,
- * we don't include "sbcl.h" and we use the native thread API
+ * we don't include "genesis/sbcl.h" and we use the native thread API
  * for the platform */
 
 #ifdef _WIN32

tests/fin-call.impure.lisp

@@ -154,7 +154,7 @@ index 400772889..229eea81c 100644
 +++ b/src/runtime/interrupt.c
 @@ -42,6 +42,9 @@
 
- #include "sbcl.h"
+ #include "genesis/sbcl.h"
 
 +#define _GNU_SOURCE /* for REG_RAX etc. from sys/ucontext */
 +#include <sys/ucontext.h>

tests/gc-testlib.c

@@ -3,7 +3,7 @@
  * or update_writeprotection() */
 
 #include <stdio.h>
-#include "sbcl.h"
+#include "genesis/sbcl.h"
 #include "gc.h"
 #include "genesis/instance.h"
 #include "thread.h"

tlsf-bsd/tlsf/tlsf.c

@@ -31,8 +31,7 @@
 #define tlsf_assert(expr) (void)(0)
 #endif
 
-#include "genesis/config.h"
-#include "genesis/constants.h"
+#include "genesis/sbcl.h"
 
 /* Public constants: may be modified. */
 enum tlsf_public {

tools-for-build/grovel-headers.c

@@ -18,7 +18,7 @@
  * more information.
  */
 
-#include "genesis/config.h"
+#include "genesis/sbcl.h"
 
 #include <stdio.h>
 #include <stdlib.h>