-
-
Notifications
You must be signed in to change notification settings - Fork 0
/
0097-esp-ci-Upgrade-universal-toolchain-to.patch
79 lines (69 loc) · 2.93 KB
/
0097-esp-ci-Upgrade-universal-toolchain-to.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
From dbbc5856f9a5044957375698ca16f1a42094b005 Mon Sep 17 00:00:00 2001
From: Andrei Safronov <[email protected]>
Date: Wed, 5 Apr 2023 00:59:26 +0300
Subject: [PATCH 097/158] esp/ci: Upgrade universal toolchain to
'gcc11_2_0-esp-2022r1-RC1' and newlib 4.1.0
---
.gitlab-ci.yml | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f2923ed513b8..025a6c55d42d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,10 +9,10 @@ image: ${CI_DOCKER_REGISTRY}/llvm-build:3
variables:
# move all these to CI/CD settings
- GCC_REL_NAME: "esp-2021r2-patch3"
- GCC_REL_VER: "gcc8_4_0"
+ GCC_REL_NAME: "esp-2022r1-RC1"
+ GCC_REL_VER: "gcc11_2_0"
NEWLIB_REPO: "newlib-cygwin"
- NEWLIB_REF: "esp_based_on_3_3_0"
+ NEWLIB_REF: "esp_based_on_4_1_0"
BINUTILS_REPO: "binutils-gdb"
BINUTILS_REF: "esp_based_on_binutils-2_35"
XTENSA_OVERLAYS_REPO: "xtensa-overlays"
@@ -28,17 +28,14 @@ variables:
ARCHIVE_TOOL_LINUX: "tar -cJf"
UNARCHIVE_TOOL_LINUX: "tar -xf"
ARCHIVE_EXT_LINUX: "tar.xz"
- GCC_ARCHIVE_EXT_LINUX: "tar.gz"
ARCHIVE_TOOL_WIN: "zip -9 -r"
UNARCHIVE_TOOL_WIN: "unzip"
ARCHIVE_EXT_WIN: "zip"
- GCC_ARCHIVE_EXT_WIN: "zip"
ARCHIVE_TOOL_MACOS: "tar -cJf"
UNARCHIVE_TOOL_MACOS: "tar -xf"
ARCHIVE_EXT_MACOS: "tar.xz"
- GCC_ARCHIVE_EXT_MACOS: "tar.gz"
DIST_DIR: "dist"
BUILD_DIR: "_build"
@@ -82,11 +79,11 @@ before_script:
"esp32s3")
for ((i = 0; i < ${#XTENSA_CPUS[@]}; i++)); do
XTENSA_CPU=${XTENSA_CPUS[$i]}
- GCC_TOOLCHAIN_ARCH=xtensa-${XTENSA_CPU}-elf-${GCC_REL_VER}-${GCC_REL_NAME}-${PLATFORM_NAME}.${GCC_ARCHIVE_EXT}
+ GCC_TOOLCHAIN_ARCH=xtensa-${XTENSA_CPU}-elf-${GCC_REL_VER}-${GCC_REL_NAME}-${PLATFORM_NAME}.${ARCHIVE_EXT}
wget --no-verbose https://dl.espressif.com/github_assets/espressif/crosstool-NG/releases/download/${GCC_REL_NAME}/${GCC_TOOLCHAIN_ARCH}
${UNARCHIVE_TOOL} ${GCC_TOOLCHAIN_ARCH}
done;
- GCC_TOOLCHAIN_ARCH=riscv32-esp-elf-${GCC_REL_VER}-${GCC_REL_NAME}-${PLATFORM_NAME}.${GCC_ARCHIVE_EXT}
+ GCC_TOOLCHAIN_ARCH=riscv32-esp-elf-${GCC_REL_VER}-${GCC_REL_NAME}-${PLATFORM_NAME}.${ARCHIVE_EXT}
wget --no-verbose https://dl.espressif.com/github_assets/espressif/crosstool-NG/releases/download/${GCC_REL_NAME}/${GCC_TOOLCHAIN_ARCH}
${UNARCHIVE_TOOL} ${GCC_TOOLCHAIN_ARCH}
@@ -168,7 +165,6 @@ build_x86_64-linux-gnu:
ARCHIVE_TOOL: "${ARCHIVE_TOOL_LINUX}"
UNARCHIVE_TOOL: "${UNARCHIVE_TOOL_LINUX}"
ARCHIVE_EXT: "${ARCHIVE_EXT_LINUX}"
- GCC_ARCHIVE_EXT: "${GCC_ARCHIVE_EXT_LINUX}"
BUILD_TOOLCHAIN_CMD: "./build-toolchain.sh"
build_x86_64-w64-mingw32:
@@ -201,7 +197,6 @@ build_x86_64-w64-mingw32:
ARCHIVE_TOOL: "${ARCHIVE_TOOL_WIN}"
UNARCHIVE_TOOL: "${UNARCHIVE_TOOL_WIN}"
ARCHIVE_EXT: "${ARCHIVE_EXT_WIN}"
- GCC_ARCHIVE_EXT: "${GCC_ARCHIVE_EXT_WIN}"
BUILD_TOOLCHAIN_CMD: "./build-toolchain-win.sh"
test_x86_64-linux-gnu:
--
2.40.1