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 4 pull requests #117336

Merged
merged 17 commits into from Oct 29, 2023
Merged

Rollup of 4 pull requests #117336

merged 17 commits into from Oct 29, 2023

Commits on Oct 25, 2023

  1. Add support for i586-unknown-netbsd as target.

    This restricts instructions to those offered by Pentium,
    to support e.g. AMD Geode.
    
    There is already an entry for this target in the NetBSD
    platform support page at
    
      src/doc/rustc/src/platform-support/netbsd.md
    
    ...so this should forestall its removal.
    
    Additional fixes are needed for some vendored modules, this
    is the changes in the rust compiler core itself.
    he32 committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    6642b4b View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2023

  1. rustc_llvm/build.rs: improve comment for NetBSD/i386 targets

    ...explaining why we need -latomic (gcc & g++ built for i486,
    and LLVM insisting on use of 64-bit atomics).
    he32 committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    391b472 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2023

  1. Configuration menu
    Copy the full SHA
    0a82920 View commit details
    Browse the repository at this point in the history
  2. i586_unknown_netbsd.rs: fix formatting.

    This hopefully fixes the CI run after integration of this
    target.
    he32 committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    893e726 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0f04e2d View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2023

  1. i586_unknown_netbsd.rs: drop "-m32" flag insertion to gcc.

    This triggers a consistency check in rust (that all linker flavours
    must have identical arguments), and on NetBSD/i386, the 32-bitness
    is implicitly chosen through the chosen toolchain, and appears to
    not be required.  So drop it, and also drop the imports of the
    now-no-longer-used identifiers.
    he32 committed Oct 28, 2023
    Configuration menu
    Copy the full SHA
    a510288 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d9ddad3 View commit details
    Browse the repository at this point in the history
  3. change default output mode of BootstrapCommand

    Signed-off-by: onur-ozkan <work@onurozkan.dev>
    onur-ozkan committed Oct 28, 2023
    Configuration menu
    Copy the full SHA
    3bb0c94 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f5fa36f View commit details
    Browse the repository at this point in the history
  5. set BootstrapCommand output mode for submodules

    Signed-off-by: onur-ozkan <work@onurozkan.dev>
    onur-ozkan committed Oct 28, 2023
    Configuration menu
    Copy the full SHA
    236f6ba View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    56643ec View commit details
    Browse the repository at this point in the history
  7. Move macros to usage

    Nilstrieb committed Oct 28, 2023
    Configuration menu
    Copy the full SHA
    4dada60 View commit details
    Browse the repository at this point in the history
  8. Remove needless allows

    Nilstrieb committed Oct 28, 2023
    Configuration menu
    Copy the full SHA
    4e2bbfe View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2023

  1. Rollup merge of rust-lang#117170 - he32:netbsd-i586, r=bjorn3

    Add support for i586-unknown-netbsd as target.
    
    This restricts instructions to those offered by Pentium, to support e.g. AMD Geode.
    
    There is already an entry for this target in the NetBSD platform support page at
    
      src/doc/rustc/src/platform-support/netbsd.md
    
    ...so this should forestall its removal.
    
    Additional fixes are needed for some vendored modules, this is the changes in the rust compiler core itself.
    workingjubilee committed Oct 29, 2023
    Configuration menu
    Copy the full SHA
    78b04b5 View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#117259 - dtolnay:macho, r=Nilstrieb

    Declare rustc_target's dependency on object/macho
    
    Without this, `cargo check` fails in crates that depend on rustc_target.
    
    <details>
    <summary>`cargo check` diagnostics</summary>
    
    ```console
        Checking rustc_target v0.0.0
    error[E0433]: failed to resolve: could not find `macho` in `object`
       --> compiler/rustc_target/src/spec/apple_base.rs:176:17
        |
    176 |         object::macho::PLATFORM_MACOS => Some((13, 1)),
        |                 ^^^^^ could not find `macho` in `object`
    
    error[E0433]: failed to resolve: could not find `macho` in `object`
       --> compiler/rustc_target/src/spec/apple_base.rs:177:17
        |
    177 |         object::macho::PLATFORM_IOS
        |                 ^^^^^ could not find `macho` in `object`
    
    error[E0433]: failed to resolve: could not find `macho` in `object`
       --> compiler/rustc_target/src/spec/apple_base.rs:178:19
        |
    178 |         | object::macho::PLATFORM_IOSSIMULATOR
        |                   ^^^^^ could not find `macho` in `object`
    
    error[E0433]: failed to resolve: could not find `macho` in `object`
       --> compiler/rustc_target/src/spec/apple_base.rs:179:19
        |
    179 |         | object::macho::PLATFORM_TVOS
        |                   ^^^^^ could not find `macho` in `object`
    
    error[E0433]: failed to resolve: could not find `macho` in `object`
       --> compiler/rustc_target/src/spec/apple_base.rs:180:19
        |
    180 |         | object::macho::PLATFORM_TVOSSIMULATOR
        |                   ^^^^^ could not find `macho` in `object`
    
    error[E0433]: failed to resolve: could not find `macho` in `object`
       --> compiler/rustc_target/src/spec/apple_base.rs:181:19
        |
    181 |         | object::macho::PLATFORM_MACCATALYST => Some((16, 2)),
        |                   ^^^^^ could not find `macho` in `object`
    
    error[E0433]: failed to resolve: could not find `macho` in `object`
       --> compiler/rustc_target/src/spec/apple_base.rs:182:17
        |
    182 |         object::macho::PLATFORM_WATCHOS | object::macho::PLATFORM_WATCHOSSIMULATOR => Some((9, 1)),
        |                 ^^^^^ could not find `macho` in `object`
    
    error[E0433]: failed to resolve: could not find `macho` in `object`
       --> compiler/rustc_target/src/spec/apple_base.rs:182:51
        |
    182 |         object::macho::PLATFORM_WATCHOS | object::macho::PLATFORM_WATCHOSSIMULATOR => Some((9, 1)),
        |                                                   ^^^^^ could not find `macho` in `object`
    
    error[E0433]: failed to resolve: could not find `macho` in `object`
       --> compiler/rustc_target/src/spec/apple_base.rs:189:33
        |
    189 |         ("macos", _) => object::macho::PLATFORM_MACOS,
        |                                 ^^^^^ could not find `macho` in `object`
    
    error[E0433]: failed to resolve: could not find `macho` in `object`
       --> compiler/rustc_target/src/spec/apple_base.rs:190:38
        |
    190 |         ("ios", "macabi") => object::macho::PLATFORM_MACCATALYST,
        |                                      ^^^^^ could not find `macho` in `object`
    
    error[E0433]: failed to resolve: could not find `macho` in `object`
       --> compiler/rustc_target/src/spec/apple_base.rs:191:35
        |
    191 |         ("ios", "sim") => object::macho::PLATFORM_IOSSIMULATOR,
        |                                   ^^^^^ could not find `macho` in `object`
    
    error[E0433]: failed to resolve: could not find `macho` in `object`
       --> compiler/rustc_target/src/spec/apple_base.rs:192:31
        |
    192 |         ("ios", _) => object::macho::PLATFORM_IOS,
        |                               ^^^^^ could not find `macho` in `object`
    
    error[E0433]: failed to resolve: could not find `macho` in `object`
       --> compiler/rustc_target/src/spec/apple_base.rs:193:39
        |
    193 |         ("watchos", "sim") => object::macho::PLATFORM_WATCHOSSIMULATOR,
        |                                       ^^^^^ could not find `macho` in `object`
    
    error[E0433]: failed to resolve: could not find `macho` in `object`
       --> compiler/rustc_target/src/spec/apple_base.rs:194:35
        |
    194 |         ("watchos", _) => object::macho::PLATFORM_WATCHOS,
        |                                   ^^^^^ could not find `macho` in `object`
    
    error[E0433]: failed to resolve: could not find `macho` in `object`
       --> compiler/rustc_target/src/spec/apple_base.rs:195:36
        |
    195 |         ("tvos", "sim") => object::macho::PLATFORM_TVOSSIMULATOR,
        |                                    ^^^^^ could not find `macho` in `object`
    
    error[E0433]: failed to resolve: could not find `macho` in `object`
       --> compiler/rustc_target/src/spec/apple_base.rs:196:32
        |
    196 |         ("tvos", _) => object::macho::PLATFORM_TVOS,
        |                                ^^^^^ could not find `macho` in `object`
    ```
    </details>
    
    `rustc_target` unconditionally contains its `spec` module (i.e. there is no `#[cfg]` on the `mod spec;`). The `spec/mod.rs` also does not start with `#![cfg]`.
    
    https://github.com/rust-lang/rust/blob/aa91057796695679e95329947d9f497cb5bdc5da/compiler/rustc_target/src/lib.rs#L37
    
    Similarly, the `spec` module unconditionally contains `apple_base`.
    
    https://github.com/rust-lang/rust/blob/aa91057796695679e95329947d9f497cb5bdc5da/compiler/rustc_target/src/spec/mod.rs#L62
    
    And, `apple_base` unconditionally refers to `object::macho`.
    
    https://github.com/rust-lang/rust/blob/aa91057796695679e95329947d9f497cb5bdc5da/compiler/rustc_target/src/spec/apple_base.rs#L176
    
    So I figure there is no way `object::macho` isn't needed by rustc.
    
    `object::macho` only exists if the `object` crate's "macho" feature is enabled. https://github.com/gimli-rs/object/blob/0.32.0/src/lib.rs#L111-L112
    workingjubilee committed Oct 29, 2023
    Configuration menu
    Copy the full SHA
    577f86d View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#117322 - onur-ozkan:fix-suppressed-outputs,…

    … r=Kobzol
    
    change default output mode of `BootstrapCommand`
    
    `SuppressOnSuccess` on `BootstrapCommand` is a problematic default mode as it affects the logs during the bootstrapping (as shown in the screenshot below). The default behavior should be to print everything unless we explicitly modify the behavior within build steps.
    
    ![image](https://github.com/rust-lang/rust/assets/39852038/8dbaaeb2-0656-4ff9-8e48-1ac0734a913f)
    
    Fixes rust-lang#117315
    
    cc `@Kobzol`
    workingjubilee committed Oct 29, 2023
    Configuration menu
    Copy the full SHA
    771b255 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#117325 - Nilstrieb:pretty-macros, r=compile…

    …r-errors
    
    Small ty::print cleanups
    workingjubilee committed Oct 29, 2023
    Configuration menu
    Copy the full SHA
    505bc85 View commit details
    Browse the repository at this point in the history