Commit d4080d1
committed
Auto merge of #1975 - skrap:feature/move-uclibc-under-linux, r=JohnTitor
Move uclibc under linux
This is a first cut at moving uclibc under linux, alongside `musl` and `gnu`.
All tests pass on a vexpress a9 running in qemu. I am working on testing the other tier 3 uclibc targets: `mips-unknown-linux-uclibc` and `mipsel-unknown-linux-uclibc`. ~Not having access to these platforms, I am working on getting them running in qemu, but it may take a bit.~
The style check doesn't pass. I would appreciate some direction here. Many of these constants are defined under 2-of-3 out of musl/glibc/uclibc, so I'm not sure whether I should transform:
```rust
#[cfg(not(target_env = "uclibc"))]
pub fn foo();
```
into 2 separate declarations, one each in `musl/mod.rs` and `gnu/mod.rs` or use a `cfg_if` block for each one (which explodes 2 lines into 5).
- [x] Help me choose which fix to use for the items defined in musl and gnu but not uclibc.
It's my guess that exploding into the `cfg_if` block is better for long-term maintainability, but I'd really appreciate opinions from the maintainers.File tree
26 files changed
+905
-3143
lines changed- libc-test
- src/unix
- linux_like
- linux
- gnu
- musl
- uclibc
- arm
- mips
- mips32
- mips64
- x86_64
- uclibc
- x86_64
26 files changed
+905
-3143
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2267 | 2267 | | |
2268 | 2268 | | |
2269 | 2269 | | |
| 2270 | + | |
2270 | 2271 | | |
2271 | 2272 | | |
2272 | 2273 | | |
| |||
2377 | 2378 | | |
2378 | 2379 | | |
2379 | 2380 | | |
2380 | | - | |
| 2381 | + | |
| 2382 | + | |
2381 | 2383 | | |
2382 | 2384 | | |
2383 | 2385 | | |
| |||
2419 | 2421 | | |
2420 | 2422 | | |
2421 | 2423 | | |
2422 | | - | |
2423 | 2424 | | |
| 2425 | + | |
| 2426 | + | |
2424 | 2427 | | |
2425 | 2428 | | |
2426 | 2429 | | |
2427 | 2430 | | |
2428 | 2431 | | |
2429 | 2432 | | |
2430 | 2433 | | |
2431 | | - | |
| 2434 | + | |
| 2435 | + | |
2432 | 2436 | | |
2433 | 2437 | | |
2434 | 2438 | | |
| |||
2651 | 2655 | | |
2652 | 2656 | | |
2653 | 2657 | | |
| 2658 | + | |
| 2659 | + | |
| 2660 | + | |
| 2661 | + | |
| 2662 | + | |
| 2663 | + | |
| 2664 | + | |
| 2665 | + | |
| 2666 | + | |
2654 | 2667 | | |
2655 | 2668 | | |
2656 | 2669 | | |
| |||
2698 | 2711 | | |
2699 | 2712 | | |
2700 | 2713 | | |
| 2714 | + | |
| 2715 | + | |
| 2716 | + | |
| 2717 | + | |
| 2718 | + | |
| 2719 | + | |
| 2720 | + | |
| 2721 | + | |
| 2722 | + | |
| 2723 | + | |
| 2724 | + | |
| 2725 | + | |
| 2726 | + | |
| 2727 | + | |
| 2728 | + | |
| 2729 | + | |
| 2730 | + | |
| 2731 | + | |
| 2732 | + | |
| 2733 | + | |
| 2734 | + | |
| 2735 | + | |
| 2736 | + | |
| 2737 | + | |
| 2738 | + | |
2701 | 2739 | | |
2702 | 2740 | | |
2703 | 2741 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
287 | 287 | | |
288 | 288 | | |
289 | 289 | | |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
290 | 303 | | |
291 | 304 | | |
292 | 305 | | |
| |||
620 | 633 | | |
621 | 634 | | |
622 | 635 | | |
| 636 | + | |
| 637 | + | |
| 638 | + | |
| 639 | + | |
| 640 | + | |
| 641 | + | |
| 642 | + | |
| 643 | + | |
| 644 | + | |
| 645 | + | |
| 646 | + | |
| 647 | + | |
| 648 | + | |
| 649 | + | |
| 650 | + | |
| 651 | + | |
623 | 652 | | |
624 | 653 | | |
625 | 654 | | |
| |||
646 | 675 | | |
647 | 676 | | |
648 | 677 | | |
| 678 | + | |
649 | 679 | | |
650 | 680 | | |
651 | 681 | | |
| |||
857 | 887 | | |
858 | 888 | | |
859 | 889 | | |
860 | | - | |
861 | | - | |
862 | | - | |
863 | | - | |
864 | | - | |
865 | 890 | | |
866 | 891 | | |
867 | 892 | | |
| |||
0 commit comments