diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-11-18 01:11:14 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-11-18 01:11:14 +0000 |
| commit | 5f22109207efa29eeccc8198d7efceab0a10e067 (patch) | |
| tree | 2c09aabf753638c790a16e82dbd2e0c4a5f30df2 | |
| parent | 7a3f3cd764d101ec589fca35dc32128a521ba3f4 (diff) | |
rename ld.script to same name as other architectures
| -rw-r--r-- | sys/arch/amd64/conf/Makefile.amd64 | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/ld.script (renamed from sys/arch/amd64/conf/kern.ldscript) | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64 index 6db6e19d920..1324bf241ee 100644 --- a/sys/arch/amd64/conf/Makefile.amd64 +++ b/sys/arch/amd64/conf/Makefile.amd64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.amd64,v 1.62 2014/11/17 23:54:32 guenther Exp $ +# $OpenBSD: Makefile.amd64,v 1.63 2014/11/18 01:11:13 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -42,7 +42,7 @@ CMACHFLAGS+= -Wa,-n COPTS?= -O2 CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE -x assembler-with-cpp ${CWARNFLAGS} ${CMACHFLAGS} -LDSCRIPT= ${_machdir}/conf/kern.ldscript +LDSCRIPT= ${_machdir}/conf/ld.script LINKFLAGS= -T ${LDSCRIPT} -X --warn-common -nopie .if ${IDENT:M-DDDB_STRUCT} diff --git a/sys/arch/amd64/conf/kern.ldscript b/sys/arch/amd64/conf/ld.script index 7a8960f6315..4dc06ff4c0e 100644 --- a/sys/arch/amd64/conf/kern.ldscript +++ b/sys/arch/amd64/conf/ld.script @@ -1,4 +1,4 @@ -/* $OpenBSD: kern.ldscript,v 1.4 2014/11/17 23:54:32 guenther Exp $ */ +/* $OpenBSD: ld.script,v 1.1 2014/11/18 01:11:13 deraadt Exp $ */ /* * Copyright (c) 2009 Tobias Weingartner <weingart@tepid.org> |