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

all: rename i386 to x86 #13101

Merged
merged 2 commits into from Nov 5, 2022
Merged

all: rename i386 to x86 #13101

merged 2 commits into from Nov 5, 2022

Conversation

alichraghi
Copy link
Contributor

@alichraghi alichraghi commented Oct 7, 2022

Closes #4663
not sure what's wrong with Drone CI. that may be a cache issue

lib/std/zig/fmt.zig Outdated Show resolved Hide resolved
lib/std/coff.zig Outdated Show resolved Hide resolved
lib/std/net/url.zig Outdated Show resolved Hide resolved
@Vexu
Copy link
Member

Vexu commented Nov 3, 2022

The CI failure should be fixed by running tools/update_glibc.zig.

@alichraghi
Copy link
Contributor Author

running zig run tools/update_glibc.zig -- lib/libc/glibc/ . didn't change anything

@Vexu
Copy link
Member

Vexu commented Nov 3, 2022

//! This script updates the .c, .h, .s, and .S files that make up the start
//! files such as crt1.o. Not to be confused with
//! https://github.com/ziglang/glibc-abi-tool/ which updates the `abilists`
//! file.

My bad.

@alichraghi
Copy link
Contributor Author

alichraghi commented Nov 3, 2022

still failing but i think it's easy to fix. will try tomorrow
EDIT: sorry didn't read this section

Not to be confused with https://github.com/ziglang/glibc-abi-tool/ which updates the `abilists` file.

@alichraghi
Copy link
Contributor Author

hmm new error is so weird. addIncludePath("test") is there and zig(2|3) translate-c test/behavior/translate_c_macros.h successed

@Vexu
Copy link
Member

Vexu commented Nov 4, 2022

hmm new error is so weird. addIncludePath("test") is there and zig(2|3) translate-c test/behavior/translate_c_macros.h successed

The issue was that it was looking for the wrong include directory which can be fixed by renaming it, but doing so makes me question the correctness of the abilist change.

@alichraghi
Copy link
Contributor Author

CI is green! let's merge this faster because it get conflicts everyday

@andrewrk andrewrk merged commit 1d68045 into ziglang:master Nov 5, 2022
@alichraghi alichraghi deleted the o4 branch November 5, 2022 09:59
jayschwa added a commit to jayschwa/zig that referenced this pull request Nov 6, 2022
PR ziglang#13101 recently renamed the "i386" architecture to "x86", and it
seems the specific CPU model got swept up in that. "x86" is an umbrella
term that describes a family of CPUs, and the "i386" is the oldest
supported model under that umbrella.
kubkon pushed a commit that referenced this pull request Nov 6, 2022
PR #13101 recently renamed the "i386" architecture to "x86", and it
seems the specific CPU model got swept up in that. "x86" is an umbrella
term that describes a family of CPUs, and the "i386" is the oldest
supported model under that umbrella.
link2xt added a commit to deltachat/deltachat-core-rust that referenced this pull request Mar 29, 2023
cargo-zigbuild is replaced with a simple zig-cc wrapper.
cargo-zigbuild still tries to use i386-linux-musl triple,
while in zig 0.11 x86-linux-musl should be used [1].

This also gives us more control over compilation flags used
and prevents changes due to cargo-zigbuild upgrades,
as its version was not pinned.

[1] Merged PR "all: rename i386 to x86 "
    <ziglang/zig#13101>
link2xt added a commit to deltachat/deltachat-core-rust that referenced this pull request Mar 29, 2023
cargo-zigbuild is replaced with a simple zig-cc wrapper.
cargo-zigbuild still tries to use i386-linux-musl triple,
while in zig 0.11 x86-linux-musl should be used [1].

This also gives us more control over compilation flags used
and prevents changes due to cargo-zigbuild upgrades,
as its version was not pinned.

[1] Merged PR "all: rename i386 to x86 "
    <ziglang/zig#13101>
link2xt added a commit to deltachat/deltachat-core-rust that referenced this pull request Mar 29, 2023
cargo-zigbuild is replaced with a simple zig-cc wrapper.
cargo-zigbuild still tries to use i386-linux-musl triple,
while in zig 0.11 x86-linux-musl should be used [1].

This also gives us more control over compilation flags used
and prevents changes due to cargo-zigbuild upgrades,
as its version was not pinned.

[1] Merged PR "all: rename i386 to x86 "
    <ziglang/zig#13101>
link2xt added a commit to deltachat/deltachat-core-rust that referenced this pull request Mar 29, 2023
cargo-zigbuild is replaced with a simple zig-cc wrapper.
cargo-zigbuild still tries to use i386-linux-musl triple,
while in zig 0.11 x86-linux-musl should be used [1].

This also gives us more control over compilation flags used
and prevents changes due to cargo-zigbuild upgrades,
as its version was not pinned.

[1] Merged PR "all: rename i386 to x86 "
    <ziglang/zig#13101>
TUSF pushed a commit to TUSF/zig that referenced this pull request May 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

rename "i386" to "x86"
4 participants