Module Name: src
Committed By: scole
Date: Fri Aug 5 16:44:31 UTC 2016
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
PR port-ia64/51261
For ia64, don't build elf32, disable MKDYNAMICROOT and MKRUMP.
ld.elf_so and rump are not implemented yet
To generate a diff of this commit:
cvs rdiff -u -r1.938 -r1.939 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.own.mk
diff -u src/share/mk/bsd.own.mk:1.938 src/share/mk/bsd.own.mk:1.939
--- src/share/mk/bsd.own.mk:1.938 Thu Jul 7 07:52:24 2016
+++ src/share/mk/bsd.own.mk Fri Aug 5 16:44:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.938 2016/07/07 07:52:24 martin Exp $
+# $NetBSD: bsd.own.mk,v 1.939 2016/08/05 16:44:31 scole Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -636,7 +636,7 @@ MACHINES.x86_64= amd64
# for crunchide & ldd, define the OBJECT_FMTS used by a MACHINE_ARCH
#
OBJECT_FMTS=
-.if ${MACHINE_ARCH} != "alpha"
+.if ${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "ia64"
OBJECT_FMTS+= elf32
.endif
.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH:M*64*} != ""
@@ -703,6 +703,11 @@ check_RELEASEDIR: .PHONY .NOTMAIN
#
MKDYNAMICROOT?= yes
+# For ia64, ld.elf_so not yet implemented
+.if ${MACHINE_ARCH} == "ia64"
+MKDYNAMICROOT= no
+.endif
+
#
# Where the system object and source trees are kept; can be configurable
# by the user in case they want them in ~/foosrc and ~/fooobj (for example).
@@ -1126,6 +1131,11 @@ MKGCCCMDS?= ${MKGCC}
MKKMOD= no
.endif
+# Rump doesn't work yet on ia64
+.if ${MACHINE} == "ia64"
+MKRUMP= no
+.endif
+
#
# MK* options which default to "no". Note that MKZFS has a different
# default for some platforms, see above.
