Module Name: src
Committed By: rin
Date: Sun Nov 24 11:45:00 UTC 2019
Modified Files:
src/sys/arch/aarch64/aarch64: exec_machdep.c
Log Message:
part of PR port-arm/54702
Make sure that md_march32 and ep_machine_arch have same size.
XXX
pullup to netbsd-9
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/aarch64/aarch64/exec_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/aarch64/exec_machdep.c
diff -u src/sys/arch/aarch64/aarch64/exec_machdep.c:1.5 src/sys/arch/aarch64/aarch64/exec_machdep.c:1.6
--- src/sys/arch/aarch64/aarch64/exec_machdep.c:1.5 Sun Nov 24 04:08:36 2019
+++ src/sys/arch/aarch64/aarch64/exec_machdep.c Sun Nov 24 11:45:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_machdep.c,v 1.5 2019/11/24 04:08:36 rin Exp $ */
+/* $NetBSD: exec_machdep.c,v 1.6 2019/11/24 11:45:00 rin Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exec_machdep.c,v 1.5 2019/11/24 04:08:36 rin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exec_machdep.c,v 1.6 2019/11/24 11:45:00 rin Exp $");
#include "opt_compat_netbsd.h"
#include "opt_compat_netbsd32.h"
@@ -86,6 +86,8 @@ aarch64_netbsd_elf32_probe(struct lwp *l
/*
* Copy (if any) the machine_arch of the executable to the proc.
*/
+ CTASSERT(sizeof(l->l_proc->p_md.md_march32) ==
+ sizeof(epp->ep_machine_arch));
if (epp->ep_machine_arch[0] != 0)
strlcpy(l->l_proc->p_md.md_march32, epp->ep_machine_arch,
sizeof(l->l_proc->p_md.md_march32));
