Commit ded744f7 authored by William Harold Newman's avatar William Harold Newman
Browse files

0.8.7.57: 

	merged Brian Mastenbrook's "SBCL-on-Darwin state" patch
		(sbcl-devel 2004-02-18)
parent 1f7f3d74

contrib/asdf-install/installer.lisp

+2 −1
Original line number Diff line number Diff line
@@ -249,7 +249,8 @@ 
  (let* ((tar

	  (with-output-to-string (o)

	    (or

	     (sb-ext:run-program "tar"

	     (sb-ext:run-program #-darwin "tar"

				 #+darwin "gnutar"

				 (list "-C" (namestring source)

				       "-xzvf" (namestring packagename))

				 :output o

make-target-1.sh

+6 −0
Original line number Diff line number Diff line
@@ -35,3 +35,9 @@ cd tools-for-build 
$GNUMAKE -I../src/runtime grovel-headers || exit 1

cd ..

tools-for-build/grovel-headers > output/stuff-groveled-from-headers.lisp



# after-grovel-headers may not exist for all platforms (used for

# Darwin hacks)

cd src/runtime

$GNUMAKE after-grovel-headers || true

cd ..

src/runtime/Config.ppc-darwin

+27 −3
Original line number Diff line number Diff line 
# -*- makefile -*-

CFLAGS = -DDARWIN -Dppc -g -Wall -O3 -no-cpp-precomp

CFLAGS = -Dppc -g -Wall -O3 -no-cpp-precomp

OS_SRC = bsd-os.c os-common.c ppc-darwin-os.c ppc-darwin-dlshim.c

OS_LIBS = -lSystem -lc -lm



# Avoid the dreaded gcc 3.3 prerelease tarpit of death!

# Avoid the gcc 3.3 prerelease tarpit of death!

CC = gcc3



ASSEM_SRC = ppc-assem.S ldso-stubs.S
@@ -11,7 +11,31 @@ ARCH_SRC = ppc-arch.c 


CPP = cpp -no-cpp-precomp



OS_LINK_FLAGS = -dynamic -L$(HOME)/local/lib -L/sw/lib -L/opt/local/lib -L/usr/local/lib

# 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 -L$(HOME)/local/lib -L/sw/lib -L/opt/local/lib -L/usr/local/lib -Wl,-segaddr,SBCLRO,0x1000000 -Wl,-seg1addr,0x5000000 $(if $(AFTER_GROVEL_HEADERS),ppc-darwin-rospace.o)



GC_SRC= cheneygc.c



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.

src/runtime/GNUmakefile

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ sbcl: ${OBJS} 


.PHONY: clean all

clean:

	-rm -f depend *.o sbcl sbcl.nm core *.tmp

	-rm -f depend *.o sbcl sbcl.nm core *.tmp $(CLEAN_FILES)



TAGS: $(SRCS)

	etags $(SRCS)

src/runtime/breakpoint.c

+1 −1
Original line number Diff line number Diff line
@@ -12,9 +12,9 @@ 
#include <stdio.h>

#include <signal.h>



#include "sbcl.h"

#include "runtime.h"

#include "os.h"

#include "sbcl.h"

#include "interrupt.h"

#include "arch.h"

#include "lispregs.h"