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

Rollup of 2 pull requests #1961

Merged
merged 7 commits into from
Oct 27, 2020
Merged

Rollup of 2 pull requests #1961

merged 7 commits into from
Oct 27, 2020

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

tesuji and others added 7 commits October 27, 2020 09:59
* Include some header files
* Ingore tests for p_type field of `Elf*_Phdr` because of
  conflicting with p_type macro from resolve.h
Add dl_iterate_phdr to some BSD OSs

Add dl_iterate_phdr for freebsd, openbsd and netbsd: rust-lang#1066
cc rust-lang/backtrace-rs#325
Disable `sparc-unknown-linux-gnu` for now
@JohnTitor
Copy link
Member Author

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Oct 27, 2020

📌 Commit ab7c561 has been approved by JohnTitor

@bors
Copy link
Contributor

bors commented Oct 27, 2020

⌛ Testing commit ab7c561 with merge 3df6ed4...

bors added a commit that referenced this pull request Oct 27, 2020
Rollup of 2 pull requests

Successful merges:

 - #1953 (Add dl_iterate_phdr to some BSD OSs)
 - #1960 (Disable `sparc-unknown-linux-gnu` for now)

Failed merges:

r? `@ghost`
@bors
Copy link
Contributor

bors commented Oct 27, 2020

💔 Test failed - checks-actions

@JohnTitor
Copy link
Member Author

@bors retry

@bors
Copy link
Contributor

bors commented Oct 27, 2020

⌛ Testing commit ab7c561 with merge ebefd7b...

@bors
Copy link
Contributor

bors commented Oct 27, 2020

☀️ Test successful - checks-actions, checks-cirrus-freebsd-11, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13
Approved by: JohnTitor
Pushing ebefd7b to master...

@bors bors merged commit ebefd7b into rust-lang:master Oct 27, 2020
@JohnTitor JohnTitor deleted the rollup-kddq6xl branch October 27, 2020 14:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants