summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Packham <judge.packham@gmail.com>2021-06-09 08:11:30 (GMT)
committerGitHub <noreply@github.com>2021-06-09 08:11:30 (GMT)
commite7139130295097ce05d9c7b3dcbb890c3a084975 (patch)
tree5b4c270629c046bfadda993bc9aa86af888d5e3d
parent6dd60ca6947395b41e09fcf2488066651fb8119a (diff)
parent1e21a30287d8d50d8425ce4debf1cf493371a6cf (diff)
Merge pull request #1523 from stephanosio/add_tm_clone_registry_config_upstream
gcc: Add CT_CC_GCC_TM_CLONE_REGISTRY config
-rw-r--r--config/cc/gcc.in7
-rw-r--r--packages/gcc/package.desc2
-rw-r--r--scripts/build/cc/gcc.sh12
3 files changed, 20 insertions, 1 deletions
diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index 01d7253..8180b2a 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -279,6 +279,13 @@ config CC_CXA_ATEXIT
If you get the missing symbol "__cxa_atexit" when building C++ programs,
you might want to try disabling this option.
+config CC_GCC_TM_CLONE_REGISTRY
+ bool
+ prompt "Use TM clone registry"
+ depends on GCC_10_or_later
+ help
+ Enable GCC transactional memory clone registry in libgcc.
+
config CC_GCC_DISABLE_PCH
bool
prompt "Do not build PCH"
diff --git a/packages/gcc/package.desc b/packages/gcc/package.desc
index 0ee344e..186f1a3 100644
--- a/packages/gcc/package.desc
+++ b/packages/gcc/package.desc
@@ -2,5 +2,5 @@ repository='svn svn://gcc.gnu.org/svn/gcc'
mirrors='$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})'
relevantpattern='4.*|. *|.'
origin='GNU'
-milestones='4.8 4.9 5 6 7 8 11'
+milestones='4.8 4.9 5 6 7 8 9 10 11'
archive_formats='.tar.xz .tar.gz'
diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh
index cccd654..c505314 100644
--- a/scripts/build/cc/gcc.sh
+++ b/scripts/build/cc/gcc.sh
@@ -396,6 +396,12 @@ 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
+
if [ -n "${CT_CC_GCC_ENABLE_CXX_FLAGS}" \
-a "${mode}" = "baremetal" ]; then
extra_config+=("--enable-cxx-flags=${CT_CC_GCC_ENABLE_CXX_FLAGS}")
@@ -998,6 +1004,12 @@ 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
+
if [ -n "${CT_CC_GCC_ENABLE_CXX_FLAGS}" ]; then
extra_config+=("--enable-cxx-flags=${CT_CC_GCC_ENABLE_CXX_FLAGS}")
fi