Skip to content

Update submodule for Windows Aarch64 #31

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

Merged
merged 6 commits into from
Apr 30, 2025
Merged

Update submodule for Windows Aarch64 #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5f1cdf0
Update submodule and include tests for Windows Aarch64
MarijnS95 Apr 22, 2025
eea6687
remove test
maxded Apr 30, 2025
245f9da
old cross
maxded Apr 30, 2025
fdadfe0
Merge branch 'main' into aarch64
maxded Apr 30, 2025
8bb34ad
fix
maxded Apr 30, 2025
cc15ec1
fix
maxded Apr 30, 2025
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
46 changes: 21 additions & 25 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,52 +45,46 @@ jobs:
fail-fast: false
matrix:
include:
- target: x86_64-unknown-linux-gnu
os: ubuntu-latest
name: Linux
- os: ubuntu-latest
name: Linux AMD64
target: x86_64-unknown-linux-gnu
cross: false
test: true

- target: x86_64-apple-darwin
os: macos-latest
- os: macos-latest
name: macOS
target: x86_64-apple-darwin
cross: false
test: true

- os: windows-latest
name: Windows
name: Windows AMD64
target: x86_64-pc-windows-msvc
cross: false
test: true

# Disabled because u_int is undefined in freebsd headers
# - os: ubuntu-latest
# name: FreeBSD
# target: x86_64-unknown-freebsd
# cross: true
# test: false

- target: aarch64-linux-android
os: ubuntu-latest
name: Android
cross: true
test: true

- target: aarch64-apple-darwin
os: macos-latest
- os: macos-latest
name: macOS
target: aarch64-apple-darwin
cross: false
test: true

# - os: ubuntu-latest
# name: OpenWrt
# target: aarch64-unknown-linux-gnu
# cross: true
# test: true
# cargo_args: --features "openwrt"
- os: ubuntu-latest
name: Android
target: aarch64-linux-android
cross: true
test: true

# - target: armv7-unknown-linux-gnueabihf
# os: ubuntu-latest
# - os: ubuntu-latest
# name: Linux ARMv7
# target: armv7-unknown-linux-gnueabihf
# cross: true
# test: true

Expand All @@ -110,15 +104,17 @@ jobs:
if: ${{ matrix.cross }}

- name: Build
run: ${{ env.PROGRAM }} build --target=${{ matrix.target }} ${{ matrix.cargo_args }}
run: ${{ env.PROGRAM }} build --target=${{ matrix.target }}

- name: Test
run: ${{ env.PROGRAM }} test --target=${{ matrix.target }} ${{ matrix.cargo_args }}
run: ${{ env.PROGRAM }} test --target=${{ matrix.target }}
if: ${{ matrix.test }}

- name: Run example
if: ${{ !matrix.cross }}
run: cargo run --example info
- uses: actions/upload-artifact@v4
if: ${{ !matrix.cross }}
with:
name: info-${{ matrix.target }}
path: info.txt
path: info.txt
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/target
/Cargo.lock
/info.txt
/info.txt
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# cpuinfo-rs title
# cpuinfo-rs

[![Actions Status](https://github.com/Traverse-Research/cpuinfo-rs/actions/workflows/ci.yml/badge.svg)](https://github.com/Traverse-Research/cpuinfo-rs/actions)
[![Latest version](https://img.shields.io/crates/v/cpuinfo-rs.svg?logo=rust)](https://crates.io/crates/cpuinfo-rs)
Expand Down
2 changes: 1 addition & 1 deletion vendor/cpuinfo
Open in desktop
Submodule cpuinfo updated 36 files
+2 −2 .github/workflows/build.yml
+8 −2 CMakeLists.txt
+3 −1 README.md
+1 −1 include/cpuinfo-mock.h
+101 −0 include/cpuinfo.h
+1 −1 libcpuinfo.pc.in
+2 −0 scripts/android-arm64-mock.sh
+2 −0 scripts/android-armv7-mock.sh
+59 −0 scripts/android-riscv64-build.sh
+18 −11 src/arm/api.h
+7 −6 src/arm/cache.c
+3 −1 src/arm/linux/aarch32-isa.c
+41 −1 src/arm/linux/aarch64-isa.c
+13 −6 src/arm/linux/api.h
+76 −0 src/arm/linux/chipset.c
+8 −8 src/arm/linux/hwcap.c
+39 −3 src/arm/linux/init.c
+35 −5 src/arm/mach/init.c
+6 −0 src/arm/midr.h
+5 −2 src/arm/uarch.c
+8 −5 src/arm/windows/init-by-logical-sys-info.c
+95 −92 src/arm/windows/init.c
+0 −18 src/arm/windows/windows-arm-init.h
+11 −15 src/freebsd/topology.c
+21 −5 src/x86/freebsd/init.c
+14 −0 src/x86/isa.c
+3 −2 src/x86/linux/cpuinfo.c
+2 −0 src/x86/uarch.c
+31 −0 test/build.prop/astro_55r.log
+43 −0 test/cpuinfo/astro-55r.log
+851 −0 test/mock/pixel-8.cc
+1,294 −0 test/mock/pixel-8.h
+5 −0 test/name/proc-cpuinfo-hardware.cc
+37 −0 tools/cpu-info.c
+9 −0 tools/cpuid-dump.c
+7 −0 tools/isa-info.c