[src/trunk]: src/libexec/ld.elf_so Replace casts in the inline version of _rt...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b4c05e67c6b3
branches:  trunk
changeset: 801991:b4c05e67c6b3
user:      joerg <joerg%NetBSD.org@localhost>
date:      Tue Aug 26 19:49:33 2014 +0000

description:
Replace casts in the inline version of _rtld_call_function_void of
_rtld_call_function_addr with ifdef on RTLD_LOADER.

diffstat:

 libexec/ld.elf_so/rtld.h |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r 46669ddc925a -r b4c05e67c6b3 libexec/ld.elf_so/rtld.h
--- a/libexec/ld.elf_so/rtld.h  Tue Aug 26 17:28:14 2014 +0000
+++ b/libexec/ld.elf_so/rtld.h  Tue Aug 26 19:49:33 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtld.h,v 1.121 2014/08/26 07:54:27 christos Exp $       */
+/*     $NetBSD: rtld.h,v 1.122 2014/08/26 19:49:33 joerg Exp $  */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -484,6 +484,7 @@
 #define RTLD_ELF32_CAST 
 #endif
 
+#ifdef RTLD_LOADER
 /* function descriptors */
 #ifdef __HAVE_FUNCTION_DESCRIPTORS
 Elf_Addr _rtld_function_descriptor_alloc(const Obj_Entry *,
@@ -496,14 +497,15 @@
 static inline void
 _rtld_call_function_void(const Obj_Entry *obj, Elf_Addr addr)
 {
-       ((void (*)(void)) RTLD_ELF32_CAST addr)();
+       ((void (*)(void))addr)();
 }
 static inline Elf_Addr
 _rtld_call_function_addr(const Obj_Entry *obj, Elf_Addr addr)
 {
-       return ((Elf_Addr(*)(void)) RTLD_ELF32_CAST addr)();
+       return ((Elf_Addr(*)(void))addr)();
 }
 #endif /* __HAVE_FUNCTION_DESCRIPTORS */
+#endif /* RTLD_LOADER */
 
 #endif /* _RTLD_SOURCE */