Skip to content

Commit d7fe4ae

Browse files
committed
tools: cleanup
1 parent 2f3a3a4 commit d7fe4ae

File tree

2 files changed

+5
-38
lines changed

2 files changed

+5
-38
lines changed

tools/cross_compile.sh

+5-37
Original file line numberDiff line numberDiff line change
@@ -193,28 +193,16 @@ QEMU_ARGS+=( -E LD_PRELOAD="${SYSROOT_DIR}/usr/lib/libstdc++.so.6:${SYSROOT_DIR}
193193
function expand_codescape_config() {
194194
# https://www.mips.com/mips-toolchain-configurations/
195195
# mips-img: MIPS32R6 and MIPS64R6
196-
# mips-mti: MIPS32R2 and MIPS64R2
197196
case "${TARGET}" in
198197
"mips" | "mipsel" | "mips64" | "mips64el" | \
199198
"mips32-r6" | "mips32el-r6" | "mips64-r6" | "mips64el-r6" )
200199
# IMG Toolchain MIPS32R6 and MIPS64R6
201-
# ref: https://codescape.mips.com/components/toolchain/2021.09-01/downloads.html
202-
local -r DATE=2021.09-01
200+
# ref: https://codescape.mips.com/components/toolchain/2024.10-02/downloads.html
201+
local -r DATE=2024.10-02
203202
local -r CODESCAPE_URL=https://codescape.mips.com/components/toolchain/${DATE}/Codescape.GNU.Tools.Package.${DATE}.for.MIPS.IMG.Linux.CentOS-6.x86_64.tar.gz
204203
local -r GCC_PREFIX="mips-img-linux-gnu"
205204
local -r GCC_RELATIVE_DIR="${GCC_PREFIX}/${DATE}"
206205
;;
207-
"mips32-r2" | "mips32el-r2" | "mips64-r2" | "mips64el-r2")
208-
# MTI Toolchain MIPS32R2-MIPS32R6, MIPS64R2-MIPS64R6
209-
# ref: https://codescape.mips.com/components/toolchain/2020.06-01/downloads.html
210-
local -r DATE=2020.06-01
211-
local -r CODESCAPE_URL=https://codescape.mips.com/components/toolchain/${DATE}/Codescape.GNU.Tools.Package.${DATE}.for.MIPS.MTI.Linux.CentOS-6.x86_64.tar.gz
212-
# # ref: https://codescape.mips.com/components/toolchain/2019.09-06/downloads.html
213-
# local -r DATE=2019.09-06
214-
# local -r CODESCAPE_URL=https://codescape.mips.com/components/toolchain/${DATE}/Codescape.GNU.Tools.Package.${DATE}.for.MIPS.MTI.Linux.CentOS-6.x86_64.tar.gz
215-
local -r GCC_PREFIX="mips-mti-linux-gnu"
216-
local -r GCC_RELATIVE_DIR="${GCC_PREFIX}/${DATE}"
217-
;;
218206
*)
219207
>&2 echo 'unknown platform'
220208
exit 1 ;;
@@ -231,41 +219,21 @@ function expand_codescape_config() {
231219
local -r FLAVOUR="mips-r6-hard"
232220
local -r LIBC_DIR_SUFFIX="lib"
233221
;;
234-
"mips32-r2")
235-
local -r MIPS_FLAGS="-EB -mips32r2 -mabi=32"
236-
local -r FLAVOUR="mips-r2-hard"
237-
local -r LIBC_DIR_SUFFIX="lib"
238-
;;
239222
"mipsel" | "mips32el-r6")
240223
local -r MIPS_FLAGS="-EL -mips32r6 -mabi=32"
241224
local -r FLAVOUR="mipsel-r6-hard"
242225
local -r LIBC_DIR_SUFFIX="lib"
243226
;;
244-
"mips32el-r2")
245-
local -r MIPS_FLAGS="-EL -mips32r2 -mabi=32"
246-
local -r FLAVOUR="mipsel-r2-hard"
247-
local -r LIBC_DIR_SUFFIX="lib"
248-
;;
249227
"mips64" | "mips64-r6")
250228
local -r MIPS_FLAGS="-EB -mips64r6 -mabi=64"
251229
local -r FLAVOUR="mips-r6-hard"
252230
local -r LIBC_DIR_SUFFIX="lib64"
253231
;;
254-
"mips64-r2")
255-
local -r MIPS_FLAGS="-EB -mips64r2 -mabi=64"
256-
local -r FLAVOUR="mips-r2-hard"
257-
local -r LIBC_DIR_SUFFIX="lib64"
258-
;;
259232
"mips64el" | "mips64el-r6")
260233
local -r MIPS_FLAGS="-EL -mips64r6 -mabi=64"
261234
local -r FLAVOUR="mipsel-r6-hard"
262235
local -r LIBC_DIR_SUFFIX="lib64"
263236
;;
264-
"mips64el-r2")
265-
local -r MIPS_FLAGS="-EL -mips64r2 -mabi=64"
266-
local -r FLAVOUR="mipsel-r2-hard"
267-
local -r LIBC_DIR_SUFFIX="lib64"
268-
;;
269237
*)
270238
>&2 echo 'unknown mips platform'
271239
exit 1 ;;
@@ -359,7 +327,7 @@ DESCRIPTION
359327
\t* TARGET:
360328
\t\tx86_64
361329
\t\taarch64(arm64) aarch64be(arm64be) (bootlin)
362-
\t\tmips64-r6(mips64) mips64el-r6(mips64el) mips64-r2 mips64el-r2 (codespace)
330+
\t\tmips64-r6(mips64) mips64el-r6(mips64el) (codespace)
363331
\t\tppc-440fp(ppc) ppc-e500mc (bootlin)
364332
\t\tppc64 ppc64le (bootlin)
365333
\t\triscv64 (bootlin)
@@ -430,10 +398,10 @@ function main() {
430398
expand_bootlin_config
431399
declare -r QEMU_ARCH=aarch64_be ;;
432400

433-
mips64 | mips64-r6 | mips64-r2)
401+
mips64 | mips64-r6)
434402
expand_codescape_config
435403
declare -r QEMU_ARCH=mips64 ;;
436-
mips64el | mips64el-r6 | mips64el-r2)
404+
mips64el | mips64el-r6)
437405
expand_codescape_config
438406
declare -r QEMU_ARCH=mips64el ;;
439407

tools/release/build_delivery_win.cmd

-1
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,6 @@ FOR %%v IN (8 9 10 11 12 13) DO (
300300
echo Check MYPY files... | tee.exe -a build.log
301301
FOR %%m IN (
302302
ortools\algorithms\python\knapsack_solver.pyi
303-
ortools\algorithms\python\set_cover.pyi
304303
ortools\constraint_solver\pywrapcp.pyi
305304
ortools\graph\python\linear_sum_assignment.pyi
306305
ortools\graph\python\max_flow.pyi

0 commit comments

Comments
 (0)