diff options
author | Matthew Dempsky <matthew@cvs.openbsd.org> | 2012-08-31 23:26:48 +0000 |
---|---|---|
committer | Matthew Dempsky <matthew@cvs.openbsd.org> | 2012-08-31 23:26:48 +0000 |
commit | 495e89e19983b1ff079c2bf298d975639f9d5d99 (patch) | |
tree | ab54de17964edc4ecb934d7a7495e75a97366891 /sbin | |
parent | c7012de65bc23fabeda84619cadb3bb13f806659 (diff) |
modload needs to invoke ld with -nopie now on ELF platforms
ok pascal
Diffstat (limited to 'sbin')
-rw-r--r-- | sbin/modload/elf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/modload/elf.c b/sbin/modload/elf.c index d6c3da523e0..e4c6ae3bfab 100644 --- a/sbin/modload/elf.c +++ b/sbin/modload/elf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: elf.c,v 1.8 2011/04/06 11:36:26 miod Exp $ */ +/* $OpenBSD: elf.c,v 1.9 2012/08/31 23:26:47 matthew Exp $ */ /* $NetBSD: elf.c,v 1.8 2002/01/03 21:45:58 jdolecek Exp $ */ /* @@ -316,8 +316,8 @@ elf_mod_sizes(int fd, size_t *modsize, int *strtablen, * -Tdata address to link data segment to in hex * <target> object file */ -#define LINKCMD "ld -Z -R %s -e %s -o %s -Ttext %p %s" -#define LINKCMD2 "ld -Z -R %s -e %s -o %s -Ttext %p -Tdata %p %s" +#define LINKCMD "ld -nopie -Z -R %s -e %s -o %s -Ttext %p %s" +#define LINKCMD2 "ld -nopie -Z -R %s -e %s -o %s -Ttext %p -Tdata %p %s" /* make a link command; XXX if data_offset above is non-zero, force data address to be at start of text + offset */ |