Merge pull request #45 from rust-lang/feature/fn-abis

Add MsAbi and SysvAbi function attributes

Author: antoyo

Cargo.toml

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

gccjit_sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gccjit_sys"
-version = "0.5.0"
+version = "0.6.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,6 +276,8 @@ 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,
 }
 
 #[cfg(feature="master")]

src/function.rs

@@ -60,6 +60,8 @@ pub enum FnAttribute<'a> {
     Const,
     Weak,
     NonNull(Vec<std::ffi::c_int>),
+    MsAbi,
+    SysvAbi,
 }
 
 #[cfg(feature="master")]
@@ -76,7 +78,9 @@ impl<'a> FnAttribute<'a> {
             | FnAttribute::ReturnsTwice
             | FnAttribute::Pure
             | FnAttribute::Const
-            | FnAttribute::Weak => AttributeValue::None,
+            | FnAttribute::Weak
+            | FnAttribute::MsAbi
+            | FnAttribute::SysvAbi => AttributeValue::None,
             FnAttribute::NonNull(ref value) => {
                 debug_assert!(
                     value.iter().all(|attr| *attr > 0),
@@ -102,6 +106,8 @@ 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,
         }
     }
 }