dmd.diff

diff --git a/Cargo.lock b/Cargo.lock
index b0818bf..28e1cd1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -23,6 +23,15 @@ dependencies = [
 ]
 
 [[package]]
+name = "alloc-jemalloc-dmd"
+version = "0.0.0"
+source = "git+https://github.com/jdm/alloc-jemalloc#ef0d52ba9c28a654e254b126fe560fe5bc0c149b"
+dependencies = [
+ "gcc 0.3.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
 name = "alloc-no-stdlib"
 version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -130,7 +139,7 @@ name = "backtrace-sys"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "gcc 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.41 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -349,7 +358,7 @@ name = "cmake"
 version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "gcc 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.41 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -878,7 +887,7 @@ dependencies = [
 
 [[package]]
 name = "gcc"
-version = "0.3.40"
+version = "0.3.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1440,7 +1449,12 @@ dependencies = [
 [[package]]
 name = "libc"
 version = "0.2.18"
+
+[[package]]
+name = "libc"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+replace = "libc 0.2.18"
 
 [[package]]
 name = "libloading"
@@ -1513,7 +1527,7 @@ name = "libz-sys"
 version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "gcc 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.41 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1549,12 +1563,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "memchr"
 version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
+name = "memchr"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+replace = "memchr 1.0.1"
+
+[[package]]
 name = "memmap"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1590,7 +1609,7 @@ name = "miniz-sys"
 version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "gcc 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.41 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1914,7 +1933,7 @@ version = "0.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gcc 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.41 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssl-sys 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1938,7 +1957,7 @@ name = "openssl-sys-extras"
 version = "0.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "gcc 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.41 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssl-sys 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2086,6 +2105,7 @@ dependencies = [
 name = "profile"
 version = "0.0.1"
 dependencies = [
+ "alloc-jemalloc-dmd 0.0.0 (git+https://github.com/jdm/alloc-jemalloc)",
  "heartbeats-simple 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2475,6 +2495,7 @@ dependencies = [
 name = "servo"
 version = "0.0.1"
 dependencies = [
+ "alloc-jemalloc-dmd 0.0.0 (git+https://github.com/jdm/alloc-jemalloc)",
  "android_glue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "android_injected_glue 0.2.1 (git+https://github.com/mmatyas/android-rs-injected-glue)",
  "backtrace 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2927,7 +2948,7 @@ dependencies = [
 name = "task_info"
 version = "0.0.1"
 dependencies = [
- "gcc 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.41 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -3009,7 +3030,7 @@ name = "tinyfiledialogs"
 version = "2.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "gcc 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.41 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -3384,6 +3405,7 @@ dependencies = [
 [metadata]
 "checksum adler32 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "57be033eb4100070a93a9400a725839cda9c415244f808b0357e72b9e003d5ba"
 "checksum aho-corasick 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4f660b942762979b56c9f07b4b36bb559776fbad102f05d6771e1b629e8fd5bf"
+"checksum alloc-jemalloc-dmd 0.0.0 (git+https://github.com/jdm/alloc-jemalloc)" = "<none>"
 "checksum alloc-no-stdlib 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b21f6ad9c9957eb5d70c3dee16d31c092b3cab339628f821766b05e6833d72b8"
 "checksum android_glue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e2b80445d331077679dfc6f3014f3e9ab7083e588423d35041d3fc017198189"
 "checksum android_injected_glue 0.2.1 (git+https://github.com/mmatyas/android-rs-injected-glue)" = "<none>"
@@ -3461,7 +3483,7 @@ dependencies = [
 "checksum fs2 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "bcd414e5a1a979b931bb92f41b7a54106d3f6d2e6c253e9ce943b7cd468251ef"
 "checksum futf 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7a9689380a2553b51c564b3d9178075c68ebd0b397972c783acfd28b46c28ad"
 "checksum gaol 0.0.1 (git+https://github.com/servo/gaol)" = "<none>"
-"checksum gcc 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "872db9e59486ef2b14f8e8c10e9ef02de2bccef6363d7f34835dedb386b3d950"
+"checksum gcc 0.3.41 (registry+https://github.com/rust-lang/crates.io-index)" = "3689e1982a563af74960ae3a4758aa632bb8fd984cfc3cc3b60ee6109477ab6e"
 "checksum gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0912515a8ff24ba900422ecda800b52f4016a56251922d397c576bf92c690518"
 "checksum getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9047cfbd08a437050b363d35ef160452c5fe8ea5187ae0a624708c91581d685"
 "checksum gif 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "01c7c19a035de94bd7afbaa62c241aadfbdf1a70f560b348d2312eafa566ca16"
diff --git a/Cargo.toml b/Cargo.toml
index a686273..ff823e1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,3 +14,8 @@ opt-level = 3
 # Uncomment to profile on Linux:
 # debug = true
 # lto = false
+
+[replace]
+"libc:0.2.18" = {path = "/Users/jdm/src/libc"}
+"memchr:1.0.1" = {path = "/Users/jdm/src/rust-memchr"}
+"alloc-jemalloc-dmd:0.0.0" = {path = "/Users/jdm/src/alloc-jemalloc"}
\ No newline at end of file
diff --git a/components/gfx/lib.rs b/components/gfx/lib.rs
index e02793c..ef8393d 100644
--- a/components/gfx/lib.rs
+++ b/components/gfx/lib.rs
@@ -15,6 +15,7 @@
 
 #![deny(unsafe_code)]
 
+#[cfg(any(target_os = "linux", target_os = "android"))]
 extern crate alloc;
 extern crate app_units;
 #[allow(unused_extern_crates)]
diff --git a/components/profile/Cargo.toml b/components/profile/Cargo.toml
index 9dbb1a5..f0ca905 100644
--- a/components/profile/Cargo.toml
+++ b/components/profile/Cargo.toml
@@ -20,6 +20,7 @@ serde_derive = "0.8"
 serde_json = "0.8"
 servo_config = {path = "../config", features = ["servo"]}
 time = "0.1.12"
+alloc-jemalloc-dmd = {git = "https://github.com/jdm/alloc-jemalloc"}
 
 [target.'cfg(target_os = "macos")'.dependencies]
 task_info = {path = "../../support/rust-task_info"}
diff --git a/components/profile/lib.rs b/components/profile/lib.rs
index dbcb5bf..3b59e8d 100644
--- a/components/profile/lib.rs
+++ b/components/profile/lib.rs
@@ -11,7 +11,7 @@
 
 #[allow(unused_extern_crates)]
 #[cfg(not(target_os = "windows"))]
-extern crate alloc_jemalloc;
+extern crate alloc_jemalloc_dmd;
 extern crate heartbeats_simple;
 extern crate ipc_channel;
 #[cfg(not(target_os = "windows"))]
diff --git a/ports/servo/Cargo.toml b/ports/servo/Cargo.toml
index cfaaa2f..77d9eb7 100644
--- a/ports/servo/Cargo.toml
+++ b/ports/servo/Cargo.toml
@@ -42,6 +42,7 @@ glutin_app = {path = "../../ports/glutin"}
 log = "0.3"
 libservo = {path = "../../components/servo"}
 phf_macros = "0.7.19"
+alloc-jemalloc-dmd = {git = "https://github.com/jdm/alloc-jemalloc"}
 
 [target.'cfg(not(target_os = "android"))'.dependencies]
 sig = "0.1"
diff --git a/ports/servo/main.rs b/ports/servo/main.rs
index cefc093..fb10b37 100644
--- a/ports/servo/main.rs
+++ b/ports/servo/main.rs
@@ -17,6 +17,7 @@
 
 #![feature(start, core_intrinsics)]
 
+extern crate alloc_jemalloc_dmd;
 #[cfg(target_os = "android")]
 #[macro_use]
 extern crate android_glue;