summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorChris Packham <judge.packham@gmail.com>2021-06-19 23:34:25 (GMT)
committerChris Packham <judge.packham@gmail.com>2021-06-19 23:37:00 (GMT)
commit96d8a0588f8fedf881d5acd3c3ad0c3f4610c34b (patch)
treef38f9e471c9dc7e12f2fb178a59f277a3699c645 /scripts
parent5ab29fbf3e4e4dbd71ea9d01d15f6a575bd71562 (diff)
gcc: Make CC_GCC_TM_CLONE_REGISTRY tristate
Explicitly passing --disable-tm-clone-registry causes gcc to create a crtbegin.o with a zero-sized .init_array/.fini_array. This in turn causes ld to complain. Make CC_GCC_TM_CLONE_REGISTRY a tristate so if it's not explicitly enabled we can let ./configure decide. Fixes #1531 Fixes: 1e21a302 ("gcc: Add CT_CC_GCC_TM_CLONE_REGISTRY config") Signed-off-by: Chris Packham <judge.packham@gmail.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/build/cc/gcc.sh20
1 files changed, 10 insertions, 10 deletions
diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh
index 8aa7eeb..e39029d 100644
--- a/scripts/build/cc/gcc.sh
+++ b/scripts/build/cc/gcc.sh
@@ -397,11 +397,11 @@ do_gcc_core_backend() {
extra_config+=("--disable-__cxa_atexit")
fi
- if [ "${CT_CC_GCC_TM_CLONE_REGISTRY}" = "y" ]; then
- extra_config+=("--enable-tm-clone-registry")
- else
- extra_config+=("--disable-tm-clone-registry")
- fi
+ case "${CT_CC_GCC_TM_CLONE_REGISTRY}" in
+ y) extra_config+=("--enable-tm-clone-registry");;
+ m) ;;
+ "") extra_config+=("--disable-tm-clone-registry");;
+ esac
if [ -n "${CT_CC_GCC_ENABLE_CXX_FLAGS}" \
-a "${mode}" = "baremetal" ]; then
@@ -1021,11 +1021,11 @@ do_gcc_backend() {
extra_config+=("--disable-__cxa_atexit")
fi
- if [ "${CT_CC_GCC_TM_CLONE_REGISTRY}" = "y" ]; then
- extra_config+=("--enable-tm-clone-registry")
- else
- extra_config+=("--disable-tm-clone-registry")
- fi
+ case "${CT_CC_GCC_TM_CLONE_REGISTRY}" in
+ y) extra_config+=("--enable-tm-clone-registry");;
+ m) ;;
+ "") extra_config+=("--disable-tm-clone-registry");;
+ esac
if [ -n "${CT_CC_GCC_ENABLE_CXX_FLAGS}" ]; then
extra_config+=("--enable-cxx-flags=${CT_CC_GCC_ENABLE_CXX_FLAGS}")