From 683d11688c0a5c0f4a44fdc301706f14913fa5ed Mon Sep 17 00:00:00 2001 From: Raymond Toy <toy.raymond@gmail.com> Date: Thu, 20 Dec 2012 19:38:57 -0800 Subject: [PATCH] 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. --- 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(-) diff --git a/src/lisp/Config.sparc_common b/src/lisp/Config.sparc_common index 027d49560..3b07c14a2 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 b0d27add4..d08af18f6 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 acd54ed1a..1072f7b96 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 -- GitLab