Merge pull request #48 from rust-lang/feature/more-calling-conv-attributes

More calling conv attributes

Author: antoyo

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gccjit"
-version = "2.5.0"
+version = "2.6.0"
 authors = ["Sean Gillespie <[email protected]>", "Antoni Boucher <[email protected]>"]
 description = "Higher-level Rust bindings for libgccjit."
 keywords = ["compiler", "jit", "gcc"]
@@ -13,7 +13,7 @@ readme = "README.md"
 master = ["gccjit_sys/master"]
 
 [dependencies]
-gccjit_sys = { version = "0.6.0", path = "gccjit_sys" }
+gccjit_sys = { version = "0.7.0", path = "gccjit_sys" }
 
 [package.metadata.docs.rs]
 features = ["master"]

gccjit_sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gccjit_sys"
-version = "0.6.0"
+version = "0.7.0"
 authors = ["Sean Gillespie <[email protected]>", "Antoni Boucher <[email protected]>"]
 #links = "gccjit"
 description = "Raw bindings to libgccjit. Companion to the gccjit crate."

gccjit_sys/src/lib.rs

@@ -276,8 +276,19 @@ pub enum gcc_jit_fn_attribute
     GCC_JIT_FN_ATTRIBUTE_CONST,
     GCC_JIT_FN_ATTRIBUTE_WEAK,
     GCC_JIT_FN_ATTRIBUTE_NONNULL,
-    GCC_JIT_FN_ATTRIBUTE_MS_ABI,
-    GCC_JIT_FN_ATTRIBUTE_SYSV_ABI,
+    GCC_JIT_FN_ATTRIBUTE_ARM_PCS,
+    GCC_JIT_FN_ATTRIBUTE_AVR_INTERRUPT,
+    GCC_JIT_FN_ATTRIBUTE_AVR_NOBLOCK,
+    GCC_JIT_FN_ATTRIBUTE_AVR_SIGNAL,
+    GCC_JIT_FN_ATTRIBUTE_GCN_AMDGPU_HSA_KERNEL,
+    GCC_JIT_FN_ATTRIBUTE_MSP430_INTERRUPT,
+    GCC_JIT_FN_ATTRIBUTE_NVPTX_KERNEL,
+    GCC_JIT_FN_ATTRIBUTE_X86_FAST_CALL,
+    GCC_JIT_FN_ATTRIBUTE_X86_INTERRUPT,
+    GCC_JIT_FN_ATTRIBUTE_X86_MS_ABI,
+    GCC_JIT_FN_ATTRIBUTE_X86_STDCALL,
+    GCC_JIT_FN_ATTRIBUTE_X86_SYSV_ABI,
+    GCC_JIT_FN_ATTRIBUTE_X86_THIS_CALL,
 }
 
 #[cfg(feature="master")]
@@ -289,7 +300,7 @@ pub enum gcc_jit_variable_attribute
 }
 
 #[link(name = "gccjit")]
