Module Name: src
Committed By: joerg
Date: Tue Aug 26 19:49:33 UTC 2014
Modified Files:
src/libexec/ld.elf_so: rtld.h
Log Message:
Replace casts in the inline version of _rtld_call_function_void of
_rtld_call_function_addr with ifdef on RTLD_LOADER.
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/libexec/ld.elf_so/rtld.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/rtld.h
diff -u src/libexec/ld.elf_so/rtld.h:1.121 src/libexec/ld.elf_so/rtld.h:1.122
--- src/libexec/ld.elf_so/rtld.h:1.121 Tue Aug 26 07:54:27 2014
+++ src/libexec/ld.elf_so/rtld.h Tue Aug 26 19:49:33 2014
@@ -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 @@ Obj_Entry *_rtld_obj_new(void);
#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 @@ Elf_Addr _rtld_call_function_addr(const
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 */
