Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/distrib/sets Explicitly make MKSOFTFLOAT a mkvar.



details:   https://anonhg.NetBSD.org/src/rev/addb81c98583
branches:  trunk
changeset: 786525:addb81c98583
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Apr 30 16:26:26 2013 +0000

description:
Explicitly make MKSOFTFLOAT a mkvar.
Add support for endian={1234,4321}
Add EABI flag for ARM.

diffstat:

 distrib/sets/mkvars.mk |  11 +++++++++--
 distrib/sets/sets.subr |   9 +++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diffs (95 lines):

diff -r e2ec4e9a27ff -r addb81c98583 distrib/sets/mkvars.mk
--- a/distrib/sets/mkvars.mk    Tue Apr 30 16:03:44 2013 +0000
+++ b/distrib/sets/mkvars.mk    Tue Apr 30 16:26:26 2013 +0000
@@ -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 @@
        MKDYNAMICROOT \
        MKMANPAGES \
        MKSLJIT \
+       MKSOFTFLOAT \
        MKXORG \
        X11FLAVOR \
        USE_INET6 \
@@ -24,12 +25,14 @@
        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 @@
        @echo $i="${$i}"
 .endfor
 
+.if (!empty(MACHINE_ARCH:Mearm*))
+       @echo EABI=yes
+.endif
+
 mksolaris: .PHONY
 .if (${MKDTRACE} != "no" || ${MKZFS} != "no")
        @echo MKSOLARIS="yes"
diff -r e2ec4e9a27ff -r addb81c98583 distrib/sets/sets.subr
--- a/distrib/sets/sets.subr    Tue Apr 30 16:03:44 2013 +0000
+++ b/distrib/sets/sets.subr    Tue Apr 30 16:26:26 2013 +0000
@@ -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 @@
 # 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 @@
 #      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 @@
 #      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 @@
                                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 @@
                                wanted[".cat"] = 1
                        if (("man" in wanted) && ("manpages" in wanted))
                                wanted[".man"] = 1
+                       if ("endian" in wanted)
+                               wanted["endian=" "'"${TARGET_ENDIANNESS}"'"] = 1
                }
 
                /^#/ {



Home | Main Index | Thread Index | Old Index