Skip to content

Commit

Permalink
Fix libunwind build: Define __LITTLE_ENDIAN__ for LE targets
Browse files Browse the repository at this point in the history
If __LITTLE_ENDIAN__ is missing, libunwind assumes big endian
and reads unwinding instructions wrong on ARM EHABI.

Fix #65765
  • Loading branch information
Vojtech Kral authored and vojtechkral committed Oct 30, 2019
1 parent c553e8e commit e9e4836
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/libunwind/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,18 @@ mod llvm_libunwind {
pub fn compile() {
let target_env = env::var("CARGO_CFG_TARGET_ENV").unwrap();
let target_vendor = env::var("CARGO_CFG_TARGET_VENDOR").unwrap();
let target_endian_little = env::var("CARGO_CFG_TARGET_ENDIAN").unwrap() != "big";
let cfg = &mut cc::Build::new();

cfg.cpp(true);
cfg.cpp_set_stdlib(None);
cfg.warnings(false);

// libunwind expects a __LITTLE_ENDIAN__ macro to be set for LE archs, cf. #65765
if target_endian_little {
cfg.define("__LITTLE_ENDIAN__", Some("1"));
}

if target_env == "msvc" {
// Don't pull in extra libraries on MSVC
cfg.flag("/Zl");
Expand Down

0 comments on commit e9e4836

Please sign in to comment.