CVS commit: src/sys/arch/arm/arm32

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Fri Aug  9 06:00:09 UTC 2013

Modified Files:
        src/sys/arch/arm/arm32: kobj_machdep.c

Log Message:
Fix addend manipulation


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 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.5 src/sys/arch/arm/arm32/kobj_machdep.c:1.6
--- src/sys/arch/arm/arm32/kobj_machdep.c:1.5	Thu Aug  8 06:49:09 2013
+++ src/sys/arch/arm/arm32/kobj_machdep.c	Fri Aug  9 06:00:09 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: kobj_machdep.c,v 1.5 2013/08/08 06:49:09 matt Exp $	*/
+/*	$NetBSD: kobj_machdep.c,v 1.6 2013/08/09 06:00:09 matt 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.5 2013/08/08 06:49:09 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.6 2013/08/09 06:00:09 matt Exp $");
 
 #define	ELFSIZE		ARCH_ELFSIZE
 
@@ -148,7 +148,7 @@ kobj_reloc(kobj_t ko, uintptr_t relocbas
 		if (addr == 0)
 			break;
 
-		addend += ((uint32_t *)addr - (uint32_t *)where);
+		addend += (uintptr_t)addr - (uintptr_t)where;
 
 		if (addend & 3) {
 			printf ("Relocation %x unaligned @ %p\n", addend, where);