Basic support for s390x target

briansmith · Oct 1, 2023 · 8688eb3 · 8688eb3
1 parent 20e1493
commit 8688eb3
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 0 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -182,6 +182,7 @@ jobs:
           - i686-unknown-linux-musl
           - powerpc64le-unknown-linux-gnu
           - riscv64gc-unknown-linux-gnu
+          - s390x-unknown-linux-gnu
           - x86_64-pc-windows-gnu
           - x86_64-pc-windows-msvc
           - x86_64-apple-darwin
@@ -255,6 +256,12 @@ jobs:
           - target: riscv64gc-unknown-linux-gnu
             host_os: ubuntu-22.04
 
+          - target: s390x-unknown-linux-gnu
+            host_os: ubuntu-22.04
+            # XXX: `test_constant_time` fails when run under QEMU 8.0.2 and earlier
+            # (https://lists.gnu.org/archive/html/qemu-devel/2023-05/msg06965.html).
+            cargo_options: -- --skip test_constant_time
+
           - target: x86_64-pc-windows-gnu
             host_os: windows-latest
 
@@ -342,6 +349,7 @@ jobs:
           - aarch64-unknown-linux-musl
           - i686-pc-windows-msvc
           - powerpc64le-unknown-linux-gnu
+          - s390x-unknown-linux-gnu
           - x86_64-unknown-linux-gnu
 
         mode:
@@ -363,6 +371,12 @@ jobs:
           - target: powerpc64le-unknown-linux-gnu
             host_os: ubuntu-22.04
 
+          - target: s390x-unknown-linux-gnu
+            host_os: ubuntu-22.04
+            # XXX: `test_constant_time` fails when run under QEMU 8.0.2 and earlier
+            # (https://lists.gnu.org/archive/html/qemu-devel/2023-05/msg06965.html).
+            cargo_options: -- --skip test_constant_time
+
           - target: x86_64-unknown-linux-gnu
             host_os: ubuntu-22.04
 
@@ -498,6 +512,7 @@ jobs:
           - i686-unknown-linux-gnu
           - powerpc64le-unknown-linux-gnu
           - riscv64gc-unknown-linux-gnu
+          - s390x-unknown-linux-gnu
           - x86_64-unknown-linux-musl
 
         mode:
@@ -527,6 +542,12 @@ jobs:
           - target: riscv64gc-unknown-linux-gnu
             host_os: ubuntu-22.04
 
+          - target: s390x-unknown-linux-gnu
+            host_os: ubuntu-22.04
+            # XXX: `test_constant_time` fails when run under QEMU 8.0.2 and earlier
+            # (https://lists.gnu.org/archive/html/qemu-devel/2023-05/msg06965.html).
+            cargo_options: -- --skip test_constant_time
+
           - target: x86_64-unknown-linux-musl
             host_os: ubuntu-22.04
 

diff --git a/include/ring-core/target.h b/include/ring-core/target.h
@@ -46,6 +46,9 @@
 #elif defined(__riscv) && __SIZEOF_POINTER__ == 8
 #define OPENSSL_64_BIT
 #define OPENSSL_RISCV64
+#elif defined(__s390x__)
+#define OPENSSL_64_BIT
+#define OPENSSL_S390X
 #elif defined(__wasm__)
 #define OPENSSL_32_BIT
 #else

diff --git a/mk/cargo.sh b/mk/cargo.sh
@@ -23,6 +23,7 @@ qemu_arm="qemu-arm -L /usr/arm-linux-gnueabihf"
 qemu_mipsel="qemu-mipsel -L /usr/mipsel-linux-gnu"
 qemu_powerpc64le="qemu-ppc64le -L /usr/powerpc64le-linux-gnu"
 qemu_riscv64="qemu-riscv64 -L /usr/riscv64-linux-gnu"
+qemu_s390x="qemu-s390x -L /usr/s390x-linux-gnu"
 
 # Avoid putting the Android tools in `$PATH` because there are tools in this
 # directory like `clang` that would conflict with the same-named tools that may
@@ -114,6 +115,13 @@ case $target in
     export CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_LINKER=riscv64-linux-gnu-gcc
     export CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_RUNNER="$qemu_riscv64"
     ;;
+  s390x-unknown-linux-gnu)
+    export CC_s390x_unknown_linux_gnu=clang-$llvm_version
+    export AR_s390x_unknown_linux_gnu=llvm-ar-$llvm_version
+    export CFLAGS_s390x_unknown_linux_gnu="--sysroot=/usr/s390x-linux-gnu"
+    export CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_LINKER=s390x-linux-gnu-gcc
+    export CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_RUNNER="$qemu_s390x"
+    ;;
   x86_64-unknown-linux-musl)
     export CC_x86_64_unknown_linux_musl=clang-$llvm_version
     export AR_x86_64_unknown_linux_musl=llvm-ar-$llvm_version

diff --git a/mk/install-build-tools.sh b/mk/install-build-tools.sh
@@ -105,6 +105,14 @@ case $target in
     libc6-dev-riscv64-cross \
     qemu-user
   ;;
+--target=s390x-unknown-linux-gnu)
+  # Clang is needed for code coverage.
+  use_clang=1
+  install_packages \
+    qemu-user \
+    gcc-s390x-linux-gnu \
+    libc6-dev-s390x-cross
+  ;;
 --target=wasm32-unknown-unknown)
   cargo install wasm-bindgen-cli --bin wasm-bindgen-test-runner
   use_clang=1