diff --git a/lisp/Config.sun4_solaris_sunc b/lisp/Config.sun4_solaris_sunc
index 2a391f93096c21536293f3e1f7d41fec745b95eb..1125cae332b007a584556c1f3cc481a3e479098e 100644
--- a/lisp/Config.sun4_solaris_sunc
+++ b/lisp/Config.sun4_solaris_sunc
@@ -1,13 +1,41 @@
-# For Solaris 2.4 or earlier, remove -DSOLARIS25 from CPPFLAGS.
+# -*- Mode: makefile -*-
+# These tell gmake where to look for .h, .c and .S files.  Mostly for
+# building the binary outside of the src tree.
 
-CPPFLAGS = -I/usr/include/X11 -DSOLARIS -DSOLARIS25 -DSVR4
-CC = cc
+PATH1 = ../../src/lisp
+vpath %.h .:$(PATH1)
+vpath %.c .:$(PATH1)
+vpath %.S .:$(PATH1)
+
+# For v8plus support (allows 64-bit integer support on V9
+# architectures), uncomment the definitions for CC_V8PLUS and
+# AS_V8PLUS.  The -Wa,xarch=v8plus option tells the assembler to
+# accept v8plus instructions and generate a v8plus object files and
+# executable.
+#
+# However, we should also make sure the binary is marked as v8plus by
+# enabling AS_V8PLUS whenever we have the :sparc-v9 *feature* enabled
+# because we really are a v8plus application by using some of the v9
+# instructions, even if we don't use the 64-bit registers.
+
+CC_V8PLUS = -xarch=v8plus
+AS_V8PLUS = -Wa,-xarch=v8plus
+
+# Enable support for :linkage-table feature.
+
+LINKAGE = -DLINKAGE_TABLE
+
+CPPFLAGS = -I. -I$(PATH1) -I/usr/openwin/include -I/usr/include/X11 -DSOLARIS -DSOLARIS25 -DSVR4 $(CC_V8PLUS) $(LINKAGE)
+
+
+CC = cc -O
 CPP = cc -E
 # -xs so we can use gdb
-CFLAGS = -g -xs
+CFLAGS = -g -xs $(AS_V8PLUS) $(CC_V8PLUS)
+
 # SunC 2.0.1 doesn't understand .S suffixes anymore.
 COMPILE.S = as -P $(CPPFLAGS)
-NM = ./solaris-nm
+NM = $(PATH1)/solaris-nm
 ASSEM_SRC = sparc-assem.S
 ARCH_SRC = sparc-arch.c
 
@@ -15,8 +43,7 @@ ARCH_SRC = sparc-arch.c
 # This has been checked out on Solaris 2.7 (aka 7) without problems.
 # The resulting binaries work ok on 2.5.
 
-OS_SRC = sunos-os.c os-common.c undefineds.c
+OS_SRC = solaris-os.c os-common.c undefineds.c
 OS_LINK_FLAGS=
 OS_LIBS= -lsocket -lnsl -ldl
 
-vpath /home/casper/cmucl/src/17e/lisp