Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove goblin, use object. #2286

Merged
merged 9 commits into from
May 4, 2021
Merged

Remove goblin, use object. #2286

merged 9 commits into from
May 4, 2021

Conversation

nlewycky
Copy link
Contributor

@nlewycky nlewycky commented May 3, 2021

No description provided.

nlewycky added 3 commits May 3, 2021 16:23
Update fuzz/Cargo.toml. For wasm-smith the 'master' git branch was renamed to 'main. Switch to a versioned release since it contains the fixes we need.
}
let kind = match (reloc.kind(), reloc.size()) {
(object::RelocationKind::Absolute, 64) => RelocationKind::Abs8,
(object::RelocationKind::Elf(24), 0) => RelocationKind::X86PCRel8,
Copy link
Member

Choose a reason for hiding this comment

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

Can we have here the proper static variable here instead of 24? (I think the object has defined most of those)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

Copy link
Member

@syrusakbary syrusakbary left a comment

Choose a reason for hiding this comment

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

Could you update the wasmer-object crate so it depends on object 0.24 instead of 0.23 ?

@nlewycky nlewycky force-pushed the feature/llvm-remove-goblin branch from 52c9b1d to 3339b76 Compare May 3, 2021 23:40
@nlewycky
Copy link
Contributor Author

nlewycky commented May 3, 2021

Could you update the wasmer-object crate so it depends on object 0.24 instead of 0.23 ?

Done.

nlewycky added 2 commits May 3, 2021 17:03
There's nothing wrong with 0.24 but we have a dependency on 0.23 through 'backtrace' which is used by wasmer-engine, and we'd like to only have one copy.
@syrusakbary
Copy link
Member

bors r+

@bors
Copy link
Contributor

bors bot commented May 4, 2021

@bors bors bot merged commit 240e5dc into master May 4, 2021
@bors bors bot deleted the feature/llvm-remove-goblin branch May 4, 2021 02:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants