diff --git a/.circleci/config.yml b/.circleci/config.yml
index bf36f30a..9d99582a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -342,12 +342,12 @@ commands:
             - /go/pkg/mod
 
 jobs:
-  test-llvm9-go111:
+  test-llvm10-go111:
     docker:
       - image: circleci/golang:1.11-buster
     steps:
       - test-linux:
-          llvm: "9"
+          llvm: "10"
   test-llvm10-go112:
     docker:
       - image: circleci/golang:1.12-buster
@@ -399,7 +399,7 @@ jobs:
 workflows:
   test-all:
     jobs:
-      - test-llvm9-go111
+      - test-llvm10-go111
       - test-llvm10-go112
       - test-llvm10-go113
       - test-llvm10-go114
diff --git a/cgo/libclang_config.go b/cgo/libclang_config.go
index 4a5d0603..78783db2 100644
--- a/cgo/libclang_config.go
+++ b/cgo/libclang_config.go
@@ -1,5 +1,5 @@
 // +build !byollvm
-// +build !llvm10,!llvm9
+// +build !llvm10
 
 package cgo
 
diff --git a/cgo/libclang_config_llvm9.go b/cgo/libclang_config_llvm9.go
deleted file mode 100644
index 6e09b01a..00000000
--- a/cgo/libclang_config_llvm9.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// +build !byollvm
-// +build llvm9
-
-package cgo
-
-/*
-#cgo linux  CFLAGS: -I/usr/lib/llvm-9/include
-#cgo darwin CFLAGS: -I/usr/local/opt/llvm@9/include
-#cgo freebsd CFLAGS: -I/usr/local/llvm9/include
-#cgo linux  LDFLAGS: -L/usr/lib/llvm-9/lib -lclang
-#cgo darwin LDFLAGS: -L/usr/local/opt/llvm@9/lib -lclang -lffi
-#cgo freebsd LDFLAGS: -L/usr/local/llvm9/lib -lclang
-*/
-import "C"
diff --git a/targets/k210.json b/targets/k210.json
index 5ddd9dba..4c5f3f91 100644
--- a/targets/k210.json
+++ b/targets/k210.json
@@ -1,5 +1,6 @@
 {
 	"inherits": ["riscv64"],
 	"features": ["+a", "+c", "+m", "+f", "+d"],
-	"build-tags": ["k210", "kendryte"]
+	"build-tags": ["k210", "kendryte"],
+	"code-model": "medium"
 }
diff --git a/targets/maixbit.ld b/targets/maixbit.ld
index c2cffae9..015a9bea 100644
--- a/targets/maixbit.ld
+++ b/targets/maixbit.ld
@@ -1,11 +1,7 @@
 
 MEMORY
 {
-    /* This is a software workaround to avoid using the medany code model
-       which causes the llvm9 build to fail. 0x80000000 is mirorred at
-       0xffffffff80000000. This is not needed anymore on llvm10.
-       https://github.com/rust-embedded/riscv-rt/issues/25 */
-    RAM (xrw) : ORIGIN = 0xffffffff80000000, LENGTH = 6M
+    RAM (xrw) : ORIGIN = 0x80000000, LENGTH = 6M
 }
 
 _stack_size = 2K;