Skip to content

Commit d97ee85

Browse files
bors[bot]stlankes
andauthored
Merge #78
78: using of the asm feature to improve the performance of basic functions r=jbreitbart a=stlankes - PR uses rust-lang/compiler-builtins#365 to improve the performance - fix broken CI and build the bootloader on windows correctly Co-authored-by: Stefan Lankes <slankes@eonerc.rwth-aachen.de>
2 parents 9d0a06d + 353d180 commit d97ee85

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

.cargo/config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[unstable]
22
build-std = ["std", "core", "alloc", "panic_abort"]
3-
build-std-features = ["compiler-builtins-mem"]
3+
build-std-features = ["compiler-builtins-mem", "compiler-builtins-asm"]
44

55
[build]
66
target = "x86_64-unknown-hermit"

.github/workflows/format.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626

2727
steps:
28-
- uses: hecrj/setup-rust-action@v1.3.1
28+
- uses: hecrj/setup-rust-action@v1
2929
with:
3030
rust-version: ${{ matrix.rust }}
3131
components: ${{ matrix.components || '' }}

.github/workflows/test.yml

+9-4
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
targets: 'x86_64-unknown-linux-gnu'
3838

3939
steps:
40-
- uses: hecrj/setup-rust-action@v1.3.1
40+
- uses: hecrj/setup-rust-action@v1
4141
with:
4242
rust-version: ${{ matrix.rust }}
4343
components: ${{ matrix.components || '' }}
@@ -55,10 +55,14 @@ jobs:
5555
brew install qemu nasm
5656
if: ${{ matrix.os == 'macOS-latest' }}
5757
- name: Install qemu/nasm (windows)
58+
uses: crazy-max/ghaction-chocolatey@v1
59+
with:
60+
args: install qemu nasm
61+
if: ${{ matrix.os == 'windows-latest' }}
62+
- name: Set path to qemu/nasm (Windows)
5863
run: |
59-
choco install qemu nasm
60-
echo "::add-path::C:\Program Files\NASM"
61-
echo "::add-path::C:\Program Files\qemu"
64+
echo "C:\Program Files\qemu" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
65+
echo "C:\Program Files\nasm" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
6266
if: ${{ matrix.os == 'windows-latest' }}
6367
- name: Building dev version
6468
run:
@@ -71,6 +75,7 @@ jobs:
7175
- name: Build loader (unix)
7276
working-directory: loader
7377
run: make
78+
if: ${{ ( matrix.os == 'macOS-latest' ) || ( matrix.os == 'ubuntu-latest' ) }}
7479
# Workaround since makefile doesn't work when using powershell
7580
- name: Build loader (windows)
7681
working-directory: loader

0 commit comments

Comments
 (0)