Bug 1480834 - 8. Add x86-64 as rust target; r=nalexander r=froydnj
authorJim Chen <nchen@mozilla.com>
Thu, 13 Sep 2018 12:09:26 -0400 (2018-09-13)
changeset 436223 3eff52855cdbccb58c0807f31654de1963f14231
parent 436222 1dd3bc1e9fd754a2e5b434d6f3f491264d2064fc
child 436224 c324bd6eb4bf102541d3eb1b751ee2f7a408fff4
push id34631
push usernerli@mozilla.com
push dateThu, 13 Sep 2018 22:02:04 +0000 (2018-09-13)
treeherdermozilla-central@e923330d5bd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander, froydnj
bugs1480834
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1480834 - 8. Add x86-64 as rust target; r=nalexander r=froydnj Add x86-64 as a rust target so we can build Android for x86-64. Differential Revision: https://phabricator.services.mozilla.com/D5605
layout/style/ServoBindings.toml
taskcluster/ci/toolchain/linux.yml
taskcluster/scripts/misc/repack_rust.py
--- a/layout/style/ServoBindings.toml
+++ b/layout/style/ServoBindings.toml
@@ -23,16 +23,17 @@ args = ["-DOS_LINUX=1"]
 "arch=x86" = ["-m32"]
 "arch=x86_64" = ["-m64"]
 
 [build."os=android"]
 args = ["-DOS_ANDROID=1"]
 "arch=aarch64" = ["--target=aarch64-linux-android"]
 "arch=arm" = ["--target=armv7-linux-androideabi"]
 "arch=x86" = ["--target=i686-linux-android"]
+"arch=x86_64" = ["--target=x86_64-linux-android"]
 
 [build."os=windows"]
 args = [
     "-DOS_WIN=1", "-DWIN32=1",
 ]
 
 [build."os=windows"."env=msvc"]
 args = [
--- a/taskcluster/ci/toolchain/linux.yml
+++ b/taskcluster/ci/toolchain/linux.yml
@@ -547,16 +547,17 @@ linux64-rust-android-1.28:
         script: repack_rust.py
         arguments: [
             '--channel', '1.28.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'armv7-linux-androideabi',
             '--target', 'aarch64-linux-android',
             '--target', 'i686-linux-android',
+            '--target', 'x86_64-linux-android',
         ]
         toolchain-alias: linux64-rust-android
         toolchain-artifact: public/build/rustc.tar.xz
 
 linux64-sccache:
     description: "sccache toolchain build"
     treeherder:
         kind: build
--- a/taskcluster/scripts/misc/repack_rust.py
+++ b/taskcluster/scripts/misc/repack_rust.py
@@ -365,16 +365,17 @@ def repack_cargo(host, channel='nightly'
     shutil.rmtree(install_dir)
 
 
 def expand_platform(name):
     '''Expand a shortcut name to a full Rust platform string.'''
     platforms = {
         'android': "armv7-linux-androideabi",
         'android_x86': "i686-linux-android",
+        'android_x86-64': "x86_64-linux-android",
         'android_aarch64': "aarch64-linux-android",
         'linux64': "x86_64-unknown-linux-gnu",
         'linux32': "i686-unknown-linux-gnu",
         'mac': "x86_64-apple-darwin",
         'macos': "x86_64-apple-darwin",
         'mac64': "x86_64-apple-darwin",
         'mac32': "i686-apple-darwin",
         'win64': "x86_64-pc-windows-msvc",