diff options
| author |   matthew <matthew@openbsd.org> | 2012-08-31 23:26:47 +0000 |
|---|---|---|
| committer | matthew <matthew@openbsd.org> | 2012-08-31 23:26:47 +0000 |
| commit | d42fbd79b18143bd9c6269ba9c9e988faf6bfc45 (patch) | |
| tree | cb22e3b1005550ea7337d5b81f9f36330b4bee2a | |
| parent | Use EVP_MAX_MD_SIZE for the key size for now as discussed on icb. (diff) | |
| download | wireguard-openbsd-d42fbd79b18143bd9c6269ba9c9e988faf6bfc45.tar.xz wireguard-openbsd-d42fbd79b18143bd9c6269ba9c9e988faf6bfc45.zip | |
modload needs to invoke ld with -nopie now on ELF platforms
ok pascal
| -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 */ |