Skip to content

Rollup of 7 pull requests #61178

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.

Sign up for GitHub

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 18 commits into from
Closed

Rollup of 7 pull requests #61178

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
e349f8f
Use a PathBuf instead of String for representing the pgo-use path int…
michaelwoerister May 22, 2019
01a59a3
PGO: Check that pgo-use file actually exists. LLVM seems to only emit…
michaelwoerister May 22, 2019
b1f27fa
rustbuild: Also build compiler-rt when building LLDB. This allows cla…
michaelwoerister May 22, 2019
51463d0
Add a smoketest for combining PGO with xLTO.
michaelwoerister May 20, 2019
b3c5cdd
Fix unit test after pgo-use change.
michaelwoerister May 22, 2019
1a35a1c
Ship profiler with windows-gnu
mati865 May 23, 2019
e396f99
Don't arena-allocate static symbols.
nnethercote May 23, 2019
fd19989
Fix spelling in release notes
aristocles-deploy May 25, 2019
72145ea
MaybeUninit doctest: remove unnecessary type ascription
RalfJung May 25, 2019
a5e9d82
Auto-derive Encode and Decode implementations
fabric-and-ink May 25, 2019
d5f7181
Changes the type `mir::Mir` into `mir::Body`
May 17, 2019
4761a82
Rollup merge of #60928 - TheSirC:fix/60229, r=eddyb
Centril May 25, 2019
994fc4d
Rollup merge of #61036 - michaelwoerister:pgo-xlto-test, r=alexcrichton
Centril May 25, 2019
2b82444
Rollup merge of #61077 - nnethercote:tweak-prefill, r=petrochenkov
Centril May 25, 2019
94b29f3
Rollup merge of #61080 - mati865:mingw_pgo, r=sanxiyn
Centril May 25, 2019
f0e8c52
Rollup merge of #61149 - vishalsodani:master, r=Centril
Centril May 25, 2019
7e8fb82
Rollup merge of #61161 - RalfJung:maybe-uninit, r=Centril
Centril May 25, 2019
d19f11d
Rollup merge of #61173 - fabric-and-ink:minor-cleanup, r=varkor
Centril May 25, 2019
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
Ship profiler with windows-gnu
  • Loading branch information
@mati865
mati865 committed May 23, 2019
commit 1a35a1c688511bb09a67c1430d55e022ac5f88eb
4 changes: 2 additions & 2 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ environment:
DEPLOY: 1
- CI_JOB_NAME: dist-i686-mingw
MSYS_BITS: 32
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-full-tools
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-full-tools --enable-profiler
SCRIPT: python x.py dist
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z
Expand All @@ -114,7 +114,7 @@ environment:
- CI_JOB_NAME: dist-x86_64-mingw
MSYS_BITS: 64
SCRIPT: python x.py dist
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-full-tools
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
MINGW_ARCHIVE: x86_64-6.3.0-release-posix-seh-rt_v5-rev2.7z
MINGW_DIR: mingw64
Expand Down
6 changes: 5 additions & 1 deletion src/libprofiler_builtins/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,11 @@ fn main() {
cfg.flag("-fomit-frame-pointer");
cfg.flag("-ffreestanding");
cfg.define("VISIBILITY_HIDDEN", None);
cfg.define("COMPILER_RT_HAS_UNAME", Some("1"));
if !target.contains("windows") {
cfg.define("COMPILER_RT_HAS_UNAME", Some("1"));
} else {
profile_sources.push("WindowsMMap.c");
}
}

// Assume that the Unixes we are building this for have fnctl() available
Expand Down