diff options
| author | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-03-18 01:11:49 +0300 |
|---|---|---|
| committer | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-03-18 01:11:49 +0300 |
| commit | 5b08edd14a8f5f26c14b6875021305b4d9095ef5 (patch) | |
| tree | cb64803d14b5d64dde4d347ef7e463c0f475e12f /build/ymake_conf.py | |
| parent | 2fbdf1c88f149f6e23c2363c649cda6f8ff21c92 (diff) | |
| download | ydb-5b08edd14a8f5f26c14b6875021305b4d9095ef5.tar.gz | |
intermediate changes
ref:9995783bf7080e5bb8f9d36fb4ff84c2fc5e00f5
Diffstat (limited to 'build/ymake_conf.py')
| -rwxr-xr-x | build/ymake_conf.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/build/ymake_conf.py b/build/ymake_conf.py index 8538165326..50dd03ea7e 100755 --- a/build/ymake_conf.py +++ b/build/ymake_conf.py @@ -54,13 +54,13 @@ class Platform(object): self.is_x86_64 = self.arch in ('x86_64', 'amd64') self.is_intel = self.is_x86 or self.is_x86_64 - self.is_armv7 = self.arch in ('armv7', 'armv7a', 'armv7a_neon', 'arm', 'armv7a_cortex_a9', 'armv7ahf_cortex_a35', 'armv7ahf_cortex_a53') + self.is_armv7 = self.arch in ('armv7', 'armv7a', 'armv7ahf', 'armv7a_neon', 'arm', 'armv7a_cortex_a9', 'armv7ahf_cortex_a35', 'armv7ahf_cortex_a53') self.is_armv8 = self.arch in ('armv8', 'armv8a', 'arm64', 'aarch64', 'armv8a_cortex_a35', 'armv8a_cortex_a53') self.is_armv8m = self.arch in ('armv8m_cortex_m33',) self.is_arm64 = self.arch in ('arm64',) self.is_arm = self.is_armv7 or self.is_armv8 or self.is_armv8m - self.is_armv7_neon = self.arch in ('armv7a_neon', 'armv7a_cortex_a9', 'armv7ahf_cortex_a35', 'armv7ahf_cortex_a53') - self.is_armv7hf = self.arch in ('armv7ahf_cortex_a35', 'armv7ahf_cortex_a53') + self.is_armv7_neon = self.arch in ('armv7a_neon', 'armv7ahf', 'armv7a_cortex_a9', 'armv7ahf_cortex_a35', 'armv7ahf_cortex_a53') + self.is_armv7hf = self.arch in ('armv7ahf', 'armv7ahf_cortex_a35', 'armv7ahf_cortex_a53') self.armv7_float_abi = None if self.is_armv7: @@ -1160,8 +1160,8 @@ class GnuToolchain(Toolchain): target_triple = select(default=None, selectors=[ (target.is_linux and target.is_x86_64, 'x86_64-linux-gnu'), (target.is_linux and target.is_armv8, 'aarch64-linux-gnu'), - (target.is_linux and target.is_armv7 and target.armv7_float_abi == 'hard', 'arm-linux-gnueabihf'), - (target.is_linux and target.is_armv7 and target.armv7_float_abi == 'softfp', 'arm-linux-gnueabi'), + (target.is_linux and target.is_armv7 and target.armv7_float_abi == 'hard', 'armv7-linux-gnueabihf'), + (target.is_linux and target.is_armv7 and target.armv7_float_abi == 'softfp', 'armv7-linux-gnueabi'), (target.is_linux and target.is_powerpc, 'powerpc64le-linux-gnu'), (target.is_iossim and target.is_arm64, 'arm64-apple-ios{}-simulator'.format(ios_version_min)), (target.is_apple and target.is_x86, 'i386-apple-darwin14'), |