Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 Feb 2016 17:31:17 +0000 (UTC)
From:      Steven Hartland <smh@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r295531 - stable/10/sys/boot/common
Message-ID:  <201602111731.u1BHVHXI047775@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: smh
Date: Thu Feb 11 17:31:17 2016
New Revision: 295531
URL: https://svnweb.freebsd.org/changeset/base/295531

Log:
  MFC r295356 (Partial)
  
  Fix EFI platform build failures on arm.armeb
  
  Approved by:	re (marius)
  Sponsored by:	Multiplay

Modified:
  stable/10/sys/boot/common/load_elf.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/boot/common/load_elf.c
==============================================================================
--- stable/10/sys/boot/common/load_elf.c	Thu Feb 11 17:25:12 2016	(r295530)
+++ stable/10/sys/boot/common/load_elf.c	Thu Feb 11 17:31:17 2016	(r295531)
@@ -856,7 +856,7 @@ __elfN(parse_modmetadata)(struct preload
 	error = __elfN(reloc_ptr)(fp, ef, v, &md, sizeof(md));
 	if (error == EOPNOTSUPP) {
 	    md.md_cval += ef->off;
-	    md.md_data = (void *)((uintptr_t)md.md_data + ef->off);
+	    md.md_data = (void *)((uintptr_t)md.md_data + (uintptr_t)ef->off);
 	} else if (error != 0)
 	    return (error);
 #endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602111731.u1BHVHXI047775>