Skip to content

Commit 99b7c59

Browse files
gchateletgchatelet
authored
Merge pull request #378 from Mizux/main
ci: Remove linaro toolchains support
2 parents 744e451 + df0623a commit 99b7c59

File tree

4 files changed

+12
-78
lines changed

4 files changed

+12
-78
lines changed

‎.github/workflows/aarch64_linux_cmake.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ jobs:
1616
targets: [
1717
[aarch64],
1818
[aarch64be],
19-
[aarch64-linux-gnu],
20-
[aarch64_be-linux-gnu]
2119
]
2220
fail-fast: false
2321
env:

‎.github/workflows/arm_linux_cmake.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,8 @@ jobs:
1414
strategy:
1515
matrix:
1616
targets: [
17-
[arm-linux-gnueabihf],
18-
[armv8l-linux-gnueabihf],
19-
[arm-linux-gnueabi],
20-
[armeb-linux-gnueabihf],
21-
[armeb-linux-gnueabi]
17+
[armv7-eabihf],
18+
[armebv7-eabihf],
2219
]
2320
fail-fast: false
2421
env:

‎cmake/ci/Makefile

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,16 @@ help:
3939
@echo -e "\t${BOLD}clean_<target>_<toolchain_stage>${RESET}: Remove cache and docker image."
4040
@echo
4141
@echo -e "\tWith ${BOLD}<target>${RESET}:"
42-
@echo -e "\t\t${BOLD}arm-linux-gnueabihf${RESET} (linaro toolchain)"
43-
@echo -e "\t\t${BOLD}armv8l-linux-gnueabihf${RESET} (linaro toolchain)"
44-
@echo -e "\t\t${BOLD}arm-linux-gnueabi${RESET} (linaro toolchain)"
45-
@echo -e "\t\t${BOLD}armeb-linux-gnueabihf${RESET} (linaro toolchain)"
46-
@echo -e "\t\t${BOLD}armeb-linux-gnueabi${RESET} (linaro toolchain)"
47-
@echo -e "\t\t${BOLD}aarch64-linux-gnu${RESET} (linaro toolchain)"
48-
@echo -e "\t\t${BOLD}aarch64${RESET} (bootlin toolchain)"
49-
@echo -e "\t\t${BOLD}aarch64_be-linux-gnu${RESET} (linaro toolchain)"
50-
@echo -e "\t\t${BOLD}aarch64be${RESET} (bootlin toolchain)"
42+
@echo -e "\t\t${BOLD}armv7-eabihf(arm)${RESET} (bootlin toolchain)"
43+
@echo -e "\t\t${BOLD}armebv7-eabihf(armeb)${RESET} (bootlin toolchain)"
44+
@echo -e "\t\t${BOLD}aarch64(arm64)${RESET} (bootlin toolchain)"
45+
@echo -e "\t\t${BOLD}aarch64be(arm64be)${RESET} (bootlin toolchain)"
5146
@echo -e "\t\t${BOLD}mips32${RESET} (codespace toolchain)"
5247
@echo -e "\t\t${BOLD}mips64${RESET} (codespace toolchain)"
5348
@echo -e "\t\t${BOLD}mips32el${RESET} (codespace toolchain)"
5449
@echo -e "\t\t${BOLD}mips64el${RESET} (codespace toolchain)"
55-
@echo -e "\t\t${BOLD}ppc${RESET} (bootlin toolchain)"
50+
@echo -e "\t\t${BOLD}ppc-440fp(ppc)${RESET} (bootlin toolchain)"
51+
@echo -e "\t\t${BOLD}ppc-e500mc${RESET} (bootlin toolchain)"
5652
@echo -e "\t\t${BOLD}ppc64${RESET} (bootlin toolchain)"
5753
@echo -e "\t\t${BOLD}ppc64le${RESET} (bootlin toolchain)"
5854
@echo -e "\t\t${BOLD}riscv32${RESET} (bootlin toolchain)"
@@ -151,9 +147,10 @@ $(clean_targets_amd64): clean_amd64_%:
151147
## TOOLCHAIN ##
152148
###############
153149
TOOLCHAIN_TARGETS = \
150+
arm armeb \
151+
armv7-eabihf armebv7-eabihf \
152+
arm64 arm64be \
154153
aarch64 aarch64be \
155-
arm-linux-gnueabihf armv8l-linux-gnueabihf arm-linux-gnueabi armeb-linux-gnueabihf armeb-linux-gnueabi \
156-
aarch64-linux-gnu aarch64_be-linux-gnu \
157154
mips32 mips32el mips64 mips64el \
158155
ppc ppc-440fp ppc-e500mc \
159156
ppc64 ppc64le \

‎scripts/run_integration.sh

Lines changed: 1 addition & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -92,50 +92,6 @@ function clean_build() {
9292
mkdir -p "${BUILD_DIR}"
9393
}
9494

