Skip to content

Commit 5204428

Browse files
stephanosiostephanosio
committed
configs: Clean up toolchain configurations
This commit cleans up individual toolchain configurations to: * remove unnecessary "CT_FOO is not set" lines. * more consistently and logically sort the configurations. Signed-off-by: Stephanos Ioannidis <root@stephanos.io>
1 parent fbb8ab5 commit 5204428

18 files changed

+31
-71
lines changed

‎configs/aarch64-zephyr-elf.config

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
CT_CONFIG_VERSION="3"
22
CT_EXPERIMENTAL=y
3-
# CT_PREFIX_DIR_RO is not set
4-
# CT_LOG_PROGRESS_BAR is not set
53
CT_ARCH_ARM=y
6-
CT_MULTILIB=y
74
CT_ARCH_64=y
85
CT_TARGET_VENDOR="zephyr"
96
CT_TARGET_CFLAGS="-moverride=tune=no_ldp_stp_qregs -ftls-model=local-exec"
7+
CT_MULTILIB=y
108
CT_GDB_CROSS_EXTRA_CONFIG_ARRAY="--enable-targets=arm-zephyr-eabi"

‎configs/arc-zephyr-elf.config

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
CT_CONFIG_VERSION="3"
22
CT_EXPERIMENTAL=y
3-
# CT_PREFIX_DIR_RO is not set
4-
# CT_LOG_PROGRESS_BAR is not set
53
CT_ARCH_ARC=y
6-
CT_MULTILIB=y
7-
CT_TARGET_CFLAGS="-mno-sdata -mtp-regno=26 -ftls-model=local-exec"
84
CT_TARGET_VENDOR="zephyr"
5+
CT_TARGET_CFLAGS="-mno-sdata -mtp-regno=26 -ftls-model=local-exec"
6+
CT_MULTILIB=y

‎configs/arc64-zephyr-elf.config

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
CT_CONFIG_VERSION="3"
22
CT_EXPERIMENTAL=y
3-
# CT_PREFIX_DIR_RO is not set
43
CT_PATCH_BUNDLED_LOCAL=y
54
CT_LOCAL_PATCH_DIR="${CT_TOP_DIR}/../../patches-arc64"
6-
# CT_LOG_PROGRESS_BAR is not set
75
CT_ARCH_ARC=y
8-
CT_MULTILIB=y
96
CT_ARCH_64=y
107
CT_TARGET_VENDOR="zephyr"
118
CT_TARGET_CFLAGS="-ftls-model=local-exec"
9+
CT_MULTILIB=y

‎configs/arm-zephyr-eabi.config

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
CT_CONFIG_VERSION="3"
22
CT_EXPERIMENTAL=y
3-
# CT_PREFIX_DIR_RO is not set
4-
# CT_LOG_PROGRESS_BAR is not set
53
CT_ARCH_ARM=y
64
CT_ARCH_ARM_INTERWORKING=y
7-
CT_MULTILIB=y
85
CT_TARGET_VENDOR="zephyr"
96
CT_TARGET_CFLAGS="-ftls-model=local-exec"
7+
CT_MULTILIB=y
108
CT_CC_GCC_MULTILIB_LIST="rmprofile"
119
CT_LIBC_NEWLIB_NANO_TARGET_CFLAGS="-mthumb-interwork"

‎configs/microblazeel-zephyr-elf.config

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
CT_CONFIG_VERSION="3"
22
CT_EXPERIMENTAL=y
3-
# CT_PREFIX_DIR_RO is not set
4-
# CT_LOG_PROGRESS_BAR is not set
53
CT_ARCH_MICROBLAZE=y
64
CT_ARCH_LE=y
7-
CT_MULTILIB=y
85
CT_TARGET_CFLAGS="-G0 -fno-pic"
96
CT_TARGET_VENDOR="zephyr"
10-
# NOTE: Picolibc was not previously enabled for this toolchain, but it now is.
7+
CT_MULTILIB=y

‎configs/mips-zephyr-elf.config

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
CT_CONFIG_VERSION="3"
22
CT_EXPERIMENTAL=y
3-
# CT_PREFIX_DIR_RO is not set
4-
# CT_LOG_PROGRESS_BAR is not set
53
CT_ARCH_MIPS=y
6-
CT_MULTILIB=y
74
CT_TARGET_CFLAGS="-G0 -mno-gpopt -ftls-model=local-exec"
85
CT_TARGET_VENDOR="zephyr"
6+
CT_MULTILIB=y
97
CT_CC_GCC_CONFIG_TLS=n

‎configs/nios2-zephyr-elf.config

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
CT_CONFIG_VERSION="3"
22
CT_EXPERIMENTAL=y
3-
# CT_PREFIX_DIR_RO is not set
4-
# CT_LOG_PROGRESS_BAR is not set
53
CT_ARCH_NIOS2=y
6-
CT_MULTILIB=y
74
CT_ARCH_USE_MMU=y
85
CT_TARGET_VENDOR="zephyr"
96
CT_TARGET_CFLAGS="-ftls-model=local-exec"
7+
CT_MULTILIB=y
108
CT_CC_GCC_CONFIG_TLS=n

‎configs/riscv64-zephyr-elf.config

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
CT_CONFIG_VERSION="3"
22
CT_EXPERIMENTAL=y
3-
# CT_PREFIX_DIR_RO is not set
4-
# CT_LOG_PROGRESS_BAR is not set
53
CT_ARCH_RISCV=y
6-
CT_MULTILIB=y
74
CT_ARCH_64=y
85
CT_ARCH_ARCH="rv32ima_zicsr_zifencei"
96
CT_ARCH_ABI="ilp32"
107
CT_TARGET_VENDOR="zephyr"
118
CT_TARGET_CFLAGS="-ftls-model=local-exec"
9+
CT_MULTILIB=y

‎configs/sparc-zephyr-elf.config

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
CT_CONFIG_VERSION="3"
22
CT_EXPERIMENTAL=y
3-
# CT_PREFIX_DIR_RO is not set
4-
# CT_LOG_PROGRESS_BAR is not set
53
CT_ARCH_SPARC=y
6-
CT_MULTILIB=y
74
CT_TARGET_VENDOR="zephyr"
85
CT_TARGET_CFLAGS="-ftls-model=local-exec"
6+
CT_MULTILIB=y

‎configs/x86_64-zephyr-elf.config

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
CT_CONFIG_VERSION="3"
22
CT_EXPERIMENTAL=y
3-
# CT_PREFIX_DIR_RO is not set
4-
# CT_LOG_PROGRESS_BAR is not set
53
CT_ARCH_X86=y
6-
CT_MULTILIB=y
74
CT_ARCH_64=y
85
CT_TARGET_VENDOR="zephyr"
96
CT_TARGET_CFLAGS="-ftls-model=local-exec"
7+
CT_MULTILIB=y
108
CT_BINUTILS_EXTRA_CONFIG_ARRAY="--enable-targets=x86_64-pep"
119
CT_CC_GCC_EXTRA_CONFIG_ARRAY="--with-gnu-ld --with-gnu-as --enable-initfini-array --with-cpu-32=i586 --with-arch-32=i586 --with-cpu-64=generic --with-arch-64=x86-64"

0 commit comments

Comments
 (0)