-;;; * OpenBSD address space changes for W^X as well as malloc
-;;; randomization made the old addresses unsafe. The only range
-;;; that is really safe is between the end of the text segment (it
-;;; starts at #x3C000000) and #x7C000000. However if the -Z linker
-;;; option is used then the safe range is (probably) #x00001000 to
-;;; #x48048000, with the text and data segments at #x08048000.
-
-#!+win32
-(progn
-
- (def!constant read-only-space-start #x22000000)
- (def!constant read-only-space-end #x220ff000)
-
- (def!constant static-space-start #x22100000)
- (def!constant static-space-end #x221ff000)
-
- (def!constant dynamic-space-start #x22300000)
- (def!constant dynamic-space-end #x42300000)
-
- (def!constant linkage-table-space-start #x22200000)
- (def!constant linkage-table-space-end #x222ff000))
-
-#!+linux
-(progn
- (def!constant read-only-space-start #x01000000)
- (def!constant read-only-space-end #x010ff000)
-
- (def!constant static-space-start #x01100000)
- (def!constant static-space-end #x011ff000)
-
- (def!constant dynamic-space-start #x09000000)
- (def!constant dynamic-space-end #x29000000)
-
- (def!constant linkage-table-space-start #x01200000)
- (def!constant linkage-table-space-end #x012ff000))
-
-#!+sunos
-(progn
- (def!constant read-only-space-start #x20000000)
- (def!constant read-only-space-end #x200ff000)
-
- (def!constant static-space-start #x20100000)
- (def!constant static-space-end #x201ff000)
-
- (def!constant dynamic-space-start #x48000000)
- (def!constant dynamic-space-end #xA0000000)
-
- (def!constant linkage-table-space-start #x20200000)
- (def!constant linkage-table-space-end #x202ff000))
-
-#!+freebsd
-(progn
- (def!constant read-only-space-start #x01000000)
- (def!constant read-only-space-end #x010ff000)
-
- (def!constant static-space-start #x01100000)
- (def!constant static-space-end #x011ff000)
-
- (def!constant dynamic-space-start #x58000000)
- (def!constant dynamic-space-end #x98000000)
-
- (def!constant linkage-table-space-start #x01200000)
- (def!constant linkage-table-space-end #x012ff000))
-
-#!+openbsd
-(progn
- (def!constant read-only-space-start #x47000000)
- (def!constant read-only-space-end #x470ff000)
-
- (def!constant static-space-start #x47100000)
- (def!constant static-space-end #x471ff000)
-
- (def!constant dynamic-space-start #x48000000)
- (def!constant dynamic-space-end #x78000000)
-
- ;; In CMUCL: 0xB0000000->0xB1000000
- (def!constant linkage-table-space-start #x47200000)
- (def!constant linkage-table-space-end #x472ff000))
-
-#!+netbsd
-(progn
- (def!constant read-only-space-start #x20000000)
- (def!constant read-only-space-end #x200ff000)
-
- (def!constant static-space-start #x20100000)
- (def!constant static-space-end #x201ff000)
-
- (def!constant dynamic-space-start #x60000000)
- (def!constant dynamic-space-end #x98000000)
-
- ;; In CMUCL: 0xB0000000->0xB1000000
- (def!constant linkage-table-space-start #x20200000)
- (def!constant linkage-table-space-end #x202ff000))
-
-
-#!+darwin
-(progn
- (def!constant read-only-space-start #x04000000)
- (def!constant read-only-space-end #x040ff000)
-
- (def!constant static-space-start #x04100000)
- (def!constant static-space-end #x041ff000)
-
- (def!constant dynamic-space-start #x10000000)
- (def!constant dynamic-space-end #x6ffff000)
-
- (def!constant linkage-table-space-start #x04200000)
- (def!constant linkage-table-space-end #x042ff000))
+;;; * OpenBSD address space changes for W^X as well as malloc()
+;;; randomization made the old addresses unsafe.
+;;; ** By default (linked without -Z option):
+;;; The executable's text segment starts at #x1c000000 and the
+;;; data segment MAXDSIZ bytes higher, at #x3c000000. Shared
+;;; library text segments start randomly between #x00002000 and
+;;; #x10002000, with the data segment MAXDSIZ bytes after that.
+;;; ** If the -Z linker option is used:
+;;; The executable's text and data segments simply start at
+;;; #x08048000, data immediately following text. Shared library
+;;; text and data is placed as if allocated by malloc().
+;;; ** In both cases, the randomized range for malloc() starts
+;;; MAXDSIZ bytes after the end of the data segment (#x48048000
+;;; with -Z, #x7c000000 without), and extends 256 MB.
+;;; ** The read only, static, and linkage table spaces should be
+;;; safe with and without -Z if they are located just before
+;;; #x1c000000.
+;;; ** Ideally the dynamic space should be at #x94000000, 64 MB
+;;; after the end of the highest random malloc() address.
+;;; Unfortunately the dynamic space must be in the lower half
+;;; of the address space, where there are no large areas which
+;;; are unused both with and without -Z. So we break -Z by
+;;; starting at #x40000000. By only using 512 - 64 MB we can
+;;; run under the default 512 MB data size resource limit.
+
+;;; NetBSD configuration used to have this comment regarding the linkage
+;;; table: "In CMUCL: 0xB0000000->0xB1000000"
+
+#!+win32 (!gencgc-space-setup #x22000000 nil nil #x10000)
+#!+linux (!gencgc-space-setup #x01000000 #x09000000)
+#!+sunos (!gencgc-space-setup #x20000000 #x48000000)
+#!+freebsd (!gencgc-space-setup #x01000000 #x58000000)
+#!+openbsd (!gencgc-space-setup #x1b000000 #x40000000)
+#!+netbsd (!gencgc-space-setup #x20000000 #x60000000)
+#!+darwin (!gencgc-space-setup #x04000000 #x10000000)