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.

Sign up for GitHub

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

x86 fix + GHA CI #962

Merged
merged 2 commits into from
Jan 3, 2024
Merged

x86 fix + GHA CI #962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b883896
ci: enable x86 tests
no92 Aug 14, 2023
52590bd
options/posix: revert useconds_t downsizing on 64-bit architectures
no92 Jan 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
build-mlibc:
strategy:
matrix:
arch: [x86_64, riscv64, aarch64]
arch: [x86_64, riscv64, aarch64, x86]
builds: [mlibc, mlibc-static, mlibc-shared, mlibc-ansi-only, mlibc-headers-only]
name: Build mlibc
runs-on: ubuntu-22.04
Expand Down
10 changes: 10 additions & 0 deletions ci/linux-x86.cross-file
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[binaries]
c = 'i686-linux-mlibc-gcc'
cpp = 'i686-linux-mlibc-g++'
exe_wrapper = 'qemu-i386'

[host_machine]
system = 'linux'
cpu_family = 'x86'
cpu = 'i386'
endian = 'little'
6 changes: 5 additions & 1 deletion options/posix/include/unistd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,11 @@ extern int optopt;
#endif /* !__MLIBC_ABI_ONLY */

// Non-POSIX functions supported by Linux.
typedef unsigned useconds_t;
#if UINTPTR_MAX == UINT64_MAX
typedef __mlibc_uint64 useconds_t;
#else
typedef __mlibc_uint32 useconds_t;
#endif

#ifndef __MLIBC_ABI_ONLY

Expand Down
Loading