From dfc1a7d814b323ce032a96431dea1e8b55be2a98 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <japaricious@gmail.com>
Date: Mon, 10 Apr 2017 11:23:03 -0500
Subject: [PATCH] move the compiler-rt submodule to the root

---
 library/compiler-builtins/.gitmodules         | 2 +-
 library/compiler-builtins/build.rs            | 3 +--
 library/compiler-builtins/{c => }/compiler-rt | 0
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename library/compiler-builtins/{c => }/compiler-rt (100%)

diff --git a/library/compiler-builtins/.gitmodules b/library/compiler-builtins/.gitmodules
index ed1a78f9fb34..bbdcf701cd61 100644
--- a/library/compiler-builtins/.gitmodules
+++ b/library/compiler-builtins/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "compiler-rt/compiler-rt-cdylib/compiler-rt"]
-	path = c/compiler-rt
+	path = compiler-rt
 	url = https://github.com/rust-lang/compiler-rt
diff --git a/library/compiler-builtins/build.rs b/library/compiler-builtins/build.rs
index 145f71575d25..46aa05e77495 100644
--- a/library/compiler-builtins/build.rs
+++ b/library/compiler-builtins/build.rs
@@ -37,7 +37,6 @@ mod c {
 
     use std::collections::BTreeMap;
     use std::env;
-    use std::io::Write;
     use std::path::Path;
 
     struct Sources {
@@ -413,7 +412,7 @@ mod c {
             Path::new(".")
         };
 
-        let src_dir = root.join("c/compiler-rt/lib/builtins");
+        let src_dir = root.join("compiler-rt/lib/builtins");
         for src in sources.map.values() {
             let src = src_dir.join(src);
             cfg.file(&src);
diff --git a/library/compiler-builtins/c/compiler-rt b/library/compiler-builtins/compiler-rt
similarity index 100%
rename from library/compiler-builtins/c/compiler-rt
rename to library/compiler-builtins/compiler-rt