Module Name: src
Committed By: matt
Date: Tue Apr 30 16:26:27 UTC 2013
Modified Files:
src/distrib/sets: mkvars.mk sets.subr
Log Message:
Explicitly make MKSOFTFLOAT a mkvar.
Add support for endian={1234,4321}
Add EABI flag for ARM.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/mkvars.mk
cvs rdiff -u -r1.147 -r1.148 src/distrib/sets/sets.subr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/mkvars.mk
diff -u src/distrib/sets/mkvars.mk:1.8 src/distrib/sets/mkvars.mk:1.9
--- src/distrib/sets/mkvars.mk:1.8 Mon Jan 28 13:46:47 2013
+++ src/distrib/sets/mkvars.mk Tue Apr 30 16:26:26 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mkvars.mk,v 1.8 2013/01/28 13:46:47 nakayama Exp $
+# $NetBSD: mkvars.mk,v 1.9 2013/04/30 16:26:26 matt Exp $
MKEXTRAVARS= \
MACHINE \
@@ -17,6 +17,7 @@ MKEXTRAVARS= \
MKDYNAMICROOT \
MKMANPAGES \
MKSLJIT \
+ MKSOFTFLOAT \
MKXORG \
X11FLAVOR \
USE_INET6 \
@@ -24,12 +25,14 @@ MKEXTRAVARS= \
USE_LDAP \
USE_YP \
NETBSDSRCDIR \
- MAKEVERBOSE
+ MAKEVERBOSE \
+ TARGET_ENDIANNESS
#####
.include <bsd.own.mk>
.include <bsd.sys.mk>
+.include <bsd.endian.mk>
.if (${MKMAN} == "no" || empty(MANINSTALL:Mmaninstall))
MKMANPAGES=no
@@ -63,6 +66,10 @@ mkextravars: .PHONY
@echo $i="${$i}"
.endfor
+.if (!empty(MACHINE_ARCH:Mearm*))
+ @echo EABI=yes
+.endif
+
mksolaris: .PHONY
.if (${MKDTRACE} != "no" || ${MKZFS} != "no")
@echo MKSOLARIS="yes"
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.147 src/distrib/sets/sets.subr:1.148
--- src/distrib/sets/sets.subr:1.147 Sun Apr 28 04:05:37 2013
+++ src/distrib/sets/sets.subr Tue Apr 30 16:26:26 2013
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.147 2013/04/28 04:05:37 joerg Exp $
+# $NetBSD: sets.subr,v 1.148 2013/04/30 16:26:26 matt Exp $
#
#
@@ -179,7 +179,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.147 2013/04/28 04:05:37 joerg Exp $
+# # $NetBSD: sets.subr,v 1.148 2013/04/30 16:26:26 matt Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -251,6 +251,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# share ${MKSHARE} != no
# skey ${MKSKEY} != no
# sljit ${MKSLJIT} != no
+# softfloat ${MKSOFTFLOAT} != no
# solaris ${MKDTRACE} != no or ${MKZFS} != no
# ssp ${HAVE_SSP} != no
# tpm ${MKTPM} != no
@@ -259,6 +260,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# yp ${MKYP} != no
# zfs ${MKZFS} != no
#
+# endian=<n> <n> = value of ${TARGET_ENDIANNESS}
# binutils=<n> <n> = value of ${HAVE_BINUTILS}
# gcc=<n> <n> = value of ${HAVE_GCC}
# gdb=<n> <n> = value of ${HAVE_GDB}
@@ -292,6 +294,7 @@ list_set_files()
kw = tolower(nv)
sub(/^mk/, "", kw)
sub(/^have_/, "", kw)
+ sub(/^target_endianness/, "endian", kw)
if (ENVIRON[nv] != "no")
wanted[kw] = 1
}
@@ -308,6 +311,8 @@ list_set_files()
wanted[".cat"] = 1
if (("man" in wanted) && ("manpages" in wanted))
wanted[".man"] = 1
+ if ("endian" in wanted)
+ wanted["endian=" "'"${TARGET_ENDIANNESS}"'"] = 1
}
/^#/ {
