From a50e6771b4669da2c3c657d998d9839bf59ae73b Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Sun, 3 Apr 2016 12:00:21 +0200
Subject: [PATCH] coerce rust_trampoline to a function pointer properly

---
 src/arch/x86/mod.rs    | 2 +-
 src/arch/x86_64/mod.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/arch/x86/mod.rs b/src/arch/x86/mod.rs
index d378872..32b2ccc 100644
--- a/src/arch/x86/mod.rs
+++ b/src/arch/x86/mod.rs
@@ -23,7 +23,7 @@ impl Registers {
     asm!(include_str!("init.s")
           : "={eax}"(sp)
           : "{eax}" (sp),
-            "{ebx}" (rust_trampoline::<F>),
+            "{ebx}" (rust_trampoline::<F> as unsafe extern "C" fn(*const F) -> !),
             "{ecx}" (f_ptr)
           :
           : "volatile");
diff --git a/src/arch/x86_64/mod.rs b/src/arch/x86_64/mod.rs
index 189104a..fefa6cd 100644
--- a/src/arch/x86_64/mod.rs
+++ b/src/arch/x86_64/mod.rs
@@ -22,7 +22,7 @@ impl Registers {
     asm!(include_str!("init.s")
           : "={rdi}"(sp)
           : "{rdi}" (sp),
-            "{rsi}" (rust_trampoline::<F>),
+            "{rsi}" (rust_trampoline::<F> as unsafe extern "C" fn(*const F) -> !),
             "{rdx}" (f_ptr)
           :
           : "volatile");