Skip to content

Rollup of 9 pull requests #98480

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

Closed
wants to merge 34 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
8b1f85c
Windows: Iterative `remove_dir_all`
ChrisDenton Apr 25, 2022
8dc4696
Retry deleting a directory
ChrisDenton Apr 26, 2022
d579665
Yield the thread when waiting to delete a file
ChrisDenton Apr 28, 2022
edb6c4b
Add a test for issue #33172
rylev May 16, 2022
f30c76a
Turn off cdb test for now, link to issue
rylev Jun 20, 2022
3ea686f
Turn CDB test back on and all clarifying test
rylev Jun 20, 2022
e5402e4
Fix linux tests
rylev Jun 21, 2022
1a25ac9
Add comment about issue caused with multiple statics
rylev Jun 21, 2022
6ac6866
Reverse folder hierarchy
eggyal Jun 20, 2022
75203ee
Remove unecessary references to TypeFolder::Error
eggyal Jun 21, 2022
aa91716
add new rval, pull deref early
ouz-a Jun 13, 2022
cc4f804
Move help popup into a pocket menu as well
GuillaumeGomez Jun 20, 2022
3eb9e1a
Add/update GUI tests for help pocket menu
GuillaumeGomez Jun 20, 2022
e4b2b41
Merge all popover hide functions into one
GuillaumeGomez Jun 22, 2022
23d325e
Update FIXME comment
rylev Jun 23, 2022
4c4fb71
add test
b-naber Jun 23, 2022
2e3221a
use correct substs in enum discriminant hack
b-naber Jun 23, 2022
38814fc
small refactor
b-naber Jun 24, 2022
f39c0d6
address review
b-naber Jun 24, 2022
ada2acc
Set relocation_model to Pic on emscripten target
hoodmane Jun 15, 2022
bf48b62
fmt
b-naber Jun 24, 2022
20cea3e
Fix printing impl trait under binders
compiler-errors Jun 22, 2022
e80cced
Use write! instead of p! to avoid having to use weird scoping
compiler-errors Jun 22, 2022
c06d8f9
Fix trait object reborrow suggestion
compiler-errors Jun 20, 2022
25fe474
Note concrete type being coerced into object
compiler-errors Jun 20, 2022
95bd688
Rollup merge of #96412 - ChrisDenton:remove-dir-all, r=thomcc
Dylan-DPC Jun 25, 2022
7070a3f
Rollup merge of #97085 - rylev:test-issue-33172, r=wesleywiser
Dylan-DPC Jun 25, 2022
9a3ac98
Rollup merge of #98145 - ouz-a:some_branch, r=oli-obk
Dylan-DPC Jun 25, 2022
de49639
Rollup merge of #98149 - hoodmane:emscripten-pic, r=petrochenkov
Dylan-DPC Jun 25, 2022
502083d
Rollup merge of #98277 - compiler-errors:issue-93596, r=estebank
Dylan-DPC Jun 25, 2022
2d18932
Rollup merge of #98297 - GuillaumeGomez:help-pocket-menu, r=notriddle
Dylan-DPC Jun 25, 2022
d6d97ca
Rollup merge of #98311 - eggyal:reverse-folder-hierarchy, r=jackh726
Dylan-DPC Jun 25, 2022
d9622a8
Rollup merge of #98371 - compiler-errors:better-opaque-printing, r=ol…
Dylan-DPC Jun 25, 2022
a80dffb
Rollup merge of #98429 - b-naber:use-correct-substs-discriminant-cast…
Dylan-DPC Jun 25, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Set relocation_model to Pic on emscripten target
  • Loading branch information
hoodmane committed Jun 24, 2022
commit ada2accf8e659900c02e1f9a5f4015ae6d68f33e
3 changes: 2 additions & 1 deletion compiler/rustc_target/src/spec/wasm32_unknown_emscripten.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use super::{cvs, wasm_base};
use super::{LinkArgs, LinkerFlavor, PanicStrategy, Target, TargetOptions};
use super::{LinkArgs, LinkerFlavor, PanicStrategy, RelocModel, Target, TargetOptions};

pub fn target() -> Target {
let mut options = wasm_base::options();
Expand All @@ -26,6 +26,7 @@ pub fn target() -> Target {
// functionality, and a .wasm file.
exe_suffix: ".js".into(),
linker: None,
relocation_model: RelocModel::Pic,
panic_strategy: PanicStrategy::Unwind,
no_default_libraries: false,
post_link_args,
Expand Down