-extern {
+extern "C" {
     // context operations
     pub fn gcc_jit_context_acquire() -> *mut gcc_jit_context;
     pub fn gcc_jit_context_release(ctx: *mut gcc_jit_context);

src/context.rs

@@ -1180,7 +1180,7 @@ impl<'ctx> Context<'ctx> {
     pub fn set_logfile<S: AsRef<str>>(&self, _logfile: S) {
         use std::os::raw::c_void;
 
-        extern {
+        extern "C" {
             static stderr: *mut c_void;
         }
 

src/function.rs

@@ -60,15 +60,27 @@ pub enum FnAttribute<'a> {
     Const,
     Weak,
     NonNull(Vec<std::ffi::c_int>),
-    MsAbi,
-    SysvAbi,
+    ArmPcs(&'a str),
+    AvrInterrupt,
+    AvrNoblock,
+    AvrSignal,
+    GcnAmdGpuHsaKernel,
+    Msp430Interrupt,
+    NvptxKernel,
+    X86FastCall,
+    X86Interrupt,
+    X86MsAbi,
+    X86Stdcall,
+    X86SysvAbi,
+    X86ThisCall,
 }
 
 #[cfg(feature="master")]
 impl<'a> FnAttribute<'a> {
     fn get_value(&self) -> AttributeValue {
         match *self {
-            FnAttribute::Alias(value) | FnAttribute::Target(value) => AttributeValue::String(value),
+            FnAttribute::Alias(value) | FnAttribute::ArmPcs(value) | FnAttribute::Target(value) =>
+                AttributeValue::String(value),
             FnAttribute::Visibility(visibility) => AttributeValue::String(visibility.as_str()),
             FnAttribute::AlwaysInline
             | FnAttribute::Inline
@@ -79,8 +91,18 @@ impl<'a> FnAttribute<'a> {
             | FnAttribute::Pure
             | FnAttribute::Const
             | FnAttribute::Weak
-            | FnAttribute::MsAbi
-            | FnAttribute::SysvAbi => AttributeValue::None,
+            | FnAttribute::AvrInterrupt
+            | FnAttribute::AvrNoblock
+            | FnAttribute::AvrSignal
+            | FnAttribute::GcnAmdGpuHsaKernel
+            | FnAttribute::Msp430Interrupt
+            | FnAttribute::NvptxKernel
+            | FnAttribute::X86FastCall
+            | FnAttribute::X86Interrupt
+            | FnAttribute::X86MsAbi
+            | FnAttribute::X86Stdcall
+            | FnAttribute::X86SysvAbi
+            | FnAttribute::X86ThisCall => AttributeValue::None,
             FnAttribute::NonNull(ref value) => {
                 debug_assert!(
                     value.iter().all(|attr| *attr > 0),
@@ -106,8 +128,19 @@ impl<'a> FnAttribute<'a> {
             FnAttribute::Const => gccjit_sys::gcc_jit_fn_attribute::GCC_JIT_FN_ATTRIBUTE_CONST,
             FnAttribute::Weak => gccjit_sys::gcc_jit_fn_attribute::GCC_JIT_FN_ATTRIBUTE_WEAK,
             FnAttribute::NonNull(_) => gccjit_sys::gcc_jit_fn_attribute::GCC_JIT_FN_ATTRIBUTE_NONNULL,
-            FnAttribute::MsAbi => gccjit_sys::gcc_jit_fn_attribute::GCC_JIT_FN_ATTRIBUTE_MS_ABI,
-            FnAttribute::SysvAbi => gccjit_sys::gcc_jit_fn_attribute::GCC_JIT_FN_ATTRIBUTE_SYSV_ABI,
+            FnAttribute::ArmPcs(_) => gccjit_sys::gcc_jit_fn_attribute::GCC_JIT_FN_ATTRIBUTE_ARM_PCS,
+            FnAttribute::AvrInterrupt => gccjit_sys::gcc_jit_fn_attribute::GCC_JIT_FN_ATTRIBUTE_AVR_INTERRUPT,
+            FnAttribute::AvrNoblock => gccjit_sys::gcc_jit_fn_attribute::GCC_JIT_FN_ATTRIBUTE_AVR_NOBLOCK,
+            FnAttribute::AvrSignal => gccjit_sys::gcc_jit_fn_attribute::GCC_JIT_FN_ATTRIBUTE_AVR_SIGNAL,
+            FnAttribute::GcnAmdGpuHsaKernel => gccjit_sys::gcc_jit_fn_attribute::GCC_JIT_FN_ATTRIBUTE_GCN_AMDGPU_HSA_KERNEL,
+            FnAttribute::Msp430Interrupt => gccjit_sys::gcc_jit_fn_attribute::GCC_JIT_FN_ATTRIBUTE_MSP430_INTERRUPT,
+            FnAttribute::NvptxKernel => gccjit_sys::gcc_jit_fn_attribute::GCC_JIT_FN_ATTRIBUTE_NVPTX_KERNEL,
+            FnAttribute::X86FastCall => gccjit_sys::gcc_jit_fn_attribute::GCC_JIT_FN_ATTRIBUTE_X86_FAST_CALL,
+            FnAttribute::X86Interrupt => gccjit_sys::gcc_jit_fn_attribute::GCC_JIT_FN_ATTRIBUTE_X86_INTERRUPT,
+            FnAttribute::X86MsAbi => gccjit_sys::gcc_jit_fn_attribute::GCC_JIT_FN_ATTRIBUTE_X86_MS_ABI,
+            FnAttribute::X86Stdcall => gccjit_sys::gcc_jit_fn_attribute::GCC_JIT_FN_ATTRIBUTE_X86_STDCALL,
+            FnAttribute::X86SysvAbi => gccjit_sys::gcc_jit_fn_attribute::GCC_JIT_FN_ATTRIBUTE_X86_SYSV_ABI,
+            FnAttribute::X86ThisCall => gccjit_sys::gcc_jit_fn_attribute::GCC_JIT_FN_ATTRIBUTE_X86_THIS_CALL,
         }
     }
 }