Skip to content

Commit 04c4557

Browse files
mpempe
committed
Merge branch 'master' into deploy
2 parents db8017e + cb2ed79 commit 04c4557

6 files changed

Lines changed: 78 additions & 36 deletions

File tree

‎README.md‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -51,22 +51,26 @@ Different toolchains
5151

5252
There are images for various toolchains, they are encoded in the distro name/version.
5353

54-
- kernel.org gcc 12.1.0 `korg@12.1.0`
55-
- kernel.org gcc 11.1.0 `korg@11.1.0`
56-
- kernel.org gcc 10.3.0 `korg@10.3.0`
57-
- kernel.org gcc 9.3.0 `korg@9.3.0`
58-
- kernel.org gcc 8.1.0 `korg@8.1.0`
59-
- kernel.org gcc 5.5.0 `korg@5.5.0`
60-
- Ubuntu 22.04 `ubuntu@22.04`
61-
- Ubuntu 21.10 `ubuntu@21.10`
62-
- Ubuntu 21.04 `ubuntu@21.04`
63-
- Ubuntu 20.04 `ubuntu@20.04`
64-
- Ubuntu 18.04 `ubuntu@18.04`
65-
- Ubuntu 16.04 `ubuntu@16.04`
66-
- Fedora 35 `fedora@35`
67-
- Fedora 34 `fedora@34`
68-
- Fedora 33 `fedora@33`
69-
- Fedora 31 `fedora@31`
54+
- `korg@12.1.0`: kernel.org gcc 12.1.0, binutils 2.38
55+
- `korg@11.3.0`: kernel.org gcc 11.3.0, binutils 2.38
56+
- `korg@11.1.0`: kernel.org gcc 11.1.0, binutils 2.36.1
57+
- `korg@10.3.0`: kernel.org gcc 10.3.0, binutils 2.36.1
58+
- `korg@9.4.0`: kernel.org gcc 9.4.0, binutils 2.36.1
59+
- `korg@9.3.0`: kernel.org gcc 9.3.0, binutils 2.34
60+
- `korg@8.5.0`: kernel.org gcc 8.5.0, binutils 2.36.1
61+
- `korg@8.1.0`: kernel.org gcc 8.1.0, binutils 2.30
62+
- `korg@5.5.0`: kernel.org gcc 5.5.0, binutils 2.29.1
63+
- `ubuntu@22.04`: Ubuntu 22.04, gcc 11.2.0, binutils 2.38
64+
- `ubuntu@21.10`: Ubuntu 21.10, gcc 11.2.0, binutils 2.37
65+
- `ubuntu@21.04`: Ubuntu 21.04, gcc 10.3.0, binutils 2.36.1
66+
- `ubuntu@20.04`: Ubuntu 20.04, gcc 9.4.0, binutils 2.34
67+
- `ubuntu@18.04`: Ubuntu 18.04, gcc 7.5.0, binutils 2.30
68+
- `ubuntu@16.04`: Ubuntu 16.04, gcc 5.4.0, binutils 2.26.1
69+
- `fedora@36`: Fedora 36, gcc 12.1.1, binutils 2.37-7
70+
- `fedora@35`: Fedora 35, gcc 11.2.1, binutils 2.37-3
71+
- `fedora@34`: Fedora 34, gcc 11.2.1, binutils 2.35.2
72+
- `fedora@33`: Fedora 33, gcc 10.2.1, binutils 2.35.1
73+
- `fedora@31`: Fedora 31, gcc 9.2.1, binutils 2.32
7074

7175
Only the Ubuntu toolchains can build the selftests.
7276

@@ -110,7 +114,7 @@ To build modules pass `MODULES=1`
110114

111115
To convert all modules to builtin, pass `MOD2YES=1`.
112116

113-
To build with clang pass `CLANG=1`, only works using the latest Ubuntu image.
117+
To build with clang pass `CLANG=1`, only works using the latest Fedora or Ubuntu image.
114118

115119
For a quiet build pass `QUIET=1`, for verbose pass `VERBOSE=1`.
116120

‎build/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
all: help
22

3-
export FEDORA_LATEST := 35
3+
export FEDORA_LATEST := 36
44
export UBUNTU_LATEST := 22.04
55

66
# If we're on ppc64le
@@ -12,10 +12,10 @@ ifeq ($(shell uname -m),ppc64le)
1212
endif
1313
endif
1414

15-
FEDORA_DISTROS := fedora@${FEDORA_LATEST} fedora@34 fedora@33 fedora@31 fedora
15+
FEDORA_DISTROS := fedora@${FEDORA_LATEST} fedora@35 fedora@34 fedora@33 fedora@31 fedora
1616
# Sort is to elimiate duplicates if UBUNTU_LATEST == 21.10
1717
UBUNTU_DISTROS := $(sort ubuntu@${UBUNTU_LATEST} ubuntu@21.10 ubuntu@21.04 ubuntu@20.04 ubuntu@18.04 ubuntu@16.04 ubuntu)
18-
KORG_DISTROS := korg@12.1.0 korg@11.1.0 korg@10.3.0 korg@9.3.0 korg@8.1.0 korg@5.5.0
18+
KORG_DISTROS := korg@12.1.0 korg@11.3.0 korg@11.1.0 korg@10.3.0 korg@9.4.0 korg@9.3.0 korg@8.5.0 korg@8.1.0 korg@5.5.0
1919
ALL_DISTROS := ${UBUNTU_DISTROS} ${KORG_DISTROS} ${FEDORA_DISTROS}
2020
DOCS_DISTRO := docs@${UBUNTU_LATEST}
2121
X86_DISTRO := ubuntu@${UBUNTU_LATEST}

‎build/fedora/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ RUN dnf -y install \
66
bison \
77
bzip2 \
88
ccache \
9+
clang \
910
cpio \
1011
diffutils \
1112
dwarves \

‎etc/filters.ini‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
11
[patterns]
2-
v1='detected stall(s)? on CPU'
3-
v2='WARNING:.*\s(un)?lock(s|ing)?\s'
4-
v3='WARNING: CPU: \d+ PID: \d+ at '
2+
v1=detected stall(s)? on CPU
3+
v2=WARNING:.*\s(un)?lock(s|ing)?\s
4+
v3=WARNING: CPU: \d+ PID: \d+ at
5+
v4=\bBUG:
56

67
[strings]
7-
v1='Unable to handle kernel paging request for'
8-
v2='Kernel BUG at'
9-
v3='Warning!'
10-
v4='BUG:'
11-
v5='WARNING: chain_key collision'
12-
v6='WARNING: bad contention detected!'
13-
v7='WARNING: suspicious RCU usage'
8+
v1=Unable to handle kernel paging request for
9+
v2=Kernel BUG at
10+
v3=Warning!
11+
v5=WARNING: chain_key collision
12+
v6=WARNING: bad contention detected!
13+
v7=WARNING: suspicious RCU usage
14+
v8=code: XXXXXXXX XXXXXXXX
15+
v9=SRR0 was:
16+
v10=SRR1 was:
17+
v11=code-patching: test failed
18+
v12=called on invalid text address
19+
v13=UBSAN:
1420

1521
[suppressions]
16-
v1='test_debug_virtual_init'
17-
v2='at drivers/misc/lkdtm/'
22+
v1=test_debug_virtual_init
23+
v2=at drivers/misc/lkdtm/

‎external/korg-toolchains/Makefile‎

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
help:
22
@echo "korg-toolchains"
33
@echo "Available targets:"
4-
@echo " download # download and unpack toolchains"
4+
@echo " download # download and unpack toolchains"
5+
@echo ' download-all-$$arch # download all toolchains for arch'
6+
@echo ' download-all-$$version # download all toolchains for version'
57
@echo ""
68
@echo "Download additional toolchains with:"
79
@echo " $ make gcc-<version>-nolibc/<arch>-linux"
@@ -15,6 +17,10 @@ gcc-$(1)-nolibc/$(2)-linux:
1517
tar -xf gcc-$(1)-nolibc-$(2)-linux.tar.xz
1618
touch $$@
1719
rm gcc-$(1)-nolibc-$(2)-linux.tar.xz
20+
21+
ALL_version_$(1) += gcc-$(1)-nolibc/$(2)-linux
22+
ALL_arch_$(2) += gcc-$(1)-nolibc/$(2)-linux
23+
ALL_TARGETS += gcc-$(1)-nolibc/$(2)-linux
1824
endef
1925

2026
ARCHES := alpha \
@@ -44,14 +50,39 @@ ARCHES := alpha \
4450
x86_64 \
4551
xtensa
4652

47-
VERSIONS := 11.1.0 5.5.0
53+
VERSIONS := 12.1.0 \
54+
11.3.0 \
55+
11.1.0 \
56+
10.3.0 \
57+
10.1.0 \
58+
9.4.0 \
59+
9.3.0 \
60+
9.2.0 \
61+
8.5.0 \
62+
8.4.0 \
63+
8.3.0 \
64+
8.1.0 \
65+
7.5.0 \
66+
7.3.0 \
67+
6.5.0 \
68+
6.4.0 \
69+
5.5.0
4870

4971
$(foreach arch,${ARCHES}, \
5072
$(foreach version,${VERSIONS}, \
5173
$(eval $(call TEMPLATE,${version},${arch})) \
5274
) \
5375
)
5476

77+
$(foreach arch,${ARCHES}, \
78+
$(eval download-all-$(arch): $(ALL_arch_$(arch))) \
79+
)
80+
81+
$(foreach version,${VERSIONS}, \
82+
$(eval download-all-$(version): $(ALL_version_$(version))) \
83+
)
84+
85+
download-all: $(ALL_TARGETS)
5586

5687
CLEAN_DIRS := $(patsubst %,gcc-%-nolibc,$(VERSIONS))
5788

@@ -66,6 +97,6 @@ clean:
6697
@:
6798

6899
distclean: clean
69-
rm -rf $(CLEAN_DIRS)
100+
rm -rf $(CLEAN_DIRS) *.tar.xz
70101

71102
.PHONY: download prepare build clean distclean help

‎tests/strace/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ help:
55
@echo " prepare # download and install dependencies"
66
@echo " test # run the test"
77

8-
version = 5.14
8+
version = 5.18
99
tarball = strace.tar.xz
1010

1111
download: $(tarball)

0 commit comments

Comments
 (0)