diff --git a/lisp/Config.x86_common b/lisp/Config.x86_common
index d52003211a14851230a53480b12aef355e722ee5..fe1649292b0ec6f4ed3bdad93d5df1b61914183e 100644
--- a/lisp/Config.x86_common
+++ b/lisp/Config.x86_common
@@ -28,9 +28,8 @@ ifneq ($(or $(FEATURE_X87),$(FEATURE_SSE2)),)
 CPP_DEFINE_OPTIONS += -DFEATURE_SSE2
 endif
 
-CC ?= gcc
+CC = gcc
 LD = ld
-CPP = cpp
 
 ifeq ($(filter 2% 3%, $(shell $(CC) -dumpversion)),)
 CPP_INCLUDE_OPTIONS := -iquote . -iquote $(PATH1)
@@ -47,6 +46,8 @@ ARCH_SRC = x86-arch.c
 OS_SRC = os-common.c e_rem_pio2.c k_rem_pio2.c 
 
 NM = nm -gp
+DEPEND = $(CC) -MM -E
+DEPEND_FLAGS = 
 
 # This has aliasing problems, so turn off aliasing and also turn on
 # float-store so x87 arithmetic behaves like double-precision
diff --git a/lisp/Config.x86_freebsd b/lisp/Config.x86_freebsd
index ce7bcce2f3b1b41cb74f98de1b1108355a062e10..b1b2d6f45f36d3d4ce11e494ecdc798830a90cc3 100644
--- a/lisp/Config.x86_freebsd
+++ b/lisp/Config.x86_freebsd
@@ -2,6 +2,6 @@
 include Config.x86_common
 
 UNDEFSYMPATTERN = -Xlinker -u -Xlinker &
-OS_SRC += FreeBSD-os.c undefineds.c elf.c
+OS_SRC += FreeBSD-os.c elf.c
 OS_LINK_FLAGS = -dynamic -export-dynamic
 OS_LIBS = -lutil
diff --git a/lisp/GNUmakefile b/lisp/GNUmakefile
index e1cf0a0dbdaee7b7754e377cf6bd3adadc6342d3..63934b0fceece1897ee0ddf8fd94851d907b6a72 100644
--- a/lisp/GNUmakefile
+++ b/lisp/GNUmakefile
@@ -1,19 +1,10 @@
-# $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/GNUmakefile,v 1.32 2009/01/11 17:52:44 rtoy Exp $
+# $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/GNUmakefile,v 1.33 2009/01/20 04:52:47 agoncharov Rel $
 
 all: lisp.nm
 
-DEPEND = $(CC) -MM -E
-DEPEND_FLAGS = 
-
 -include internals.inc
 include Config
 
-CC ?= gcc
-
-ifndef GC_SRC
-GC_SRC = gc.c
-endif
-
 SRCS = lisp.c coreparse.c alloc.c monitor.c print.c interr.c \
 	vars.c parse.c interrupt.c search.c validate.c globals.c \
 	dynbind.c breakpoint.c regnames.c backtrace.c save.c purify.c \