From: Nikodemus S. <de...@us...> - 2008-05-15 13:45:35
|
Update of /cvsroot/sbcl/sbcl/src/runtime In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv27411/src/runtime Modified Files: Config.x86-64-darwin Config.x86-darwin Log Message: 1.0.16.30: couple of small Darwin cleanups * Add -lpthread os OS_LIBS on x86 builds as well, since malloc() may not be thread-safe without it (but with it it apparently should be...) * Pass -arch x86_64 to the C compiler in foreign.test.sh when doing 64 bit builds on Darwin, since x86 is the default there. Index: Config.x86-64-darwin =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/Config.x86-64-darwin,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Config.x86-64-darwin 3 Mar 2007 00:42:02 -0000 1.1 +++ Config.x86-64-darwin 15 May 2008 13:45:27 -0000 1.2 @@ -12,16 +12,15 @@ CFLAGS = -g -Wall -O2 -fdollars-in-identifiers OS_SRC = bsd-os.c x86-64-bsd-os.c darwin-os.c x86-64-darwin-os.c darwin-dlshim.c darwin-langinfo.c OS_LIBS = -lSystem -lc -ldl +ifdef LISP_FEATURE_SB_THREAD + OS_LIBS += -lpthread +endif ASSEM_SRC = x86-64-assem.S ldso-stubs.S ARCH_SRC = x86-64-arch.c LINKFLAGS += -arch x86_64 -dynamic -twolevel_namespace -bind_at_load -pagezero_size 0x100000 -OS_LIBS += $(shell if grep LISP_FEATURE_SB_THREAD genesis/config.h \ - > /dev/null 2>&1; \ - then echo "-lpthread"; fi) - CFLAGS += -arch x86_64 -fno-omit-frame-pointer -pagezero_size 0x100000 GC_SRC = gencgc.c Index: Config.x86-darwin =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/Config.x86-darwin,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Config.x86-darwin 2 Nov 2006 15:35:13 -0000 1.4 +++ Config.x86-darwin 15 May 2008 13:45:27 -0000 1.5 @@ -12,6 +12,9 @@ CFLAGS = -g -Wall -O2 -fdollars-in-identifiers OS_SRC = bsd-os.c x86-bsd-os.c darwin-os.c x86-darwin-os.c darwin-dlshim.c darwin-langinfo.c OS_LIBS = -lSystem -lc -ldl +ifdef LISP_FEATURE_SB_THREAD + OS_LIBS += -lpthread +endif CC = gcc |