Skip to content

Commit dc0bc37

Browse files
bors[bot]MabezDev
andauthored
Merge #93
93: Remove riscv target post fix triple information from asm archive name r=almindor a=MabezDev For RISCV targets that don't have `unknown-none-elf` in their name. The only bit that matters is the first section anyways. Co-authored-by: Scott Mabin <[email protected]>
2 parents 1c68e4d + 96da9e2 commit dc0bc37

15 files changed

+26
-24
lines changed

assemble.ps1

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,39 +6,39 @@ Remove-Item -Force bin/*.a
66
$crate = "riscv"
77

88
riscv64-unknown-elf-gcc -c -mabi=ilp32 -march=rv32i asm.S -o bin/$crate.o
9-
riscv64-unknown-elf-ar crs bin/riscv32i-unknown-none-elf.a bin/$crate.o
9+
riscv64-unknown-elf-ar crs bin/riscv32i.a bin/$crate.o
1010

1111
riscv64-unknown-elf-gcc -c -mabi=ilp32 -march=rv32ic asm.S -o bin/$crate.o
12-
riscv64-unknown-elf-ar crs bin/riscv32ic-unknown-none-elf.a bin/$crate.o
12+
riscv64-unknown-elf-ar crs bin/riscv32ic.a bin/$crate.o
1313

1414
riscv64-unknown-elf-gcc -c -mabi=lp64 -march=rv64i asm.S -o bin/$crate.o
15-
riscv64-unknown-elf-ar crs bin/riscv64i-unknown-none-elf.a bin/$crate.o
15+
riscv64-unknown-elf-ar crs bin/riscv64i.a bin/$crate.o
1616

1717
riscv64-unknown-elf-gcc -c -mabi=lp64 -march=rv64ic asm.S -o bin/$crate.o
18-
riscv64-unknown-elf-ar crs bin/riscv64ic-unknown-none-elf.a bin/$crate.o
18+
riscv64-unknown-elf-ar crs bin/riscv64ic.a bin/$crate.o
1919

2020
riscv64-unknown-elf-gcc -c -mabi=ilp32f -march=rv32if asm.S -o bin/$crate.o
21-
riscv64-unknown-elf-ar crs bin/riscv32if-unknown-none-elf.a bin/$crate.o
21+
riscv64-unknown-elf-ar crs bin/riscv32if.a bin/$crate.o
2222

2323
riscv64-unknown-elf-gcc -c -mabi=ilp32f -march=rv32ifc asm.S -o bin/$crate.o
24-
riscv64-unknown-elf-ar crs bin/riscv32ifc-unknown-none-elf.a bin/$crate.o
24+
riscv64-unknown-elf-ar crs bin/riscv32ifc.a bin/$crate.o
2525

2626
riscv64-unknown-elf-gcc -c -mabi=lp64f -march=rv64if asm.S -o bin/$crate.o
27-
riscv64-unknown-elf-ar crs bin/riscv64if-unknown-none-elf.a bin/$crate.o
27+
riscv64-unknown-elf-ar crs bin/riscv64if.a bin/$crate.o
2828

2929
riscv64-unknown-elf-gcc -c -mabi=lp64f -march=rv64ifc asm.S -o bin/$crate.o
30-
riscv64-unknown-elf-ar crs bin/riscv64ifc-unknown-none-elf.a bin/$crate.o
30+
riscv64-unknown-elf-ar crs bin/riscv64ifc.a bin/$crate.o
3131

3232
riscv64-unknown-elf-gcc -c -mabi=ilp32d -march=rv32ifd asm.S -o bin/$crate.o
33-
riscv64-unknown-elf-ar crs bin/riscv32ifd-unknown-none-elf.a bin/$crate.o
33+
riscv64-unknown-elf-ar crs bin/riscv32ifd.a bin/$crate.o
3434

3535
riscv64-unknown-elf-gcc -c -mabi=ilp32d -march=rv32ifdc asm.S -o bin/$crate.o
36-
riscv64-unknown-elf-ar crs bin/riscv32ifdc-unknown-none-elf.a bin/$crate.o
36+
riscv64-unknown-elf-ar crs bin/riscv32ifdc.a bin/$crate.o
3737

3838
riscv64-unknown-elf-gcc -c -mabi=lp64d -march=rv64ifd asm.S -o bin/$crate.o
39-
riscv64-unknown-elf-ar crs bin/riscv64ifd-unknown-none-elf.a bin/$crate.o
39+
riscv64-unknown-elf-ar crs bin/riscv64ifd.a bin/$crate.o
4040

4141
riscv64-unknown-elf-gcc -c -mabi=lp64d -march=rv64ifdc asm.S -o bin/$crate.o
42-
riscv64-unknown-elf-ar crs bin/riscv64ifdc-unknown-none-elf.a bin/$crate.o
42+
riscv64-unknown-elf-ar crs bin/riscv64ifdc.a bin/$crate.o
4343

4444
Remove-Item bin/$crate.o

assemble.sh

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,39 @@ crate=riscv
88
rm -f bin/*.a
99

1010
riscv64-unknown-elf-gcc -c -mabi=ilp32 -march=rv32i asm.S -o bin/$crate.o
11-
ar crs bin/riscv32i-unknown-none-elf.a bin/$crate.o
11+
ar crs bin/riscv32i.a bin/$crate.o
1212

1313
riscv64-unknown-elf-gcc -c -mabi=ilp32 -march=rv32ic asm.S -o bin/$crate.o
14-
ar crs bin/riscv32ic-unknown-none-elf.a bin/$crate.o
14+
ar crs bin/riscv32ic.a bin/$crate.o
1515

1616
riscv64-unknown-elf-gcc -c -mabi=lp64 -march=rv64i asm.S -o bin/$crate.o
17-
ar crs bin/riscv64i-unknown-none-elf.a bin/$crate.o
17+
ar crs bin/riscv64i.a bin/$crate.o
1818

1919
riscv64-unknown-elf-gcc -c -mabi=lp64 -march=rv64ic asm.S -o bin/$crate.o
20-
ar crs bin/riscv64ic-unknown-none-elf.a bin/$crate.o
20+
ar crs bin/riscv64ic.a bin/$crate.o
2121

2222
riscv64-unknown-elf-gcc -c -mabi=ilp32f -march=rv32if asm.S -o bin/$crate.o
23-
ar crs bin/riscv32if-unknown-none-elf.a bin/$crate.o
23+
ar crs bin/riscv32if.a bin/$crate.o
2424

2525
riscv64-unknown-elf-gcc -c -mabi=ilp32f -march=rv32ifc asm.S -o bin/$crate.o
26-
ar crs bin/riscv32ifc-unknown-none-elf.a bin/$crate.o
26+
ar crs bin/riscv32ifc.a bin/$crate.o
2727

2828
riscv64-unknown-elf-gcc -c -mabi=lp64f -march=rv64if asm.S -o bin/$crate.o
29-
ar crs bin/riscv64if-unknown-none-elf.a bin/$crate.o
29+
ar crs bin/riscv64if.a bin/$crate.o
3030

3131
riscv64-unknown-elf-gcc -c -mabi=lp64f -march=rv64ifc asm.S -o bin/$crate.o
32-
ar crs bin/riscv64ifc-unknown-none-elf.a bin/$crate.o
32+
ar crs bin/riscv64ifc.a bin/$crate.o
3333

3434
riscv64-unknown-elf-gcc -c -mabi=ilp32d -march=rv32ifd asm.S -o bin/$crate.o
35-
ar crs bin/riscv32ifd-unknown-none-elf.a bin/$crate.o
35+
ar crs bin/riscv32ifd.a bin/$crate.o
3636

3737
riscv64-unknown-elf-gcc -c -mabi=ilp32d -march=rv32ifdc asm.S -o bin/$crate.o
38-
ar crs bin/riscv32ifdc-unknown-none-elf.a bin/$crate.o
38+
ar crs bin/riscv32ifdc.a bin/$crate.o
3939

4040
riscv64-unknown-elf-gcc -c -mabi=lp64d -march=rv64ifd asm.S -o bin/$crate.o
41-
ar crs bin/riscv64ifd-unknown-none-elf.a bin/$crate.o
41+
ar crs bin/riscv64ifd.a bin/$crate.o
4242

4343
riscv64-unknown-elf-gcc -c -mabi=lp64d -march=rv64ifdc asm.S -o bin/$crate.o
44-
ar crs bin/riscv64ifdc-unknown-none-elf.a bin/$crate.o
44+
ar crs bin/riscv64ifdc.a bin/$crate.o
4545

4646
rm bin/$crate.o
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)