Skip to content
This repository has been archived by the owner on Jul 6, 2019. It is now read-only.

Update for rust 1.10.0-nightly #374

Merged
merged 4 commits into from
May 16, 2016
Merged

Update for rust 1.10.0-nightly #374

merged 4 commits into from
May 16, 2016

Conversation

agalakhov
Copy link
Contributor

This fixes platformtree!, ioreg! and lang items.

farcaller
farcaller reviewed May 13, 2016
View reviewed changes
src/util/lang_items.rs
@@ -17,18 +17,10 @@
use core::fmt::Arguments;

#[cfg(all(not(test), not(feature = "test")))]
#[lang="stack_exhausted"]
extern fn stack_exhausted() {}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this lang item just gone now?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, removed from rust by commit 7a3fdfbf "remove morestack support"

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the reference.

@coveralls
Copy link

coveralls commented May 13, 2016 •
edited
Loading

Coverage Status

Changes Unknown when pulling e074f5e on agalakhov:master into * on hackndev:master*.

@farcaller
Copy link
Member

farcaller commented May 13, 2016 •
edited
Loading 

rustc: /buildslave/rust-buildbot/slave/nightly-dist-rustc-linux/build/src/llvm/lib/CodeGen/MachineFunction.cpp:108: llvm::MachineFunction::MachineFunction(const llvm::Function*, const llvm::TargetMachine&, unsigned int, llvm::MachineModuleInfo&): Assertion `TM.isCompatibleDataLayout(getDataLayout()) && "Can't create a MachineFunction using a Module with a " "Target-incompatible DataLayout attached\n"' failed.

wow, llvm assert, haven't seen those in a while.

@farcaller
Copy link
Member

A great work overall, much appreciated. I'm tempted to wait a day until a new nightly to see if a fresh build will solve the llvm issue and report it upstream otherwise.

@agalakhov
Copy link
Contributor Author

Thank you. I believe the LLVM issue could be solved by editing the data-layout in json. Looks like that this line is not needed anymore (but I'm not really sure).

@jmagnuson
Copy link

data-layout recently became mandatory again, as discussed in rust-lang/rust#31367. I was able to successfully compile @agalakhov's branch using the layout seen here (for thumbv7em anyway).

@agalakhov
Disable 1, 8 and 16-bit int on thumbv7
f5a3a0d 
This is a workaround against LLVM Assertion. Looks like it'a a bug
since Cortex-M3 and Cortex-M4 do support unaligned access.
@coveralls
Copy link

coveralls commented May 16, 2016 •
edited
Loading

Coverage Status

Changes Unknown when pulling f5a3a0d on agalakhov:master into * on hackndev:master*.

@agalakhov
Copy link
Contributor Author

Made a fix against LLVM assets. Not perfect, but now it at least works.

@farcaller
Copy link
Member

Thanks for your contributions!

@farcaller farcaller merged commit 45123e4 into hackndev:master May 16, 2016
@gyscos gyscos mentioned this pull request May 25, 2016
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@agalakhov @coveralls @farcaller @jmagnuson