diff options
| author | sjg <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
| commit | d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2 (patch) | |
| tree | b04f4bd7cd887f50e7d98af35f46b9834ff86c80 /usr.sbin/btxld | |
| parent | 3c8e37b1d04827f33c0c9a7594bd1b1ef7cdb3d3 (diff) | |
| parent | 4fbde208c6460d576f64d6dc3cdc6cab085a4283 (diff) | |
| download | FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.zip FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.tar.gz | |
Merge head from 7/28
Diffstat (limited to 'usr.sbin/btxld')
| -rw-r--r-- | usr.sbin/btxld/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/btxld/btxld.8 | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/usr.sbin/btxld/Makefile b/usr.sbin/btxld/Makefile index 32cf99d..8df8fa1 100644 --- a/usr.sbin/btxld/Makefile +++ b/usr.sbin/btxld/Makefile @@ -4,4 +4,6 @@ PROG= btxld MAN= btxld.8 SRCS= btxld.c elfh.c +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/usr.sbin/btxld/btxld.8 b/usr.sbin/btxld/btxld.8 index 5b514f6..cfa4623 100644 --- a/usr.sbin/btxld/btxld.8 +++ b/usr.sbin/btxld/btxld.8 @@ -95,4 +95,4 @@ combined .text and .data segments of the client image. .Xr ld 1 , .Xr boot 8 .Sh AUTHORS -.An Robert Nordier Aq rnordier@FreeBSD.org . +.An Robert Nordier Aq Mt rnordier@FreeBSD.org |
