svn commit: r276342 - head/libexec/rtld-elf/powerpc

Dimitry Andric dim at FreeBSD.org
Sun Dec 28 19:55:45 UTC 2014


Author: dim
Date: Sun Dec 28 19:55:44 2014
New Revision: 276342
URL: https://svnweb.freebsd.org/changeset/base/276342

Log:
  Fix the following -Werror warning from clang 3.5.0, while building
  rtld-elf for powerpc 32 bit:
  
  libexec/rtld-elf/powerpc/reloc.c:486:6: error: taking the absolute value of unsigned type 'Elf_Addr' (aka 'unsigned int') has no effect [-Werror,-Wabsolute-value]
          if (abs(offset) < 32*1024*1024) {     /* inside 32MB? */
              ^
  libexec/rtld-elf/powerpc/reloc.c:486:6: note: remove the call to 'abs' since unsigned values cannot be negative
          if (abs(offset) < 32*1024*1024) {     /* inside 32MB? */
              ^~~
  1 error generated.
  
  Cast 'offset' to int, since that was intended, and should be safe to do
  on architectures with 32-bit two's complement ints.
  
  Reviewed by:	kib
  Differential Revision: https://reviews.freebsd.org/D1387

Modified:
  head/libexec/rtld-elf/powerpc/reloc.c

Modified: head/libexec/rtld-elf/powerpc/reloc.c
==============================================================================
--- head/libexec/rtld-elf/powerpc/reloc.c	Sun Dec 28 19:24:01 2014	(r276341)
+++ head/libexec/rtld-elf/powerpc/reloc.c	Sun Dec 28 19:55:44 2014	(r276342)
@@ -483,7 +483,7 @@ reloc_jmpslot(Elf_Addr *wherep, Elf_Addr
 	 */
 	offset = target - (Elf_Addr)wherep;
 
-	if (abs(offset) < 32*1024*1024) {     /* inside 32MB? */
+	if (abs((int)offset) < 32*1024*1024) {     /* inside 32MB? */
 		/* b    value   # branch directly */
 		*wherep = 0x48000000 | (offset & 0x03fffffc);
 		__syncicache(wherep, 4);


More information about the svn-src-all mailing list