From dbd25fc41ae646069766e615f24cf794f1306b88 Mon Sep 17 00:00:00 2001
From: Lars Bergstrom <lars@lars.com>
Date: Fri, 25 Mar 2016 10:49:37 -0500
Subject: [PATCH 1/3] Update Cargo to pick up RUSTFLAGS support

---
 cargo-nightly-build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cargo-nightly-build b/cargo-nightly-build
index 22f4d9c4677..9b70db2b655 100644
--- a/cargo-nightly-build
+++ b/cargo-nightly-build
@@ -1 +1 @@
-2016-03-04
+2016-03-23

From 0f1107baef17a97eff70b8e813fd1b7b585e8847 Mon Sep 17 00:00:00 2001
From: Lars Bergstrom <lars@lars.com>
Date: Fri, 25 Mar 2016 10:50:21 -0500
Subject: [PATCH 2/3] Remove rustc wrapper script for gold in favor of using
 RUSTFLAGS

---
 etc/rustc-with-gold          | 2 --
 python/servo/command_base.py | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)
 delete mode 100755 etc/rustc-with-gold

diff --git a/etc/rustc-with-gold b/etc/rustc-with-gold
deleted file mode 100755
index 077aa7f0d0b..00000000000
--- a/etc/rustc-with-gold
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-rustc -C link-args=-fuse-ld=gold "$@"
diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index 2c980c276aa..35c35cfe6e9 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -385,7 +385,7 @@ class CommandBase(object):
         # Don't run the gold linker if on Windows https://github.com/servo/servo/issues/9499
         if self.config["tools"]["rustc-with-gold"] and sys.platform not in ("win32", "msys"):
             if subprocess.call(['which', 'ld.gold'], stdout=PIPE, stderr=PIPE) == 0:
-                env['RUSTC'] = path.join(self.context.topdir, 'etc', 'rustc-with-gold')
+                env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C link-args=-fuse-ld=gold"
 
         return env
 

From e83369dd25361d1b55feee42ddad681cb5e5ba87 Mon Sep 17 00:00:00 2001
From: Lars Bergstrom <lars@lars.com>
Date: Fri, 25 Mar 2016 10:50:54 -0500
Subject: [PATCH 3/3] Enable NEON feature to get hard floats on Android devices

---
 python/servo/build_commands.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index 381186f2086..581bbaf6821 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -225,6 +225,8 @@ class MachCommands(CommandBase):
         build_start = time()
         env = self.build_env()
         if android:
+            # Ensure Rust uses hard floats on Android
+            env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C target-feature=+neon"
             # Build OpenSSL for android
             make_cmd = ["make"]
             if jobs is not None: