diff options
| author | martin <martin@NetBSD.org> | 2019-12-09 15:19:30 +0000 |
|---|---|---|
| committer | martin <martin@NetBSD.org> | 2019-12-09 15:19:30 +0000 |
| commit | 2adeb2bcb85b6ee2c548cc786e2abefab103a39a (patch) | |
| tree | 7ff04288f926e336241a69d81c91ca36c5ed88b5 /sys/modules | |
| parent | 66608338e5eb086db0e94194a627a4e1e40db294 (diff) | |
Pull up following revision(s) (requested by jmcneill in ticket #525):
external/cddl/osnet/dev/dtrace/aarch64/dtrace_isa.c: revision 1.1
distrib/sets/lists/modules/md.i386: revision 1.83
share/mk/bsd.own.mk: revision 1.1168
usr.bin/mkubootimage/mkubootimage.c: revision 1.25
sys/modules/dtrace/Makefile: revision 1.7
usr.bin/mkubootimage/mkubootimage.c: revision 1.26
sys/modules/dtrace/Makefile: revision 1.8
external/cddl/osnet/dist/lib/libdtrace/aarch64/dt_isadep.c: revision 1.2
distrib/sets/lists/modules/mi: revision 1.128
sys/arch/aarch64/include/frame.h: revision 1.3
sys/arch/evbarm/conf/mk.generic64: revision 1.4
external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c: revision 1.12
sys/modules/cyclic/Makefile: revision 1.4
sys/arch/aarch64/conf/Makefile.aarch64: revision 1.16
external/cddl/osnet/dev/dtrace/aarch64/dtrace_subr.c: revision 1.1
sys/arch/aarch64/aarch64/start.S: revision 1.3
sys/arch/aarch64/aarch64/trap.c: revision 1.22
external/cddl/osnet/dev/fbt/aarch64/fbt_isa.c: revision 1.1
external/cddl/osnet/dev/dtrace/aarch64/dtrace_asm.S: revision 1.1
external/cddl/osnet/dev/fbt/aarch64/fbt_isa.h: revision 1.1
external/cddl/osnet/dev/dtrace/aarch64/regset.h: revision 1.1
external/cddl/osnet/lib/libdtrace/Makefile: revision 1.26
distrib/sets/lists/modules/md.amd64: revision 1.82
usr.bin/mkubootimage/mkubootimage.1: revision 1.13
distrib/sets/lists/modules/ad.arm: revision 1.14
Add KDTRACE_HOOKS support.
Define lwp_trapframe() macro
dtrace: add support for aarch64
Add syscall_linux back for other arm architectures (accidently removed
in previous)
Add -u flag for updating headers in place.
Fix alignment of .text section by changing load address to
0xffffffc000000000 and adding 64 bytes of padding before the entry point.
Update arm64 image header in place
Move dtrace_syscall_linux out of mi set list
Enable DTrace on aarch64
Fix signed/unsigned comparison
Diffstat (limited to 'sys/modules')
| -rw-r--r-- | sys/modules/cyclic/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/dtrace/Makefile | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/sys/modules/cyclic/Makefile b/sys/modules/cyclic/Makefile index cc1222c8add..58f8e0deead 100644 --- a/sys/modules/cyclic/Makefile +++ b/sys/modules/cyclic/Makefile @@ -8,6 +8,8 @@ OSNETDIR=${NETBSDSRCDIR}/external/cddl/osnet .if exists(${OSNETDIR}/dev/cyclic/${MACHINE:S/amd64/i386/}) ARCH=${MACHINE:S/amd64/i386/} +.elif exists(${OSNETDIR}/dev/cyclic/${MACHINE_CPU:S/aarch64/arm/}) +ARCH=${MACHINE_CPU:S/aarch64/arm/} .elif exists(${OSNETDIR}/dev/cyclic/${MACHINE_CPU}) ARCH=${MACHINE_CPU} .else diff --git a/sys/modules/dtrace/Makefile b/sys/modules/dtrace/Makefile index b26c6317937..a92117334cb 100644 --- a/sys/modules/dtrace/Makefile +++ b/sys/modules/dtrace/Makefile @@ -1,10 +1,13 @@ -# $NetBSD: Makefile,v 1.6 2015/03/08 17:11:57 christos Exp $ +# $NetBSD: Makefile,v 1.6.22.1 2019/12/09 15:19:31 martin Exp $ # $FreeBSD: src/sys/modules/dtrace/Makefile,v 1.6.2.1 2009/08/03 08:13:06 kensmith Exp $ .include <bsd.own.mk> SUBDIR= dtrace sdt fbt lockstat profile syscall + +.if ${MACHINE_ARCH} != "aarch64" SUBDIR+= linux_syscall +.endif .if ${MACHINE_ARCH} == "x86_64" SUBDIR+= netbsd32_syscall |
