Auto merge of #3153 - devnexen:dl_iterate_phdr_haiku, r=JohnTitor

haku adding dl_iterate_phdr bsd extension
rust-lang · Mar 29, 2023 · 68e06ad · 68e06ad
2 parents 3a6c1c4 + 47b56cd
commit 68e06ad
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/libc-test/build.rs b/libc-test/build.rs
@@ -4234,6 +4234,7 @@ fn test_haiku(target: &str) {
                "link.h",
                "pty.h",
                "stringlist.h",
+               "sys/link_elf.h",
     }
 
     // Native API

diff --git a/src/unix/haiku/mod.rs b/src/unix/haiku/mod.rs
@@ -445,6 +445,13 @@ s! {
         pub sl_max: ::size_t,
         pub sl_cur: ::size_t,
     }
+
+    pub struct dl_phdr_info {
+        pub dlpi_addr: ::Elf_Addr,
+        pub dlpi_name: *const ::c_char,
+        pub dlpi_phdr: *const ::Elf_Phdr,
+        pub dlpi_phnum: ::Elf_Half,
+    }
 }
 
 s_no_extra_traits! {
@@ -2033,6 +2040,16 @@ extern "C" {
 
     pub fn getprogname() -> *const ::c_char;
     pub fn setprogname(progname: *const ::c_char);
+    pub fn dl_iterate_phdr(
+        callback: ::Option<
+            unsafe extern "C" fn(
+                info: *mut dl_phdr_info,
+                size: usize,
+                data: *mut ::c_void,
+            ) -> ::c_int,
+        >,
+        data: *mut ::c_void,
+    ) -> ::c_int;
 }
 
 #[link(name = "unix")]