Module Name: src
Committed By: joerg
Date: Thu Jul 12 21:41:25 UTC 2018
Modified Files:
src/share/mk: bsd.README bsd.own.mk
Log Message:
Update MKSTATICPIE entry to actually do something.
To generate a diff of this commit:
cvs rdiff -u -r1.378 -r1.379 src/share/mk/bsd.README
cvs rdiff -u -r1.1066 -r1.1067 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.378 src/share/mk/bsd.README:1.379
--- src/share/mk/bsd.README:1.378 Thu Jul 12 06:52:49 2018
+++ src/share/mk/bsd.README Thu Jul 12 21:41:25 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.378 2018/07/12 06:52:49 maxv Exp $
+# $NetBSD: bsd.README,v 1.379 2018/07/12 21:41:25 joerg Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -430,7 +430,8 @@ MKSTATICLIB If "no", don't build or inst
Default: yes
MKSTATICPIE Compile in support for static pie binaries. These binaries
- use a special rcrt0.o/mcrt0.o that do the necessary relocations
+ use a special support in crt0.o for resolving relative
+ relocations and require linker support.
Default: yes on platforms that support it.
MKSTRIPSYM If "yes", strip all local symbols from shared libraries;
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1066 src/share/mk/bsd.own.mk:1.1067
--- src/share/mk/bsd.own.mk:1.1066 Fri Jun 22 17:31:24 2018
+++ src/share/mk/bsd.own.mk Thu Jul 12 21:41:25 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1066 2018/06/22 17:31:24 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1067 2018/07/12 21:41:25 joerg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1054,8 +1054,8 @@ MKRELRO?= partial
MKRELRO?= no
.endif
-.if ${MACHINE_ARCH} == "x86_64"
-MKSTATICPIE?= no
+.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
+MKSTATICPIE?= yes
.else
MKSTATICPIE?= no
.endif
