From e375261a1c1b492d9adb65ce469eddc7e4175fb8 Mon Sep 17 00:00:00 2001
From: gnzlbg <gonzalobg88@gmail.com>
Date: Sun, 11 Nov 2018 12:16:02 +0100
Subject: [PATCH] remove intel_sde feature

---
 library/stdarch/.travis.yml                                 | 6 ++++--
 .../ci/docker/x86_64-unknown-linux-gnu-emulated/Dockerfile  | 1 -
 library/stdarch/crates/coresimd/Cargo.toml                  | 3 ---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/library/stdarch/.travis.yml b/library/stdarch/.travis.yml
index 27fc9958cb78..a97395af913c 100644
--- a/library/stdarch/.travis.yml
+++ b/library/stdarch/.travis.yml
@@ -13,7 +13,7 @@ matrix:
       env: TARGET=x86_64-unknown-linux-gnu
       install: true
     - name: "x86_64-unknown-linux-gnu-emulated (runs all assert_instr tests)"
-      env: TARGET=x86_64-unknown-linux-gnu-emulated STDSIMD_TEST_EVERYTHING=1
+      env: TARGET=x86_64-unknown-linux-gnu-emulated STDSIMD_TEST_EVERYTHING=1 RUSTFLAGS="--cfg stdsimd_intel_sde"
       install: true
     - name: "x86_64-linux-android - no assert_instr"
       env: TARGET=x86_64-linux-android STDSIMD_DISABLE_ASSERT_INSTR=1
@@ -104,7 +104,9 @@ matrix:
         fi
     - name: "Shellcheck"
       install: true
-      script: shellcheck ci/*.sh
+      script:
+        - shellcheck --version
+        - shellcheck ci/*.sh
   allow_failures:
     - env: TARGET=i686-pc-windows-gnu
 
diff --git a/library/stdarch/ci/docker/x86_64-unknown-linux-gnu-emulated/Dockerfile b/library/stdarch/ci/docker/x86_64-unknown-linux-gnu-emulated/Dockerfile
index 2ed84ec82821..5af97f9adf9e 100644
--- a/library/stdarch/ci/docker/x86_64-unknown-linux-gnu-emulated/Dockerfile
+++ b/library/stdarch/ci/docker/x86_64-unknown-linux-gnu-emulated/Dockerfile
@@ -11,4 +11,3 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN wget https://github.com/gnzlbg/intel_sde/raw/master/sde-external-8.16.0-2018-01-30-lin.tar.bz2
 RUN tar -xjf sde-external-8.16.0-2018-01-30-lin.tar.bz2
 ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER="/sde-external-8.16.0-2018-01-30-lin/sde64 --"
-ENV RUSTFLAGS --cfg stdsimd_intel_sde
diff --git a/library/stdarch/crates/coresimd/Cargo.toml b/library/stdarch/crates/coresimd/Cargo.toml
index c18ae3e0aeed..7bce89146601 100644
--- a/library/stdarch/crates/coresimd/Cargo.toml
+++ b/library/stdarch/crates/coresimd/Cargo.toml
@@ -32,8 +32,5 @@ wasm-bindgen-test = "=0.2.19"
 [features]
 # Internal-usage only: denies all warnings.
 strict = []
-# Internal-usage only: enables only those intrinsics supported by Intel's
-# Software Development Environment (SDE).
-intel_sde = []
 # Enables wasm simd128 intrinsics
 wasm_simd128 = []