95-
function expand_linaro_config() {
96-
#ref: https://releases.linaro.org/components/toolchain/binaries/
97-
local -r LINARO_VERSION=7.5-2019.12
98-
local -r LINARO_ROOT_URL=https://releases.linaro.org/components/toolchain/binaries/${LINARO_VERSION}
99-
100-
local -r GCC_VERSION=7.5.0-2019.12
101-
local -r GCC_URL=${LINARO_ROOT_URL}/${TARGET}/gcc-linaro-${GCC_VERSION}-x86_64_${TARGET}.tar.xz
102-
local -r GCC_RELATIVE_DIR="gcc-linaro-${GCC_VERSION}-x86_64_${TARGET}"
103-
unpack "${GCC_URL}" "${GCC_RELATIVE_DIR}"
104-
105-
local -r SYSROOT_VERSION=2.25-2019.12
106-
local -r SYSROOT_URL=${LINARO_ROOT_URL}/${TARGET}/sysroot-glibc-linaro-${SYSROOT_VERSION}-${TARGET}.tar.xz
107-
local -r SYSROOT_RELATIVE_DIR=sysroot-glibc-linaro-${SYSROOT_VERSION}-${TARGET}
108-
unpack "${SYSROOT_URL}" "${SYSROOT_RELATIVE_DIR}"
109-
110-
local -r SYSROOT_DIR=${ARCHIVE_DIR}/${SYSROOT_RELATIVE_DIR}
111-
local -r STAGING_DIR=${ARCHIVE_DIR}/${SYSROOT_RELATIVE_DIR}-stage
112-
local -r GCC_DIR=${ARCHIVE_DIR}/${GCC_RELATIVE_DIR}
113-
114-
# Write a Toolchain file
115-
# note: This is manadatory to use a file in order to have the CMake variable
116-
# 'CMAKE_CROSSCOMPILING' set to TRUE.
117-
# ref: https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html#cross-compiling-for-linux
118-
cat >"$TOOLCHAIN_FILE" <<EOL
119-
set(CMAKE_SYSTEM_NAME Linux)
120-
set(CMAKE_SYSTEM_PROCESSOR ${TARGET})
121-
122-
set(CMAKE_SYSROOT ${SYSROOT_DIR})
123-
set(CMAKE_STAGING_PREFIX ${STAGING_DIR})
124-
125-
set(tools ${GCC_DIR})
126-
set(CMAKE_C_COMPILER \${tools}/bin/${TARGET}-gcc)
127-
set(CMAKE_CXX_COMPILER \${tools}/bin/${TARGET}-g++)
128-
129-
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
130-
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
131-
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
132-
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
133-
EOL
134-
CMAKE_ADDITIONAL_ARGS+=( -DCMAKE_TOOLCHAIN_FILE="${TOOLCHAIN_FILE}" )
135-
QEMU_ARGS+=( -L "${SYSROOT_DIR}" )
136-
QEMU_ARGS+=( -E LD_LIBRARY_PATH=/lib )
137-
}
138-
13995
function expand_bootlin_config() {
14096
# ref: https://toolchains.bootlin.com/
14197
local -r GCC_DIR=${ARCHIVE_DIR}/${GCC_RELATIVE_DIR}
@@ -388,9 +344,6 @@ DESCRIPTION
388344
\t\tx86_64
389345
\t\tarmv7-eabihf(arm) armebv7-eabihf(armeb) (bootlin)
390346
\t\taarch64(arm64) aarch64be(arm64be) (bootlin)
391-
\t\taarch64-linux-gnu aarch64_be-linux-gnu (linaro)
392-
\t\tarm-linux-gnueabihf armv8l-linux-gnueabihf arm-linux-gnueabi (linaro)
393-
\t\tarmeb-linux-gnueabihf armeb-linux-gnueabi (linaro)
394347
\t\tmips32 mips32el (codespace)
395348
\t\tmips64 mips64el (codespace)
396349
\t\tppc-440fp(ppc) ppc-e500mc (bootlin)
@@ -443,18 +396,6 @@ function main() {
443396
case ${TARGET} in
444397
x86_64)
445398
declare -r QEMU_ARCH=x86_64 ;;
446-
arm-linux-gnueabihf | armv8l-linux-gnueabihf | arm-linux-gnueabi)
447-
expand_linaro_config
448-
declare -r QEMU_ARCH=arm ;;
449-
armeb-linux-gnueabihf | armeb-linux-gnueabi)
450-
expand_linaro_config
451-
declare -r QEMU_ARCH=DISABLED ;;
452-
aarch64-linux-gnu)
453-
expand_linaro_config
454-
declare -r QEMU_ARCH=aarch64 ;;
455-
aarch64_be-linux-gnu)
456-
expand_linaro_config
457-
declare -r QEMU_ARCH=aarch64_be ;;
458399
arm | armv7-eabihf)
459400
expand_bootlin_config
460401
declare -r QEMU_ARCH=arm ;;
@@ -467,6 +408,7 @@ function main() {
467408
arm64be | aarch64be)
468409
expand_bootlin_config
469410
declare -r QEMU_ARCH=aarch64_be ;;
411+
470412
mips32)
471413
expand_codescape_config
472414
declare -r QEMU_ARCH=mips ;;

0 commit comments

Comments
 (0)