Skip to content

Commit 9c3e479

Browse files
aykevldeadprogram
authored andcommitted
all: remove support for LLVM 9
This LLVM version breaks CI and is now relatively rather old anyway, so remove support for it. This also reverts a workaround for LLVM 9, see a956893 ("maixbit: workaround to avoid medium code model").
1 parent 6e480e1 commit 9c3e479

File tree

5 files changed

+7
-24
lines changed

5 files changed

+7
-24
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -342,12 +342,12 @@ commands:
342342
- /go/pkg/mod
343343

344344
jobs:
345-
test-llvm9-go111:
345+
test-llvm10-go111:
346346
docker:
347347
- image: circleci/golang:1.11-buster
348348
steps:
349349
- test-linux:
350-
llvm: "9"
350+
llvm: "10"
351351
test-llvm10-go112:
352352
docker:
353353
- image: circleci/golang:1.12-buster
@@ -399,7 +399,7 @@ jobs:
399399
workflows:
400400
test-all:
401401
jobs:
402-
- test-llvm9-go111
402+
- test-llvm10-go111
403403
- test-llvm10-go112
404404
- test-llvm10-go113
405405
- test-llvm10-go114

cgo/libclang_config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// +build !byollvm
2-
// +build !llvm10,!llvm9
2+
// +build !llvm10
33

44
package cgo
55

cgo/libclang_config_llvm9.go

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

targets/k210.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"inherits": ["riscv64"],
33
"features": ["+a", "+c", "+m", "+f", "+d"],
4-
"build-tags": ["k210", "kendryte"]
4+
"build-tags": ["k210", "kendryte"],
5+
"code-model": "medium"
56
}

targets/maixbit.ld

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11

22
MEMORY
33
{
4-
/* This is a software workaround to avoid using the medany code model
5-
which causes the llvm9 build to fail. 0x80000000 is mirorred at
6-
0xffffffff80000000. This is not needed anymore on llvm10.
7-
https://github.com/rust-embedded/riscv-rt/issues/25 */
8-
RAM (xrw) : ORIGIN = 0xffffffff80000000, LENGTH = 6M
4+
RAM (xrw) : ORIGIN = 0x80000000, LENGTH = 6M
95
}
106

117
_stack_size = 2K;

0 commit comments

Comments
 (0)