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

Re-add accept4 for Android on 32 bit ARM. #2102

Merged
merged 1 commit into from Mar 5, 2021

Conversation

de-vri-es
Copy link
Contributor

@de-vri-es de-vri-es commented Mar 5, 2021

accept4 was accidentally removed from 32 bit Android targets except for x86 in #2079. This PR adds it back using the same definition as other non-x86 platforms.

Fixes #2101

@rust-highfive
Copy link

r? @JohnTitor

(rust-highfive has picked a reviewer for you, use r? to override)

@JohnTitor
Copy link
Member

Thanks for the quick fix!

@bors r+

@bors
Copy link
Contributor

bors commented Mar 5, 2021

📌 Commit b98d529 has been approved by JohnTitor

@bors
Copy link
Contributor

bors commented Mar 5, 2021

⌛ Testing commit b98d529 with merge 990afbb...

@bors
Copy link
Contributor

bors commented Mar 5, 2021

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

bors bot added a commit to codyps/rust-libzfs that referenced this pull request Mar 14, 2021
50: Bump libc from 0.2.81 to 0.2.88 r=jmesmon a=dependabot[bot]

Bumps [libc](https://github.com/rust-lang/libc) from 0.2.81 to 0.2.88.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/rust-lang/libc/releases">libc's releases</a>.</em></p>
<blockquote>
<h2>0.2.88</h2>
<p>Bump patch version to 0.2.88.</p>
<h2>0.2.87</h2>
<p>Bump patch version to 0.2.87.</p>
<h2>0.2.86</h2>
<p>Bump patch version to 0.2.86.</p>
<h2>0.2.82</h2>
<p>Bump patch version to 0.2.82.</p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/rust-lang/libc/commit/fc51a0f327ba148ffc1e6a11b7448f649b80608a"><code>fc51a0f</code></a> Auto merge of <a href="https://github.com/rust-lang/libc/issues/2103">#2103</a> - JohnTitor:version-bump, r=JohnTitor</li>
<li><a href="https://github.com/rust-lang/libc/commit/9abcbd15de9f281feea0a419e833958623a664f0"><code>9abcbd1</code></a> Bump up libc version to 0.2.88</li>
<li><a href="https://github.com/rust-lang/libc/commit/990afbb5adf9d6fd8d81202c7613f422ee61cf45"><code>990afbb</code></a> Auto merge of <a href="https://github.com/rust-lang/libc/issues/2102">#2102</a> - de-vri-es:linux-arm32-accept4, r=JohnTitor</li>
<li><a href="https://github.com/rust-lang/libc/commit/b98d5292b8cfe96213503997d9cd1f3f49bfce40"><code>b98d529</code></a> Re-add accept4 for Android on 32 bit ARM.</li>
<li><a href="https://github.com/rust-lang/libc/commit/3a7135f491b8faac564c13e7d0c5fd6b10e03855"><code>3a7135f</code></a> Auto merge of <a href="https://github.com/rust-lang/libc/issues/2100">#2100</a> - TheDoctor314:gettid, r=JohnTitor</li>
<li><a href="https://github.com/rust-lang/libc/commit/b719be41508f18b7abd7b521b7f555773c02d1fe"><code>b719be4</code></a> Skip tests for <code>gettid</code> on musl</li>
<li><a href="https://github.com/rust-lang/libc/commit/2de2cb74c82cde76a6b75ade8cf7e539052c7e2b"><code>2de2cb7</code></a> Add gettid() for Linux and Android</li>
<li><a href="https://github.com/rust-lang/libc/commit/ec86e5fb3258a844ece771d2c6f0fbf152086eab"><code>ec86e5f</code></a> Auto merge of <a href="https://github.com/rust-lang/libc/issues/2097">#2097</a> - cmusser:topic/dfly-waitid, r=JohnTitor</li>
<li><a href="https://github.com/rust-lang/libc/commit/c334f98ad97fdaa28f431b0c439686eef1048f3f"><code>c334f98</code></a> dragonflybsd: expose waitid() prototype + related constants</li>
<li><a href="https://github.com/rust-lang/libc/commit/6b1e6a2a72488481034fc2e1b409f379f96fd8f1"><code>6b1e6a2</code></a> Auto merge of <a href="https://github.com/rust-lang/libc/issues/2099">#2099</a> - JohnTitor:fix-doc-links, r=JohnTitor</li>
<li>Additional commits viewable in <a href="https://github.com/rust-lang/libc/compare/0.2.81...0.2.88">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=libc&package-manager=cargo&previous-version=0.2.81&new-version=0.2.88)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

You can trigger a rebase of this PR by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)



Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@de-vri-es de-vri-es deleted the linux-arm32-accept4 branch June 17, 2021 13:30
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.

Regression: missing accept4(2) in 0.2.87 for arm-linux-androideabi target
4 participants