[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2012-12-6-g683d116

[Raymond Toy]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMU Common Lisp".

The branch, master has been updated
       via  683d11688c0a5c0f4a44fdc301706f14913fa5ed (commit)
      from  75a020cf12f776c5fee74905887e62b6cccca48e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 683d11688c0a5c0f4a44fdc301706f14913fa5ed
Author: Raymond Toy <toy.raymond at gmail.com>
Date:   Thu Dec 20 19:38:57 2012 -0800

    Reinstate ability to compile with gcc on sparc.
    
    Config.sparc_common:
    o Enable ASSEM_SRC, ARCH_SRC, OS_SRC, OS_LIBS again
    
    Config.sparc_gcc:
    o Don't use -traditional-cpp when creating dependencies because that
      causes the old (varargs.h) version of va_start to be used instead of
      the stdard.h version we want.
    
    Config.sparc_sunc:
    o Remove ASSEM_SRC, ARCH_SRC, OS_SRC, OS_LINK_FLAGS, and OS_LIBS since
      they're in Config.sparc_common.

diff --git a/src/lisp/Config.sparc_common b/src/lisp/Config.sparc_common
index 027d495..3b07c14 100644
--- a/src/lisp/Config.sparc_common
+++ b/src/lisp/Config.sparc_common
@@ -50,11 +50,11 @@ CPPFLAGS = -I. -I$(PATH1) -DSOLARIS -DSVR4 $(CC_V8PLUS) $(LINKAGE) $(GENCGC) $(U
 CFLAGS = -g $(CC_V8PLUS)
 
 NM = $(PATH1)/solaris-nm
-#ASSEM_SRC = sparc-assem.S
-#ARCH_SRC = sparc-arch.c
+ASSEM_SRC = sparc-assem.S
+ARCH_SRC = sparc-arch.c
 
 DEPEND=$(CC) 
-#OS_SRC = solaris-os.c os-common.c undefineds.c elf.c k_rem_pio2.c
+OS_SRC = solaris-os.c os-common.c undefineds.c elf.c k_rem_pio2.c
 OS_LINK_FLAGS=
-#OS_LIBS= -lsocket -lnsl -ldl
+OS_LIBS= -lsocket -lnsl -ldl
 EXEC_FINAL_OBJ = exec-final.o
diff --git a/src/lisp/Config.sparc_gcc b/src/lisp/Config.sparc_gcc
index b0d27ad..d08af18 100644
--- a/src/lisp/Config.sparc_gcc
+++ b/src/lisp/Config.sparc_gcc
@@ -26,5 +26,5 @@ endif
 
 CC = gcc -O -Wall
 CPP = gcc -E
-DEPEND_FLAGS = -MM -traditional-cpp
+DEPEND_FLAGS = -MM
 ASFLAGS = -g -traditional-cpp $(AS_V8PLUS)
diff --git a/src/lisp/Config.sparc_sunc b/src/lisp/Config.sparc_sunc
index acd54ed..1072f7b 100644
--- a/src/lisp/Config.sparc_sunc
+++ b/src/lisp/Config.sparc_sunc
@@ -20,13 +20,6 @@ CC_V8PLUS = -m32 -xarch=sparc
 AS_V8PLUS = -m32 -xarch=sparc
 endif
 
-ASSEM_SRC = sparc-assem.S
-ARCH_SRC = sparc-arch.c
-
-OS_SRC = solaris-os.c os-common.c undefineds.c elf.c k_rem_pio2.c
-OS_LINK_FLAGS=
-OS_LIBS= -lsocket -lnsl -ldl
-
 CC = cc -xlibmieee -O
 CPP = cc -E
 DEPEND_FLAGS = -xM

-----------------------------------------------------------------------

Summary of changes:
 src/lisp/Config.sparc_common |    8 ++++----
 src/lisp/Config.sparc_gcc    |    2 +-
 src/lisp/Config.sparc_sunc   |    7 -------
 3 files changed, 5 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMU Common Lisp