Merge branch 'fix-x86-linker' into 'master'

Fix i586 linker

See merge request redox-os/cookbook!690

.cargo/config.toml

@@ -2,6 +2,10 @@
 linker = "aarch64-unknown-redox-gcc"
 rustflags = []
 
+[target.i586-unknown-redox]
+linker = "i586-unknown-redox-gcc"
+rustflags = []
+
 [target.i686-unknown-redox]
 linker = "i686-unknown-redox-gcc"
 rustflags = []

config.sh

@@ -15,8 +15,6 @@ ARCH="${TARGET%%-*}"
 HOST="$TARGET"
 if [ x"${HOST}" == x"riscv64gc-unknown-redox" ] ; then
 	HOST="riscv64-unknown-redox"
-elif [ x"${HOST}" == x"i586-unknown-redox" ] ; then
-	HOST="i686-unknown-redox"
 fi
 
 # Cookbook requires correct CWD to work

recipes/core/drivers/recipe.toml

@@ -26,7 +26,7 @@ BINS=(
 # Add additional drivers to the list to build, that are not in drivers-initfs
 # depending on the target architecture
 case "${TARGET}" in
-    i686-unknown-redox | x86_64-unknown-redox)
+    i586-unknown-redox | i686-unknown-redox | x86_64-unknown-redox)
         BINS+=(ac97d bgad sb16d vboxd)
         ;;
     *)