5 files changed, 19 insertions, 8 deletions

diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index c98b3d7e2a389..290b24ce4df57 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -1,7 +1,7 @@
 # Makefile.alpha -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.alpha	7.1 5/10/91
-#	$Id: Makefile.alpha,v 1.5 1998/07/22 08:23:26 dfr Exp $
+#	$Id: Makefile.alpha,v 1.6 1998/07/30 08:12:14 dfr Exp $
 #
 # Makefile for FreeBSD
 #
@@ -79,7 +79,7 @@ SYSTEM_LD_HEAD= @echo loading $@; rm -f $@
 .if ${BINFORMAT} == elf
 SYSTEM_OBJS= locore.o setdef0.o vnode_if.o \
 	${OBJS} ioconf.o param.o config.o \
-	setdef1.o
+	setdef1.o hack.so
 SYSTEM_LD= @${LD} --export-dynamic -T$S/alpha/conf/kernel.script -e locorestart \
 	-o $@ -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
@@ -119,6 +119,11 @@ symbols.sort: ${ALPHA}/alpha/symbols.raw
 locore.o: ${ALPHA}/alpha/locore.s assym.s
 	${NORMAL_S}
 
+hack.so: Makefile
+	echo "void __elf_kld_hack() {}" > hack.c
+	${CC} -shared -nostdlib hack.c -o hack.so
+	rm -f hack.c
+
 setdef0.o: ${ALPHA}/alpha/setdef0.c setdefs.h
 	${NORMAL_C}
 
diff --git a/sys/conf/files.alpha b/sys/conf/files.alpha
index 396d707fb354f..5e28c2c43f2d5 100644
--- a/sys/conf/files.alpha
+++ b/sys/conf/files.alpha
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.alpha,v 1.3 1998/07/12 16:26:52 dfr Exp $
+#	$Id: files.alpha,v 1.4 1998/07/22 08:24:39 dfr Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -19,6 +19,9 @@ alpha/alpha/cpuconf.c		standard
 alpha/alpha/dec_kn8ae.c		optional	dec_kn8ae
 alpha/alpha/dec_eb164.c		optional	dec_eb164
 alpha/alpha/dec_kn20aa.c	optional	dec_kn20aa
+alpha/alpha/dec_2100_a50.c	optional	dec_2100_a50
+alpha/alpha/dec_st550.c		optional	dec_st550
+alpha/alpha/dec_axppci_33.c	optional	dec_axppci_33
 alpha/alpha/mountroot.c		optional	slice
 alpha/alpha/ipl_funcs.c		standard
 alpha/alpha/pal.s		standard
@@ -79,6 +82,8 @@ mcclock_if.h			standard					\
 alpha/pci/cia.c			optional	cia
 alpha/pci/pci_eb164_intr.s	optional	cia
 alpha/isa/mcclock_isa.c		optional	cia
+alpha/pci/apecs.c		optional	apecs
+alpha/pci/lca.c			optional	lca
 alpha/pci/pcibus.c		optional	pci
 alpha/isa/isa.c			optional	isa
 kern/link_elf.c			standard
diff --git a/sys/conf/ldscript.alpha b/sys/conf/ldscript.alpha
index eac78dd31df47..1bcfd9079bb20 100644
--- a/sys/conf/ldscript.alpha
+++ b/sys/conf/ldscript.alpha
@@ -3,8 +3,7 @@ OUTPUT_FORMAT("elf64-alpha", "elf64-alpha",
 OUTPUT_ARCH(alpha)
 ENTRY(__start)
 SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/egcs/lib); SEARCH_DIR(/usr/local/lib); SEARCH_DIR(/usr/local/egcs/alphaev5-unknown-linux-gnu/lib);
-/* Do we need any of these for elf?
-   __DYNAMIC = 0;    */
+   kernel_text = 0xfffffc0000300000;
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
diff --git a/sys/conf/ldscript.powerpc b/sys/conf/ldscript.powerpc
index eac78dd31df47..1bcfd9079bb20 100644
--- a/sys/conf/ldscript.powerpc
+++ b/sys/conf/ldscript.powerpc
@@ -3,8 +3,7 @@ OUTPUT_FORMAT("elf64-alpha", "elf64-alpha",
 OUTPUT_ARCH(alpha)
 ENTRY(__start)
 SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/egcs/lib); SEARCH_DIR(/usr/local/lib); SEARCH_DIR(/usr/local/egcs/alphaev5-unknown-linux-gnu/lib);
-/* Do we need any of these for elf?
-   __DYNAMIC = 0;    */
+   kernel_text = 0xfffffc0000300000;
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
diff --git a/sys/conf/options.alpha b/sys/conf/options.alpha
index f626ca22e5693..3132f9ad5bbe0 100644
--- a/sys/conf/options.alpha
+++ b/sys/conf/options.alpha
@@ -1,9 +1,12 @@
-#	$Id: options.alpha,v 1.2 1998/07/12 16:28:09 dfr Exp $
+#	$Id: options.alpha,v 1.3 1998/07/22 08:24:39 dfr Exp $
 
 EV5			opt_global.h
 DEC_KN8AE		opt_cpu.h
 DEC_EB164		opt_cpu.h
 DEC_KN20AA		opt_cpu.h
+DEC_2100_A50		opt_cpu.h
+DEC_ST550		opt_cpu.h
+DEC_AXPPCI_33		opt_cpu.h
 
 ATAPI			opt_atapi.h
 ATAPI_STATIC		opt_atapi.h