From: Rust Maintainers <pkg-rust-maintainers@lists.alioth.debian.org>
Date: Wed, 4 Jan 2017 20:34:56 +0000 (+0000)
Subject: u-detect-mips-cpu
X-Git-Tag: archive/raspbian/1.17.0+dfsg2-8+rpi1~2^2^2^2~8
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9526d469971ecd98d15c2d8e0043288314d049e5;p=rustc.git

u-detect-mips-cpu


Gbp-Pq: Name u-detect-mips-cpu.patch
---

diff --git a/configure b/configure
index 85a3dd4b93..9ce1f168fc 100755
--- a/configure
+++ b/configure
@@ -388,6 +388,7 @@ msg "inspecting environment"
 
 CFG_OSTYPE=$(uname -s)
 CFG_CPUTYPE=$(uname -m)
+ENDIAN=$(printf '\1' | od -dAn)
 
 if [ $CFG_OSTYPE = Darwin -a $CFG_CPUTYPE = i386 ]
 then
@@ -541,6 +542,17 @@ case $CFG_CPUTYPE in
         CFG_CPUTYPE=x86_64
         ;;
 
+    mips | mips64)
+        if [ "$CFG_CPUTYPE" = "mips64" ]; then
+            CFG_OSTYPE="${CFG_OSTYPE}abi64"
+        fi
+        if [ "$ENDIAN" -eq 1 ]; then
+            CFG_CPUTYPE="${CFG_CPUTYPE}el"
+        elif [ "$ENDIAN" -ne 256 ]; then
+            err "unknown endianness: $ENDIAN (expecting 1 for little or 256 for big)"
+        fi
+        ;;
+
     BePC)
         CFG_CPUTYPE=i686
         ;;
diff --git a/src/test/run-pass/conditional-compile-arch.rs b/src/test/run-pass/conditional-compile-arch.rs
index 368ffe6e71..24c461d5f5 100644
--- a/src/test/run-pass/conditional-compile-arch.rs
+++ b/src/test/run-pass/conditional-compile-arch.rs
@@ -22,6 +22,12 @@ pub fn main() { }
 #[cfg(target_arch = "aarch64")]
 pub fn main() { }
 
+#[cfg(target_arch = "mips")]
+pub fn main() { }
+
+#[cfg(target_arch = "mips64")]
+pub fn main() { }
+
 #[cfg(target_arch = "powerpc64")]
 pub fn main() { }