use specialized _rtls_add_phdr on FBSD

- also add @nogc overload to dl_iterate_phdr and such
dlang · Dec 27, 2014 · afb4cc2 · afb4cc2
1 parent 658b5a2
commit afb4cc2
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 15 deletions.
diff --git a/src/core/sys/freebsd/sys/link_elf.d b/src/core/sys/freebsd/sys/link_elf.d
@@ -71,7 +71,9 @@ struct dl_phdr_info
 };
 
 
-private alias extern(C) int function(dl_phdr_info*, size_t, void*) __dl_iterate_hdr_callback;
-extern int dl_iterate_phdr(__dl_iterate_hdr_callback, void*);
-extern int _rtld_addr_phdr(const void*, dl_phdr_info*);
-extern int _rtld_get_stack_prot();
+private alias extern(C) int function(dl_phdr_info*, size_t, void *) dl_iterate_phdr_cb;
+private alias extern(C) int function(dl_phdr_info*, size_t, void *) @nogc dl_iterate_phdr_cb_ngc;
+extern int dl_iterate_phdr(dl_iterate_phdr_cb __callback, void*__data);
+extern int dl_iterate_phdr(dl_iterate_phdr_cb_ngc __callback, void*__data) @nogc;
+extern int _rtld_addr_phdr(const void*, dl_phdr_info*) @nogc;
+extern int _rtld_get_stack_prot() @nogc;
diff --git a/src/core/sys/linux/link.d b/src/core/sys/linux/link.d
@@ -149,9 +149,10 @@ struct dl_phdr_info
     void *dlpi_tls_data;
 }
 
-private alias extern(C) int function(dl_phdr_info*, size_t, void *) __Callback;
-extern int dl_iterate_phdr(__Callback __callback, void*__data);
-
+private alias extern(C) int function(dl_phdr_info*, size_t, void *) dl_iterate_phdr_cb;
+private alias extern(C) int function(dl_phdr_info*, size_t, void *) @nogc dl_iterate_phdr_cb_ngc;
+extern int dl_iterate_phdr(dl_iterate_phdr_cb __callback, void*__data);
+extern int dl_iterate_phdr(dl_iterate_phdr_cb_ngc __callback, void*__data) @nogc;
 
 // ld.so auditing interfaces prototypes have to be defined by the auditing DSO.
 extern uint la_version(uint __version);

diff --git a/src/core/sys/solaris/link.d b/src/core/sys/solaris/link.d
@@ -167,5 +167,7 @@ struct dl_phdr_info {
     uint64_t           dlpi_subs;
 };
 
-private alias extern(C) int function(dl_phdr_info*, size_t, void*) __dl_iterate_hdr_callback;
-extern int dl_iterate_phdr(__dl_iterate_hdr_callback, void*);
+private alias extern(C) int function(dl_phdr_info*, size_t, void *) dl_iterate_phdr_cb;
+private alias extern(C) int function(dl_phdr_info*, size_t, void *) @nogc dl_iterate_phdr_cb_ngc;
+extern int dl_iterate_phdr(dl_iterate_phdr_cb __callback, void*__data);
+extern int dl_iterate_phdr(dl_iterate_phdr_cb_ngc __callback, void*__data) @nogc;
diff --git a/src/rt/sections_elf_shared.d b/src/rt/sections_elf_shared.d
@@ -708,13 +708,11 @@ void scanSegments(in ref dl_phdr_info info, DSO* pdso)
  * References:
  *      http://linux.die.net/man/3/dl_iterate_phdr
  */
-nothrow
-bool findDSOInfoForAddr(in void* addr, dl_phdr_info* result=null)
+version (linux) bool findDSOInfoForAddr(in void* addr, dl_phdr_info* result=null) nothrow @nogc
 {
     static struct DG { const(void)* addr; dl_phdr_info* result; }
 
-    extern(C) nothrow
-    int callback(dl_phdr_info* info, size_t sz, void* arg)
+    extern(C) int callback(dl_phdr_info* info, size_t sz, void* arg) nothrow @nogc
     {
         auto p = cast(DG*)arg;
         if (findSegmentForAddr(*info, p.addr))
@@ -733,13 +731,16 @@ bool findDSOInfoForAddr(in void* addr, dl_phdr_info* result=null)
      */
     return dl_iterate_phdr(&callback, &dg) != 0;
 }
+else version (FreeBSD) bool findDSOInfoForAddr(in void* addr, dl_phdr_info* result=null) nothrow @nogc
+{
+    return !!_rtld_addr_phdr(addr, result);
+}
 
 /*********************************
  * Determine if 'addr' lies within shared object 'info'.
  * If so, return true and fill in 'result' with the corresponding ELF program header.
  */
-nothrow
-bool findSegmentForAddr(in ref dl_phdr_info info, in void* addr, ElfW!"Phdr"* result=null)
+bool findSegmentForAddr(in ref dl_phdr_info info, in void* addr, ElfW!"Phdr"* result=null) nothrow @nogc
 {
     if (addr < cast(void*)info.dlpi_addr) // less than base address of object means quick reject
         return false;