Skip to content

Commit

Permalink
Linux prebuilts: switch to arm-linux-gnueabihf on linux-arm
Browse files Browse the repository at this point in the history
Switch the arm-32-bit sysroot to use arm-linux-gnueabihf.
All the targets we care about seem to support a HW-FPU.

Bug: 194266474
Bug: 177349647
Change-Id: I9c7b604493269dcf132d0375cd40ac9fec029b7e
  • Loading branch information
primiano committed Aug 3, 2021
1 parent 171e281 commit e8f75d0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 13 deletions.
8 changes: 2 additions & 6 deletions gn/standalone/toolchain/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,9 @@ declare_args() {
_default_target_sysroot =
rebase_path("//buildtools/debian_sid_arm64-sysroot", root_build_dir)
} else if (target_os == "linux" && target_cpu == "arm") {
# TODO(primiano): Using "arm-linux-gnueabi" seems too conservative here, I
# think we should default to "arm-linux-gnueabihf" (which assumes a hw FPU).
# For now sticking with the value introduced by r.android.com/1347306.
# Check with chinglinyu@ and ARM and consider changing it.
_target_triplet = "arm-linux-gnueabi"
_target_triplet = "arm-linux-gnueabihf"
_default_target_sysroot =
rebase_path("//buildtools/debian_sid_armel-sysroot", root_build_dir)
rebase_path("//buildtools/debian_sid_arm-sysroot", root_build_dir)
} else if (target_os == "linux" && target_cpu == "x64") {
_target_triplet = "x86_64-linux-gnu"
} else if (target_os == "linux" && target_cpu == "x86") {
Expand Down
7 changes: 0 additions & 7 deletions tools/install-build-deps
Original file line number Diff line number Diff line change
Expand Up @@ -335,13 +335,6 @@ UI_DEPS = [
# Sysroots required to cross-compile Linux targets (linux-arm{,64}).
# These are taken from Chromium's build/linux/sysroot_scripts/sysroots.json.
BUILD_DEPS_LINUX_CROSS_SYSROOTS = [
# TODO(primiano): I doubt anybody cares about the non-hw-FPU armel ABI.
# Consider dropping it, check first with CrOS and ARM folks.
Dependency(
'buildtools/debian_sid_armel-sysroot.tgz',
'https://commondatastorage.googleapis.com/chrome-linux-sysroot/toolchain/a0e2a51aaa7d779fc45415ac30c835b67caa6663/debian_sid_armel_sysroot.tar.xz',
'63d720325f6b3839020ad0a0d3baa4fcbedabb3e057ea029a8802c7391b25269',
'linux', 'all'),
Dependency(
'buildtools/debian_sid_arm-sysroot.tgz',
'https://commondatastorage.googleapis.com/chrome-linux-sysroot/toolchain/11d6f690ca49e8ba01a1d8c5346cedad2cf308fd/debian_sid_arm_sysroot.tar.xz',
Expand Down

0 comments on commit e8f75d0

Please sign in to comment.