diff options
| -rw-r--r-- | src/ir/context.rs | 22 | ||||
| -rw-r--r-- | src/ir/function.rs | 10 | ||||
| -rw-r--r-- | tests/expectations/tests/mangling-win32.rs | 9 | ||||
| -rw-r--r-- | tests/headers/mangling-win32.h | 3 |
4 files changed, 29 insertions, 15 deletions
diff --git a/src/ir/context.rs b/src/ir/context.rs index a70425c7..a5ae1962 100644 --- a/src/ir/context.rs +++ b/src/ir/context.rs @@ -139,9 +139,6 @@ pub struct BindgenContext<'ctx> { /// The active replacements collected from replaces="xxx" annotations. replacements: HashMap<Vec<String>, ItemId>, - /// The target string bindgen was able to deduce from the input. - effective_target: String, - collected_typerefs: bool, /// Dummy structures for code generation. @@ -168,6 +165,9 @@ pub struct BindgenContext<'ctx> { /// The set of `TypeKind::Comp` items found during parsing that need their /// bitfield allocation units computed. Drained in `compute_bitfield_units`. need_bitfield_allocation: Vec<ItemId>, + + /// Whether we need the mangling hack which removes the prefixing underscore. + needs_mangling_hack: bool, } /// A traversal of whitelisted items. @@ -261,6 +261,16 @@ impl<'ctx> BindgenContext<'ctx> { effective_target = Some(HOST_TARGET.to_owned()); } + // Mac os and Win32 need __ for mangled symbols but rust will automatically + // prepend the extra _. + // + // We need to make sure that we don't include __ because rust will turn into + // ___. + let effective_target = effective_target.unwrap(); + let needs_mangling_hack = + effective_target.contains("darwin") || + effective_target == "i686-pc-win32"; + let root_module = Self::build_root_module(ItemId(0)); let mut me = BindgenContext { items: Default::default(), @@ -273,7 +283,6 @@ impl<'ctx> BindgenContext<'ctx> { currently_parsed_types: vec![], parsed_macros: Default::default(), replacements: Default::default(), - effective_target: effective_target.unwrap(), collected_typerefs: false, gen_ctx: None, span: DUMMY_SP, @@ -283,6 +292,7 @@ impl<'ctx> BindgenContext<'ctx> { generated_bindegen_complex: Cell::new(false), used_template_parameters: None, need_bitfield_allocation: Default::default(), + needs_mangling_hack: needs_mangling_hack, }; me.add_item(root_module, None, None); @@ -795,8 +805,8 @@ impl<'ctx> BindgenContext<'ctx> { } /// Returns the target triple bindgen is running over. - pub fn target(&self) -> &str { - &self.effective_target + pub fn needs_mangling_hack(&self) -> bool { + self.needs_mangling_hack } /// Get the root module. diff --git a/src/ir/function.rs b/src/ir/function.rs index c432a4b2..9865997d 100644 --- a/src/ir/function.rs +++ b/src/ir/function.rs @@ -128,16 +128,8 @@ fn get_abi(cc: CXCallingConv) -> Abi { }) } -// Mac os and Win32 need __ for mangled symbols but rust will automatically -// prepend the extra _. -// -// We need to make sure that we don't include __ because rust will turn into -// ___. fn mangling_hack_if_needed(ctx: &BindgenContext, symbol: &mut String) { - // NB: win64 also contains the substring "win32" in the target triple, so - // we need to actually check for i686... - if ctx.target().contains("darwin") || - (ctx.target().contains("i686") && ctx.target().contains("windows")) { + if ctx.needs_mangling_hack() { symbol.remove(0); } } diff --git a/tests/expectations/tests/mangling-win32.rs b/tests/expectations/tests/mangling-win32.rs new file mode 100644 index 00000000..87df5e4a --- /dev/null +++ b/tests/expectations/tests/mangling-win32.rs @@ -0,0 +1,9 @@ +/* automatically generated by rust-bindgen */ + + +#![allow(dead_code, non_snake_case, non_camel_case_types, non_upper_case_globals)] + + +extern "C" { + pub fn foo(); +} diff --git a/tests/headers/mangling-win32.h b/tests/headers/mangling-win32.h new file mode 100644 index 00000000..897aeb42 --- /dev/null +++ b/tests/headers/mangling-win32.h @@ -0,0 +1,3 @@ +// bindgen-flags: -- --target=i686-pc-win32 + +void foo(); |