Skip to content

Commit 3c0219a

Browse files
committed
zig 0.13.0
1 parent 2e3c8a4 commit 3c0219a

File tree

7 files changed

+481
-400
lines changed

7 files changed

+481
-400
lines changed

.gitpod.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ tasks:
1010
./tools/update-tools.sh
1111
&& ln -s $(pwd)/tools /workspace/tools
1212
&& export PATH=./tools/zig:$PATH
13-
&& zig build
13+
&& ./build.sh
1414
command:
1515
export PATH=./tools/zig:$PATH
1616
&& ./tools/update-qemu.sh
1717
&& mkdir -p ~/.config
1818
&& ln -s $(pwd)/zls.json ~/.config/zls.json
1919
&& echo zig build qemu ...
20-
&& zig build qemu
20+
&& ./qemu.sh
2121

2222
vscode:
2323
extensions:

build.sh

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,9 @@
11
#!/bin/bash
22
set -e
33

4-
echo zig version $(zig version)
5-
#touch symbols.txt
6-
zig build
7-
echo missing llvm-objdump-6.0
8-
#llvm-objdump-14 --source -disassemble-all -section-headers -t zig-out/bin/main > main.asm
9-
#grep '^00000000.*:$' main.asm | sed 's/^00000000//' > symbols.txt
10-
#zig build
4+
export PATH=tools/zig:$PATH
5+
NAME=main
116

12-
#ARCH=thumbv6m
13-
#SOURCE=$(ls mission0*.zig)
14-
#llvm-objdump -x --source main > asm.$ARCH
15-
#set +e
16-
#grep unknown asm.$ARCH | grep -v '00 00 00 00'
17-
#grep 'q[0-9].*#' asm.$ARCH | egrep -v '#(-|)(16|32|48|64|80|96|112|128)'
18-
#set -e
19-
20-
# ls -l zig-out/bin/main.img symbols.txt
21-
ls -l zig-out/bin/main.img
7+
zig fmt *.zig
8+
zig build-exe -target thumb-freestanding-none -mcpu cortex_m0 --script linker.ld -ffunction-sections $NAME.zig
9+
zig objcopy -O hex $NAME $NAME.hex

build.zig

Lines changed: 0 additions & 111 deletions
This file was deleted.

linker_script.ld renamed to linker.ld

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,18 @@ MEMORY {
33
ram : ORIGIN = 0x20000000, LENGTH = 0x4000
44
}
55
SECTIONS {
6+
/DISCARD/ : {
7+
*(.ARM.exidx)
8+
}
69
.flash : {
710
_start = .;
811
KEEP(*(.vector_table))
912
*(.text.*)
1013
*(.rodata)
1114
*(.rodata.*)
12-
_ram_data_initial_values = .;
15+
_address_in_flash_of_initial_ram_data = .;
1316
} > flash
14-
.ram_data : AT(_ram_data_initial_values) {
17+
.ram_data : AT(_address_in_flash_of_initial_ram_data) {
1518
_ram_data_start = .;
1619
*(.data)
1720
_ram_data_end = .;
@@ -21,8 +24,4 @@ SECTIONS {
2124
*(.bss)
2225
_ram_bss_end = .;
2326
} > ram
24-
# .ARM.exidx must be discarded until "Provide -fno-unwind-tables" is resolved https://github.com/ziglang/zig/issues/5464
25-
/DISCARD/ : {
26-
*(.ARM.exidx)
27-
}
2827
}

0 commit comments

Comments
 (0)