commit bf1b64204afbc1f395943972e2439e503fa8b143
author Manoj Gupta <manojgupta@google.com> Mon Nov 08 09:50:20 2021 -0800
committer Manoj Gupta <manojgupta@chromium.org> Thu Apr 07 15:53:51 2022 +0000
tree 0366c55a9893ae4fe780b6f081ed4696f4157c6e
parent ee7927a81bfd97f5b796caca365f505ecb9f9bbd

cros_setup_toolchains: Add compiler-rt to arm-none-eabi

BUG=b:205342596
TEST=sudo `which cros_setup_toolchains` -t arm-none-eabi --nousepkg

Change-Id: I52338e2f913744a56fab174e4be919f61ac82a9b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3268346
Reviewed-by: Tom Hughes <tomhughes@chromium.org>
Reviewed-by: Chris McDonald <cjmcdonald@chromium.org>
Tested-by: Manoj Gupta <manojgupta@chromium.org>

scripts/cros_setup_toolchains.py

diff --git a/scripts/cros_setup_toolchains.py b/scripts/cros_setup_toolchains.py
index 5356c5d..bb91a19 100644
--- a/scripts/cros_setup_toolchains.py
+++ b/scripts/cros_setup_toolchains.py
@@ -93,6 +93,7 @@
     'armv7a-cros-linux-gnueabi',
     'armv7a-cros-linux-gnueabihf',
     'aarch64-cros-linux-gnu',
+    'arm-none-eabi',
     'armv7m-cros-eabi',
 )
 CROSSDEV_COMPILER_RT_ARGS = ['--ex-pkg', 'sys-libs/compiler-rt']
@@ -1373,6 +1374,17 @@
   boards_wanted = (set(options.include_boards.split(','))
                    if options.include_boards else set())
 
+  # pylint: disable=global-statement
+  # Disable installing compiler-rt library till new binary prebuilt package is
+  # available for arm-none-eabi tuple. TODO(b/205342596): Remove once done.
+  global TARGET_COMPILER_RT_ENABLED
+  if options.usepkg:
+    TARGET_COMPILER_RT_ENABLED = (
+        'armv7a-cros-linux-gnueabi',
+        'armv7a-cros-linux-gnueabihf',
+        'aarch64-cros-linux-gnu',
+        'armv7m-cros-eabi',
+    )
   if options.cfg_name:
     ShowConfig(options.cfg_name)
   elif options.show_packages is not None: