From 20f08ea98526687830a7a529f53ddcdc30b782c5 Mon Sep 17 00:00:00 2001 From: dtc <dtc> Date: Mon, 28 Feb 2000 03:36:24 +0000 Subject: [PATCH] o Use linux-nm to allow the symbols to be tailored to this system, rather than hacking the main Makefile. o Link with the --export-dynamic flag as this reportedly assists code that calls back into lisp. o Cleanup of the Config files. --- lisp/Config.linux | 30 +++++++++++++++--------------- lisp/Config.linux_gencgc | 24 +++++++++++++----------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/lisp/Config.linux b/lisp/Config.linux index 43d1b6ecc..68a7eca55 100644 --- a/lisp/Config.linux +++ b/lisp/Config.linux @@ -1,19 +1,19 @@ -PATH1=../../src/lisp -vpath %.h $(PATH1) -vpath %.c $(PATH1) -vpath %.S $(PATH1) -CPPFLAGS = -I. -I$(PATH1) -I- -I/usr/X11R6/include -CC = gcc -Wstrict-prototypes -O2 -fno-strength-reduce # -Wall +PATH1 = ../../src/lisp +PATH2 = ../../p86/lisp +vpath %.h $(PATH2):$(PATH1) +vpath %.c $(PATH2):$(PATH1) +vpath %.S $(PATH2):$(PATH1) +CPPFLAGS = -I. -I$(PATH2) -I$(PATH1) -I- -I/usr/X11R6/include +CC = gcc LD = ld CPP = cpp -CFLAGS = -m486 -g -DWANT_CGC -O2 -ASFLAGS = -g -DWANT_CGC -NM = nm -p -UNDEFSYMPATTERN=-Xlinker -u -Xlinker & -ASSEM_SRC = x86-assem.S linux-stubs.S +CFLAGS = -Wstrict-prototypes -Wall -O2 -g -DWANT_CGC -m486 +ASFLAGS = -g -DWANT_CGC +NM = $(PATH1)/linux-nm +UNDEFSYMPATTERN = -Xlinker -u -Xlinker & +ASSEM_SRC = x86-assem.S linux-stubs.S ARCH_SRC = x86-arch.c OS_SRC = Linux-os.c os-common.c -OS_LINK_FLAGS= -#-static -OS_LIBS= -lm -ldl -GC_SRC= cgc.c +OS_LINK_FLAGS = -Xlinker --export-dynamic +OS_LIBS = -ldl +GC_SRC = cgc.c diff --git a/lisp/Config.linux_gencgc b/lisp/Config.linux_gencgc index 5018df3cc..c3538e15b 100644 --- a/lisp/Config.linux_gencgc +++ b/lisp/Config.linux_gencgc @@ -1,17 +1,19 @@ -vpath %.h /usr/src/cmucl/cmucl/src/lisp/ -vpath %.c /usr/src/cmucl/cmucl/src/lisp/ -vpath %.S /usr/src/cmucl/cmucl/src/lisp/ -CPPFLAGS = -I. -I/usr/src/cmucl/cmucl/src/lisp/ -I- -I/usr/X11R6/include -CC = gcc -Wstrict-prototypes -O2 -fno-strength-reduce # -Wall +PATH1 = ../../src/lisp +PATH2 = ../../p86/lisp +vpath %.h $(PATH2):$(PATH1) +vpath %.c $(PATH2):$(PATH1) +vpath %.S $(PATH2):$(PATH1) +CPPFLAGS = -I. -I$(PATH2) -I$(PATH1) -I- -I/usr/X11R6/include +CC = gcc LD = ld CPP = cpp -CFLAGS = -g -O2 -DGENCGC +CFLAGS = -Wstrict-prototypes -Wall -O2 -g -DGENCGC ASFLAGS = -g -DGENCGC -NM = nm -p -UNDEFSYMPATTERN=-Xlinker -u -Xlinker & +NM = $(PATH1)/linux-nm +UNDEFSYMPATTERN = -Xlinker -u -Xlinker & ASSEM_SRC = x86-assem.S linux-stubs.S ARCH_SRC = x86-arch.c OS_SRC = Linux-os.c os-common.c -OS_LINK_FLAGS= -OS_LIBS= -ldl -GC_SRC= gencgc.c +OS_LINK_FLAGS = -Xlinker --export-dynamic +OS_LIBS = -ldl +GC_SRC = gencgc.c -- GitLab