diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-12-03 17:51:23 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-12-03 17:51:23 +0000 |
| commit | 8a9e74851b4813d69982f41e1edbd2134841a9ff (patch) | |
| tree | ecce1b75b18d7475ee6ea1b54b91e79e5d31394c /sys/arch/amd64/conf | |
| parent | 27dfb0437a81ddba5c9430256d1aa212589ac499 (diff) | |
Stop using the linker script. Something is arranging memory just so
resulting in kernels starting up the other cpu's incorrectly on processors
with very long pipelines, perhaps some bug instruction prefetch dependency
in the mptramp.
Diffstat (limited to 'sys/arch/amd64/conf')
| -rw-r--r-- | sys/arch/amd64/conf/Makefile.amd64 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64 index 7b0b594dccf..7b627b62f57 100644 --- a/sys/arch/amd64/conf/Makefile.amd64 +++ b/sys/arch/amd64/conf/Makefile.amd64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.amd64,v 1.20 2009/10/19 19:46:56 guenther Exp $ +# $OpenBSD: Makefile.amd64,v 1.21 2009/12/03 17:51:22 deraadt Exp $ # Makefile for OpenBSD # @@ -49,7 +49,7 @@ CMACHFLAGS+= -fno-stack-protector COPTS?= -O2 CFLAGS= ${DEBUG} ${CDIAGFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -x assembler-with-cpp -D_LOCORE -LINKFLAGS= -T ${AMD64}/conf/kern.ldscript -X +LINKFLAGS= -Ttext 0xffffffff801001e0 -e start -X STRIPFLAGS= -g -x .if ${IDENT:M-DDDB_STRUCT} @@ -99,6 +99,7 @@ SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@ DEBUG?= .if ${DEBUG} == "-g" +LINKFLAGS+= -X SYSTEM_LD_TAIL+=; \ echo mv $@ $@.gdb; rm -f $@.gdb; mv $@ $@.gdb; \ echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \ |