X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2FConfig.ppc-darwin;h=01ec5f61cf6901783058e3ca9eec89c9589a0aed;hb=380ea897e2c12a01547f918f73e8a1db0a3a0373;hp=7f66fd4a2031096abc462e5e32e7e93c51f0e453;hpb=506253505641855dc8bb87033f7af894904f848b;p=sbcl.git

diff --git a/src/runtime/Config.ppc-darwin b/src/runtime/Config.ppc-darwin
index 7f66fd4..01ec5f6 100644
--- a/src/runtime/Config.ppc-darwin
+++ b/src/runtime/Config.ppc-darwin
@@ -1,19 +1,46 @@
 # -*- makefile -*-
-CFLAGS =  -ggdb -Wall -O3 -traditional-cpp
-OS_SRC = bsd-os.c os-common.c ppc-darwin-os.c
-OS_LIBS = -lSystem -lc -lm /sw/lib/libdl.a
+CFLAGS = -Dppc -g -Wall -O2 -no-cpp-precomp
+OS_SRC = bsd-os.c os-common.c ppc-darwin-os.c ppc-darwin-dlshim.c ppc-darwin-langinfo.c
+OS_LIBS = -lSystem -lc -lm
+
+CC = gcc
 
 ASSEM_SRC = ppc-assem.S ldso-stubs.S
 ARCH_SRC = ppc-arch.c
 
-CPP = cpp -traditional-cpp
+CPP = cpp -no-cpp-precomp
 
-# Until sbcl-0.6.7.3, we used "OS_LINK_FLAGS=-static" here, which
-# worked fine for most things, but LOAD-FOREIGN & friends require
-# dlopen() etc., which in turn depend on dynamic linking of the
-# runtime.
-OS_LINK_FLAGS = -dynamic -L/sw/lib
+# KLUDGE: in OS X 10.3, Apple started putting the heap right where we
+# expect our read-only space mapped. This hack causes the linker to
+# place a zero-fill-on-demand segment in the same place and size as
+# read-only-space, which is the only thing capable of keeping malloc
+# out of this range."
+#
+# FIXME: "-Wl,-segaddr,SBCLRO,0x1000000" is output from
+# ppc-darwin-mkrospace (it depends on READ_ONLY_SPACE I believe) but it
+# is hard-coded here!
+OS_LINK_FLAGS = -dynamic -Wl,-segaddr,SBCLRO,0x1000000 -Wl,-seg1addr,0x5000000 $(if $(AFTER_GROVEL_HEADERS),ppc-darwin-rospace.o)
 
 GC_SRC= cheneygc.c
 
-CFLAGS=-DDARWIN -Dppc -g -traditional-cpp
+CLEAN_FILES += ppc-darwin-mkrospace
+
+ppc-darwin-mkrospace: ppc-darwin-mkrospace.c
+	$(CC) -o $@ $<
+
+ppc-darwin-rospace.o: ppc-darwin-mkrospace
+	./ppc-darwin-mkrospace
+
+.PHONY: after-grovel-headers
+
+# Rebuild the sbcl runtime to avoid Panther placing the heap where
+# it wants read only space (in the first 32 megabytes, where it
+# can be absolute-branched to with BA.)  Must be done after 
+# grovel-headers, because Apple's nm is broken.
+after-grovel-headers: ppc-darwin-rospace.o
+	rm -f sbcl
+	$(GNUMAKE) sbcl AFTER_GROVEL_HEADERS=1
+
+# Fortunatly make-target-1.sh does a make clean all the time.
+# Otherwise we would have to make sure that sbcl gets rebuilt without
+# the readonlyspace hack before groveling headers again.