Commit ff8ec298 authored by sbc's avatar sbc Committed by Commit bot

Switch default float-abi for ARM linux from softfp to hard

All the ARM linux builders already specify this, and
armhf is the now the default for both Ubuntu and Debian.

Followup cleanup cl for the bots:
https://codereview.chromium.org/1141643004/

BUG=308256

Review URL: https://codereview.chromium.org/1140503004

Cr-Commit-Position: refs/heads/master@{#330316}
parent 87005b3c
...@@ -2311,9 +2311,12 @@ ...@@ -2311,9 +2311,12 @@
}, { }, {
'arm_fpu%': 'vfpv3-d16', 'arm_fpu%': 'vfpv3-d16',
}], }],
['OS=="android"', {
'arm_float_abi%': 'softfp',
}, {
'arm_float_abi%': 'hard',
}],
], ],
# Change the default to hard once the armhf transition is complete.
'arm_float_abi%': 'softfp',
'arm_thumb%': 1, 'arm_thumb%': 1,
}], }],
......
...@@ -210,7 +210,6 @@ def GypNinjaBuild(arch, gyp_py_script, gyp_file, targets, out_dir): ...@@ -210,7 +210,6 @@ def GypNinjaBuild(arch, gyp_py_script, gyp_file, targets, out_dir):
gyp_defines.append('target_arch=%s' % arch) gyp_defines.append('target_arch=%s' % arch)
if arch == 'arm': if arch == 'arm':
gyp_env['GYP_CROSSCOMPILE'] = '1' gyp_env['GYP_CROSSCOMPILE'] = '1'
gyp_defines += ['arm_float_abi=hard']
if options.no_arm_trusted: if options.no_arm_trusted:
gyp_defines.append('disable_cross_trusted=1') gyp_defines.append('disable_cross_trusted=1')
if PLATFORM == 'mac': if PLATFORM == 'mac':
......
...@@ -561,7 +561,6 @@ def GypNinjaBuild(arch, gyp_py_script, gyp_file, targets, ...@@ -561,7 +561,6 @@ def GypNinjaBuild(arch, gyp_py_script, gyp_file, targets,
gyp_defines.append('target_arch=%s' % arch) gyp_defines.append('target_arch=%s' % arch)
if arch == 'arm': if arch == 'arm':
gyp_env['GYP_CROSSCOMPILE'] = '1' gyp_env['GYP_CROSSCOMPILE'] = '1'
gyp_defines.append('arm_float_abi=hard')
if options.no_arm_trusted: if options.no_arm_trusted:
gyp_defines.append('disable_cross_trusted=1') gyp_defines.append('disable_cross_trusted=1')
if getos.GetPlatform() == 'mac': if getos.GetPlatform() == 'mac':
......
...@@ -189,8 +189,7 @@ class GypNinjaPosixTestCase(BasePosixTestCase): ...@@ -189,8 +189,7 @@ class GypNinjaPosixTestCase(BasePosixTestCase):
'GYP_CROSSCOMPILE': '1', 'GYP_CROSSCOMPILE': '1',
'GYP_GENERATORS': 'ninja', 'GYP_GENERATORS': 'ninja',
'GYP_DEFINES': ' '.join(self.gyp_defines_base + 'GYP_DEFINES': ' '.join(self.gyp_defines_base +
['target_arch=arm', ['target_arch=arm']),
'arm_float_abi=hard']),
}), }),
call(['ninja', '-C', 'out_dir/Release', 'target'], cwd='src_dir') call(['ninja', '-C', 'out_dir/Release', 'target'], cwd='src_dir')
]) ])
...@@ -209,7 +208,6 @@ class GypNinjaPosixTestCase(BasePosixTestCase): ...@@ -209,7 +208,6 @@ class GypNinjaPosixTestCase(BasePosixTestCase):
'GYP_GENERATORS': 'ninja', 'GYP_GENERATORS': 'ninja',
'GYP_DEFINES': ' '.join(self.gyp_defines_base + 'GYP_DEFINES': ' '.join(self.gyp_defines_base +
['target_arch=arm', ['target_arch=arm',
'arm_float_abi=hard',
'disable_cross_trusted=1']), 'disable_cross_trusted=1']),
}), }),
call(['ninja', '-C', 'out_dir/Release', 'target'], cwd='src_dir') call(['ninja', '-C', 'out_dir/Release', 'target'], cwd='src_dir')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment