[src/netbsd-9]: src Pull up following revision(s) (requested by simonb in tic...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6e118dac6d53
branches:  netbsd-9
changeset: 949289:6e118dac6d53
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Jan 08 13:00:49 2021 +0000

description:
Pull up following revision(s) (requested by simonb in ticket #1183):

        external/bsd/ipf/Makefile.inc: revision 1.6
        compat/exec.mk: revision 1.5

Use the compat machinery to build "native" IPF binaries as ipfilter
doesn't use compat32 64-bit alignment/size safe structures.

Fixes IPF on at least mips64.

diffstat:

 compat/exec.mk                |  7 +++++--
 external/bsd/ipf/Makefile.inc |  4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diffs (43 lines):

diff -r bb4972047159 -r 6e118dac6d53 compat/exec.mk
--- a/compat/exec.mk    Sun Jan 03 12:52:54 2021 +0000
+++ b/compat/exec.mk    Fri Jan 08 13:00:49 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: exec.mk,v 1.4 2018/09/20 02:51:21 macallan Exp $
+#      $NetBSD: exec.mk,v 1.4.2.1 2021/01/08 13:00:50 martin Exp $
 
 # this makefile fragment can be included to modify the default
 # ABI a program is compiled with.  this is designed to be used
@@ -7,6 +7,7 @@
 
 # currently this file is used by these Makefiles:
 #
+#   external/bsd/ipf/Makefile.inc 
 #   sbin/savecore/Makefile
 #   usr.bin/fstat/Makefile
 #   usr.bin/netstat/Makefile
@@ -22,7 +23,9 @@
 # can be considered "not a bug".  all the *stat tools should
 # be converted to use sysctl(3) on the running kernel, and
 # anyone who needs kvm-access on crash dumps can build their
-# own 64 bit version as necessary.
+# own 64 bit version as necessary.  ipfilter doesn't use
+# 64-bit alignment/size safe structures.
+# 
 
 # mips64 defaults to 32 bit userland, but with a 64 bit kernel
 # most kvm-using tools are happier with 64 bit.
diff -r bb4972047159 -r 6e118dac6d53 external/bsd/ipf/Makefile.inc
--- a/external/bsd/ipf/Makefile.inc     Sun Jan 03 12:52:54 2021 +0000
+++ b/external/bsd/ipf/Makefile.inc     Fri Jan 08 13:00:49 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.3 2017/01/11 12:19:43 joerg Exp $
+#      $NetBSD: Makefile.inc,v 1.3.16.1 2021/01/08 13:00:49 martin Exp $
 
 WARNS?=        1       # XXX -Wcast-qual -Wshadow
 CWARNFLAGS.clang+=     -Wno-format -Wno-tautological-compare \
@@ -36,3 +36,5 @@
        ${UDIST}/lib    \
        ${UDIST}/tools  \
        ${UDIST}/man
+
+.include "../../compat/exec.mk"