Module Name: src
Committed By: martin
Date: Mon Jul 11 15:51:01 UTC 2016
Modified Files:
src/sys/arch/arm/arm32: kobj_machdep.c
Log Message:
kobj_machdep() is now called multiple times for the same module.
Only do arm-BE8 symbol fixup when called for the text segment.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/arm32/kobj_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/arm/arm32/kobj_machdep.c
diff -u src/sys/arch/arm/arm32/kobj_machdep.c:1.10 src/sys/arch/arm/arm32/kobj_machdep.c:1.11
--- src/sys/arch/arm/arm32/kobj_machdep.c:1.10 Fri Nov 7 21:28:32 2014
+++ src/sys/arch/arm/arm32/kobj_machdep.c Mon Jul 11 15:51:01 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: kobj_machdep.c,v 1.10 2014/11/07 21:28:32 martin Exp $ */
+/* $NetBSD: kobj_machdep.c,v 1.11 2016/07/11 15:51:01 martin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.10 2014/11/07 21:28:32 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.11 2016/07/11 15:51:01 martin Exp $");
#define ELFSIZE ARCH_ELFSIZE
@@ -399,7 +399,7 @@ kobj_machdep(kobj_t ko, void *base, size
if (load) {
#if __ARMEB__
- if (CPU_IS_ARMV7_P())
+ if (CPU_IS_ARMV7_P() && base == (void*)ko->ko_text_address)
kobj_be8_fixup(ko);
#endif
#ifndef _RUMPKERNEL
