Add support for FreeBSD CURRENT (aka freebsd13) #1440

pizzamig · 2019-07-21T16:12:24Z

Using the last FreeBSD-CURRENT (development snapshot) the libc build, but tests fail.
This patch detects and supports FreeBSD CURRENT as freebsd13, and reworks the conditional compilation to use the freebsd11 attribute instead of not(freebsd12)
For now, freebsd13 is reusing all freebsd12 definitions, except for ELAST
While here, add a new errnointroduced in freebsd13

Currently, libc supports and detects freebsd11 and freebsd13 Unknown versions, like freebsd13, is treated as freebsd11. This patch solve the issues, detecting freebsd13 and treating it like freebsd12. Inverting the logic not(freebsd12) -> freebsd11 where possible

rust-highfive · 2019-07-21T16:12:27Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @gnzlbg (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

gnzlbg · 2019-07-23T12:15:15Z

So this LGTM, @asomers what do you think?

asomers

The basic change looks good, as in it should allow libc-test to pass on FreeBSD 13. But it doesn't fix the greater underlying problem that libc still can't support multiple versions of FreeBSD, because cross compiles don't know which version to target.

ELAST should not be exported at all, because it's not forward-compatible. Programs that use ELAST won't be able to run correctly on newer versions of FreeBSD. The very few programs that need something like it should use the runtime constant sys_nerr instead.

Are you planning to add new symbols from FreeBSD 13? If so, funlinkat, CNO_RTSDTR, EINTEGRITY, O_BENEATH, AT_BENEATH, FD_NONE, FIOBMAP2, PT_GET_SC_RET should probably all be added.

pizzamig · 2019-07-23T15:55:46Z

This patch has the only goal to allow me to have a libc up and running on FreeBSD 13 and I thought it was a good way to start contributing to this crate.
My following goal is to make cpuset_{get|set}affinity() functions usable from Rust.
However I'm willing to help to improve FreeBSD support in general.

ELAST was already there and I see it changed because of EINTEGRITY (already added with this patch). In general I agree to remove it, but I'm not sure that it can be easily done without breaking the crate retro-compatibility (removing is considered a breaking change)

I can work to add the other FreeBSD13 symbols in a later patch.

For the cross-compile problem, I've not a clear idea of how that could be solved. Maybe adding a feature to the crate, managed by build.rs, to generate appropriate rustc-cfg, with default to freebsd11 ?

Disable testing that thumbv6m-none-eabi builds properly

Update wasmtime to the latest master. The previous wasmtime revision is broken because one of its dependencies, `memoffset` 0.3, was yanked, which appears to make it unavailable. This was fixed by downgrading to `memoffset` 0.2.

@jackpot51

Increase Redox & Relibc support - Add a lot of constants from relibc - Fix the timezone not found error found previously on Redox - Wrap WIFEXITED _et al._ in an unsafe block to match the rest of the API - Add support for the extra_traits feature and Redox - Fmt cc @jackpot51

gnzlbg · 2019-07-27T09:25:18Z

@bors: r+

I think that, as long as freebsd11 and 12 are not broken, if this works for you, it is ok to merge. We should try setting up at least a build job for freebsd 13 to check that things don't stop building, but that can be done later (should be the next step though). At some point once there are freebsd 13 images available on cirrus-ci, we can start running the tests there.

bors · 2019-07-27T09:25:20Z

📌 Commit 72aa226 has been approved by gnzlbg

bors · 2019-07-27T10:24:10Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout invert-freebsd12 (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self invert-freebsd12 --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging src/unix/mod.rs
CONFLICT (content): Merge conflict in src/unix/mod.rs
Automatic merge failed; fix conflicts and then commit the result.

bors · 2019-07-27T10:25:01Z

☔ The latest upstream changes (presumably #1438) made this pull request unmergeable. Please resolve the merge conflicts.

gnzlbg · 2019-07-27T10:53:51Z

This needs to be rebased

Add support for hexagon-unknown-linux-musl

Currently, libc supports and detects freebsd11 and freebsd13 Unknown versions, like freebsd13, is treated as freebsd11. This patch solve the issues, detecting freebsd13 and treating it like freebsd12. Inverting the logic not(freebsd12) -> freebsd11 where possible

gnzlbg · 2019-07-29T13:00:25Z

It appears that some ctest dependency is now failing to build on cirrus ci for some reason.

pizzamig · 2019-07-29T15:22:27Z

I ran some tests and it seems that the extprim crate is broken using nightly

gnzlbg · 2019-07-29T15:40:03Z

Which dependency is pulling it? Maybe we can just remove that dependency somehow (this would be a ctest issue), it is weird that it only triggers on freebsd12 cirrus build job.

pizzamig · 2019-07-29T15:48:22Z

extprim is needed by syntex_syntax2 that's needed by ctest.
Theoretically, extprim is not needed anymore, because rust 1.16 provides u128 and i128

The error is of this form:

error: `X...` range patterns are not supported
   --> /root/.cargo/registry/src/github.com-1ecc6299db9ec823/extprim-1.7.0/src/traits.rs:94:21
    |
94  |                     1 ... $e => u128::new(mantissa) << exp,
    |                     ^^^^^ help: try using the maximum value for the type: `1...MAX`
...
117 | impl_to_extra_primitive_for_float!(f32, 23, 104, 103);
    | ------------------------------------------------------ in this macro invocation

error: expected one of `=>`, `if`, or `|`, found `104`
   --> /root/.cargo/registry/src/github.com-1ecc6299db9ec823/extprim-1.7.0/src/traits.rs:94:27
    |
94  |                     1 ... $e => u128::new(mantissa) << exp,
    |                           ^^ expected one of `=>`, `if`, or `|` here
...
117 | impl_to_extra_primitive_for_float!(f32, 23, 104, 103);
    | ------------------------------------------------------ in this macro invocation

and it seems something related to macro, the $e is not recognized as upper limit.

gnzlbg · 2019-07-29T15:52:52Z

So syntex_syntax2 requires extprim 1.0, https://github.com/gnzlbg/syntex/blob/master/syntex_syntax/Cargo.toml#L15

gnzlbg · 2019-07-29T15:53:27Z

I suppose we could patch that to a extprim = "=1.0" to fix it, or maybe extprim 1.6 did not have this issue ?

pizzamig · 2019-07-29T16:24:06Z

1.0 and 1.6 fails to build, they all have the same macro...

pizzamig · 2019-08-02T16:52:42Z

Is there something I can do to fix it?

gnzlbg · 2019-08-03T08:20:32Z

@bors: r+

bors · 2019-08-03T08:20:33Z

💡 This pull request was already approved, no need to approve it again.

This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.

bors · 2019-08-03T08:20:33Z

📌 Commit a3681f9 has been approved by gnzlbg

bors · 2019-08-03T08:20:42Z

⌛ Testing commit a3681f9 with merge 7e4dfb8...

Add support for FreeBSD CURRENT (aka freebsd13) Using the last FreeBSD-CURRENT (development snapshot) the libc build, but tests fail. This patch detects and supports FreeBSD CURRENT as freebsd13, and reworks the conditional compilation to use the `freebsd11` attribute instead of `not(freebsd12)` For now, freebsd13 is reusing all freebsd12 definitions, except for `ELAST` While here, add a new `errno`introduced in freebsd13

bors · 2019-08-03T08:41:37Z

💔 Test failed - status-appveyor

gnzlbg · 2019-08-09T08:21:07Z

@bors: retry

mati865 · 2019-08-09T09:01:37Z

Isn't git history a bit messed up here?

bors · 2019-08-09T09:43:12Z

⌛ Testing commit a3681f9 with merge 933b7db...

Add support for FreeBSD CURRENT (aka freebsd13) Using the last FreeBSD-CURRENT (development snapshot) the libc build, but tests fail. This patch detects and supports FreeBSD CURRENT as freebsd13, and reworks the conditional compilation to use the `freebsd11` attribute instead of `not(freebsd12)` For now, freebsd13 is reusing all freebsd12 definitions, except for `ELAST` While here, add a new `errno`introduced in freebsd13

bors · 2019-08-09T10:28:41Z

💔 Test failed - status-azure

gnzlbg · 2019-08-10T15:26:33Z

@bors: r+

bors · 2019-08-10T15:26:34Z

📌 Commit 154e58d has been approved by gnzlbg

bors · 2019-08-10T16:38:51Z

⌛ Testing commit 154e58d with merge 245b0f8...

Add support for FreeBSD CURRENT (aka freebsd13) Using the last FreeBSD-CURRENT (development snapshot) the libc build, but tests fail. This patch detects and supports FreeBSD CURRENT as freebsd13, and reworks the conditional compilation to use the `freebsd11` attribute instead of `not(freebsd12)` For now, freebsd13 is reusing all freebsd12 definitions, except for `ELAST` While here, add a new `errno`introduced in freebsd13

bors · 2019-08-10T17:58:11Z

☀️ Test successful - checks-cirrus-freebsd-11, checks-cirrus-freebsd-12, status-azure
Approved by: gnzlbg
Pushing 245b0f8 to master...

Fix FreeBSD #1440 broke FreeBSD by changing `libc` FreeBSD targets to require a `cfg(freebsdXX)` to be defined, but not updating `build.rs` to define `freebsd11` when `LIBC_CI` is not available. Since `LIBC_CI` is always defined on CI, this issue went undetected. This PR fixes that issue in the `build.rs` and introduces a build task that tests FreeBSD without `LIBC_CI` on FreeBSD11, although I'm not sure this would have caught the issue in #1466 . Closes #1466 .

AdminXVII and others added 8 commits July 15, 2019 08:21

Add support for redox compilation with extra traits flag + fmt

fd5eb3d

Add constants and types

e6671e3

Style

0af8f18

Remove some unsupported methods

0da26d4

Style

f6c0ead

Add EINTEGRITY errno and fix style

c2c62cc

Properly define freebsd11 attribute

72aa226

rust-highfive assigned gnzlbg Jul 21, 2019

asomers suggested changes Jul 23, 2019

View reviewed changes

sunfishcode and others added 3 commits July 23, 2019 12:53

Update wasmtime to the latest master.

e21be8c

Disable testing that thumbv6m-none-eabi builds properly

98dc609

Auto merge of rust-lang#1442 - gnzlbg:fix_ci2, r=gnzlbg

737b7d6

Disable testing that thumbv6m-none-eabi builds properly

gnzlbg closed this Jul 26, 2019

gnzlbg reopened this Jul 26, 2019

AdminXVII and others added 4 commits July 26, 2019 13:32

Don't forget the cfg_attr

4d4a423

Add support for hexagon-unknown-linux-musl

214d32d

bors and others added 3 commits July 27, 2019 11:51

Auto merge of rust-lang#1443 - androm3da:hexagon_27jul_2019, r=gnzlbg

2b01f7e

Add support for hexagon-unknown-linux-musl

Add EINTEGRITY errno and fix style

bde8b84

bors mentioned this pull request Aug 3, 2019

MinGW: also copy libmingwex.a from C toolchain #1454

Closed

Fix format

154e58d

bors merged commit 154e58d into rust-lang:master Aug 10, 2019

semarie mentioned this pull request Aug 14, 2019

0.2.61 regression #1466

Closed

gnzlbg mentioned this pull request Aug 14, 2019

Fix FreeBSD #1467

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for FreeBSD CURRENT (aka freebsd13) #1440

Add support for FreeBSD CURRENT (aka freebsd13) #1440

pizzamig commented Jul 21, 2019

rust-highfive commented Jul 21, 2019

gnzlbg commented Jul 23, 2019

asomers left a comment

pizzamig commented Jul 23, 2019

gnzlbg commented Jul 27, 2019

bors commented Jul 27, 2019

bors commented Jul 27, 2019

bors commented Jul 27, 2019

gnzlbg commented Jul 27, 2019

gnzlbg commented Jul 29, 2019

pizzamig commented Jul 29, 2019

gnzlbg commented Jul 29, 2019

pizzamig commented Jul 29, 2019

gnzlbg commented Jul 29, 2019

gnzlbg commented Jul 29, 2019

pizzamig commented Jul 29, 2019

pizzamig commented Aug 2, 2019

gnzlbg commented Aug 3, 2019

bors commented Aug 3, 2019

bors commented Aug 3, 2019

bors commented Aug 3, 2019

bors commented Aug 3, 2019

gnzlbg commented Aug 9, 2019

mati865 commented Aug 9, 2019

bors commented Aug 9, 2019

bors commented Aug 9, 2019

gnzlbg commented Aug 10, 2019

bors commented Aug 10, 2019

bors commented Aug 10, 2019

bors commented Aug 10, 2019

Add support for FreeBSD CURRENT (aka freebsd13) #1440

Add support for FreeBSD CURRENT (aka freebsd13) #1440

Conversation

pizzamig commented Jul 21, 2019

rust-highfive commented Jul 21, 2019

gnzlbg commented Jul 23, 2019

asomers left a comment

Choose a reason for hiding this comment

pizzamig commented Jul 23, 2019

gnzlbg commented Jul 27, 2019

bors commented Jul 27, 2019

bors commented Jul 27, 2019

bors commented Jul 27, 2019

gnzlbg commented Jul 27, 2019

gnzlbg commented Jul 29, 2019

pizzamig commented Jul 29, 2019

gnzlbg commented Jul 29, 2019

pizzamig commented Jul 29, 2019

gnzlbg commented Jul 29, 2019

gnzlbg commented Jul 29, 2019

pizzamig commented Jul 29, 2019

pizzamig commented Aug 2, 2019

gnzlbg commented Aug 3, 2019

bors commented Aug 3, 2019

bors commented Aug 3, 2019

bors commented Aug 3, 2019

bors commented Aug 3, 2019

gnzlbg commented Aug 9, 2019

mati865 commented Aug 9, 2019

bors commented Aug 9, 2019

bors commented Aug 9, 2019

gnzlbg commented Aug 10, 2019

bors commented Aug 10, 2019

bors commented Aug 10, 2019

bors commented Aug 10, 2019