diff --git a/lisp/Config.sun4_solaris_gcc b/lisp/Config.sun4_solaris_gcc
index 33a144416c6908aaa563691c41ec7897f7cab043..504c91703773ef1bcb6e1723965312fc0106ff05 100644
--- a/lisp/Config.sun4_solaris_gcc
+++ b/lisp/Config.sun4_solaris_gcc
@@ -22,14 +22,21 @@ vpath %.S .:$(PATH1)
 # instructions, even if we don't use the 64-bit registers.
 
 #CC_V8PLUS = -xarch=v8plus
+ifdef FEATURE_SPARC_V9
 AS_V8PLUS = -Wa,-xarch=v8plus
+endif
 
 # Enable support for :linkage-table feature.
 
+ifdef FEATURE_LINKAGE_TABLE
 LINKAGE = -DLINKAGE_TABLE
+endif
 
 # Enable support for generational GC
+ifdef FEATURE_GENCGC
 GENCGC = -DGENCGC
+GC_SRC = gencgc.c
+endif
 
 CPPFLAGS = -I. -I$(PATH1) -I/usr/openwin/include -I/usr/include/X11 -DSOLARIS -DSOLARIS25 -DSVR4 $(CC_V8PLUS) $(LINKAGE) $(GENCGC)
 
@@ -52,9 +59,3 @@ ARCH_SRC = sparc-arch.c
 OS_SRC = solaris-os.c os-common.c undefineds.c elf.c
 OS_LINK_FLAGS=
 OS_LIBS= -lsocket -lnsl -ldl
-
-# Use this with generational GC
-GC_SRC = gencgc.c
-
-# Use this when not using generational GC
-# GC_SRC = gc.c