Revert "configs: common: enable c++11 thread support via c11 threads"

This reverts commit 8dee616. Signed-off-by: Stephanos Ioannidis <[email protected]>
zephyrproject-rtos · May 6, 2024 · 544165b · 544165b
1 parent c744a06
commit 544165b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/configs/aarch64-zephyr-elf.config b/configs/aarch64-zephyr-elf.config
@@ -5,4 +5,4 @@ CT_ARCH_64=y
 CT_TARGET_VENDOR="zephyr"
 CT_TARGET_CFLAGS="-moverride=tune=no_ldp_stp_qregs -ftls-model=local-exec"
 CT_MULTILIB=y
-CT_GDB_CROSS_EXTRA_CONFIG_ARRAY="--enable-targets=arm-zephyr-eabi --enable-threads=c11 --enable-libstdcxx-time=c11 --enable-libstdcxx-threads"
+CT_GDB_CROSS_EXTRA_CONFIG_ARRAY="--enable-targets=arm-zephyr-eabi"
diff --git a/configs/common.config b/configs/common.config
@@ -15,11 +15,8 @@ CT_GDB_CUSTOM_LOCATION="${GITHUB_WORKSPACE}/gdb"
 # GCC
 CT_GCC_SRC_CUSTOM=y
 CT_GCC_CUSTOM_LOCATION="${GITHUB_WORKSPACE}/gcc"
-# NOTE: --enable-threads=c11 is still necessary here to override the value inherited by
-# build/cc/gcc.sh with baremetal "mode"
-CT_CC_GCC_EXTRA_CONFIG_ARRAY="--with-gnu-ld --with-gnu-as --enable-initfini-array --enable-threads=c11 --enable-libstdcxx-time=c11 --enable-libstdcxx-threads"
+CT_CC_GCC_EXTRA_CONFIG_ARRAY="--with-gnu-ld --with-gnu-as --enable-initfini-array"
 CT_CC_LANG_CXX=y
-CT_THREADS_C11=y
 
 # Newlib
 CT_NEWLIB_SRC_CUSTOM=y

diff --git a/configs/x86_64-zephyr-elf.config b/configs/x86_64-zephyr-elf.config
@@ -6,4 +6,4 @@ CT_TARGET_VENDOR="zephyr"
 CT_TARGET_CFLAGS="-ftls-model=local-exec"
 CT_MULTILIB=y
 CT_BINUTILS_EXTRA_CONFIG_ARRAY="--enable-targets=x86_64-pep"
-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  --enable-threads=c11 --enable-libstdcxx-time=c11 --enable-libstdcxx-threads"
+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"
diff --git a/gcc b/gcc
+0 −1		config/gthr.m4
+1 −1		gcc/configure
+1 −1		gcc/configure.ac
+0 −1		libgcc/configure
+0 −258		libgcc/gthr-c11.h
+2 −19		libstdc++-v3/acinclude.m4
+2 −34		libstdc++-v3/configure
+0 −7		libstdc++-v3/include/Makefile.am
+0 −9		libstdc++-v3/include/Makefile.in
+0 −1		libstdc++-v3/include/bits/std_thread.h
+1 −12		libstdc++-v3/include/bits/this_thread_sleep.h
+0 −7		libstdc++-v3/src/c++11/thread.cc