Commit be5c293
build: allow x86_64 as a dest_cpu alias for x64
x86_64 is a standard arch descriptor on Linux, allow it as an alias for
our preferred descriptor: x64
PR-URL: #18052
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>1 parent a7ad003 commit be5c293
1 file changed
Lines changed: 4 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -61,7 +61,7 @@ parser = optparse.OptionParser() | |||
| 61 | 61 | valid_os = ('win', 'mac', 'solaris', 'freebsd', 'openbsd', 'linux', | |
| 62 | 62 | 'android', 'aix', 'cloudabi') | |
| 63 | 63 | valid_arch = ('arm', 'arm64', 'ia32', 'mips', 'mipsel', 'mips64el', 'ppc', | |
| 64 | - 'ppc64', 'x32','x64', 'x86', 's390', 's390x') | ||
| 64 | + 'ppc64', 'x32','x64', 'x86', 'x86_64', 's390', 's390x') | ||
| 65 | 65 | valid_arm_float_abi = ('soft', 'softfp', 'hard') | |
| 66 | 66 | valid_arm_fpu = ('vfp', 'vfpv3', 'vfpv3-d16', 'neon') | |
| 67 | 67 | valid_mips_arch = ('loongson', 'r1', 'r2', 'r6', 'rx') | |
@@ -861,6 +861,9 @@ def configure_node(o): | |||
| 861 | 861 | # the Makefile resets this to x86 afterward | |
| 862 | 862 | if target_arch == 'x86': | |
| 863 | 863 | target_arch = 'ia32' | |
| 864 | + # x86_64 is common across linuxes, allow it as an alias for x64 | ||
| 865 | + if target_arch == 'x86_64': | ||
| 866 | + target_arch = 'x64' | ||
| 864 | 867 | o['variables']['host_arch'] = host_arch | |
| 865 | 868 | o['variables']['target_arch'] = target_arch | |
| 866 | 869 | o['variables']['node_byteorder'] = sys.byteorder | |
0 commit comments