Remove i386 arch, add redis and nginx to travis ci test

.travis.yml

@@ -17,18 +17,20 @@ os:
 
 env:
   matrix:
-    - ARCH="riscv32" SRC="ucore"
-    - ARCH="riscv64" SRC="ucore"
-    - ARCH="i386" SRC="ucore"
     - ARCH="x86_64" SRC="ucore"
     - ARCH="aarch64" SRC="ucore"
-    - ARCH="riscv32" SRC="rust"
+    - ARCH="riscv32" SRC="ucore"
-    - ARCH="riscv64" SRC="rust"
+    - ARCH="riscv64" SRC="ucore"
-    - ARCH="i386" SRC="rust"
     - ARCH="x86_64" SRC="rust"
     - ARCH="aarch64" SRC="rust"
+    - ARCH="riscv32" SRC="rust"
+    - ARCH="riscv64" SRC="rust"
     - ARCH="x86_64" SRC="biscuit"
     - ARCH="aarch64" SRC="biscuit"
+    - ARCH="x86_64" SRC="nginx"
+    - ARCH="aarch64" SRC="nginx"
+    - ARCH="x86_64" SRC="redis"
+    - ARCH="aarch64" SRC="redis"
 
 
 allow_failures:
@@ -61,11 +63,6 @@ install:
     brew install FiloSottile/musl-cross/musl-cross --with-aarch64;
     fi;
     fi
-  - if [ $ARCH = i386 ]; then
-    if [ $TRAVIS_OS_NAME = osx ]; then
-    brew install i386-elf-gcc;
-    fi;
-    fi
   - if [ $ARCH = x86_64 ]; then
     if [ $TRAVIS_OS_NAME = linux ]; then
     sudo apt update;

README.md

@@ -26,8 +26,8 @@ $ brew install FileSottile/musl-cross/musl-cross
 ```
 
 ```bash
-$ make {ucore,biscuit,rust,all} arch={i386,x86_64,riscv32,riscv64,aarch64}
+$ make {ucore,biscuit,rust,all} arch={x86_64,riscv32,riscv64,aarch64}
-$ make sfsimg arch={i386,x86_64,riscv32,riscv64,aarch64}
+$ make sfsimg arch={x86_64,riscv32,riscv64,aarch64}
 ```
 
 Output to `build/$(arch)`

biscuit/CMakeLists.txt

@@ -23,12 +23,7 @@ find_path(KERNEL_HEADERS_DIR
 )
 
 # Toolchain
-if (${ARCH} STREQUAL i386)
+if (${ARCH} STREQUAL x86_64)
-    if(APPLE)
-        set(PREFIX          i386-elf-)
-    endif ()
-    set(CMAKE_C_FLAGS       "-m32 -mno-red-zone")
-elseif (${ARCH} STREQUAL x86_64)
     set(PREFIX              x86_64-linux-musl-)
     set(CMAKE_C_FLAGS       "-m64 -mno-red-zone")
 elseif (${ARCH} STREQUAL riscv32)

rust/targets/i386-rcore.json

@@ -1,16 +0,0 @@
-{
-  "arch": "x86",
-  "cpu": "i386",
-  "data-layout": "e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128",
-  "executables": true,
-  "linker-flavor": "ld.lld",
-  "linker": "rust-lld",
-  "llvm-target": "i386",
-  "max-atomic-width": 64,
-  "os": "none",
-  "panic-strategy": "abort",
-  "target-c-int-width": "32",
-  "target-endian": "little",
-  "target-pointer-width": "32",
-  "features": "-mmx,-sse,+soft-float"
-}

ucore/CMakeLists.txt

@@ -17,12 +17,7 @@ include_directories(src/libs src/ulibs ${ARCH_DIR})
 set(EXECUTABLE_OUTPUT_PATH ${ARCH})
 
 # Toolchain
-if (${ARCH} STREQUAL i386)
+if (${ARCH} STREQUAL x86_64)
-    if(APPLE)
-        set(PREFIX          i386-elf-)
-    endif ()
-    set(CMAKE_C_FLAGS       "-m32")
-elseif (${ARCH} STREQUAL x86_64)
     if(APPLE)
         set(PREFIX          x86_64-elf-)
     endif ()