Add support for s390x. (#9)

Author: viferga

.github/workflows/run-tests.yml

@@ -84,7 +84,7 @@ jobs:
     - name: Install packages
       run: |
         sudo apt update
-        sudo apt install -y qemu-user gcc-arm-linux-gnueabi gcc-arm-linux-gnueabihf gcc-aarch64-linux-gnu gcc-powerpc-linux-gnu gcc-powerpc64le-linux-gnu gcc-riscv64-linux-gnu libc6-dev-armhf-cross libc6-dev-ppc64el-cross libc6-dev-powerpc-cross libc6-dev-armel-cross libc6-dev-arm64-cross
+        sudo apt install -y qemu-user gcc-arm-linux-gnueabi gcc-arm-linux-gnueabihf gcc-aarch64-linux-gnu gcc-powerpc-linux-gnu gcc-powerpc64le-linux-gnu gcc-riscv64-linux-gnu gcc-s390x-linux-gnu libc6-dev-armhf-cross libc6-dev-ppc64el-cross libc6-dev-powerpc-cross libc6-dev-armel-cross libc6-dev-arm64-cross libc6-dev-s390x-cross
     - name: Set OPT_CLFAGS
       run: |
         echo OPT_CFLAGS="${{ matrix.optimization }}" >> $GITHUB_ENV
@@ -115,6 +115,9 @@ jobs:
     - name: riscv64-linux-gnu
       run: |
         make relro_pie_tests TARGET_PLATFORM=riscv64-linux-gnu QEMU_ARCH=riscv64
+    - name: s390x-linux-gnu
+      run: |
+        make relro_pie_tests TARGET_PLATFORM=s390x-linux-gnu QEMU_ARCH=s390x
 
   tests_on_macos:
     name: Tests on macOS

Dockerfile

@@ -13,24 +13,34 @@ RUN apt update \
         gcc-powerpc-linux-gnu \
         gcc-powerpc64le-linux-gnu \
         gcc-riscv64-linux-gnu \
+        gcc-s390x-linux-gnu \
+        gcc-sparc64-linux-gnu \
         libc6-dev-armhf-cross \
         libc6-dev-ppc64el-cross \
         libc6-dev-powerpc-cross \
         libc6-dev-armel-cross \
-        libc6-dev-arm64-cross
+        libc6-dev-arm64-cross \
+        libc6-dev-s390x-cross \
+        libc6-dev-sparc64-cross
 
 WORKDIR /plthook
 
 COPY . .
 
 WORKDIR /plthook/test
 
-ENV OPT_CFLAGS="-O3"
+ENV OPT_CFLAGS="-O1"
 
 RUN echo "Running tests" \
+    && make relro_pie_tests TARGET_PLATFORM=aarch64-linux-gnu \
     && make relro_pie_tests TARGET_PLATFORM=aarch64-linux-gnu \
     && make relro_pie_tests TARGET_PLATFORM=arm-linux-gnueabi \
     && make relro_pie_tests TARGET_PLATFORM=arm-linux-gnueabihf \
     && make relro_pie_tests TARGET_PLATFORM=powerpc-linux-gnu QEMU_ARCH=ppc \
     && make relro_pie_tests TARGET_PLATFORM=powerpc64le-linux-gnu QEMU_ARCH=ppc64le \
-    && make relro_pie_tests TARGET_PLATFORM=riscv64-linux-gnu QEMU_ARCH=riscv64
+    && make relro_pie_tests TARGET_PLATFORM=riscv64-linux-gnu QEMU_ARCH=riscv64 \
+    && make relro_pie_tests TARGET_PLATFORM=s390x-linux-gnu QEMU_ARCH=s390x
+
+    # TODO:
+    #  \
+    # && make relro_pie_tests TARGET_PLATFORM=sparc64-linux-gnu QEMU_ARCH=sparc64

plthook_elf.c

@@ -107,10 +107,18 @@
 #else
 #error unsupported RISCV implementation
 #endif
-#elif 0 /* disabled because not tested */ && (defined __sparcv9 || defined __sparc_v9__)
-#define R_JUMP_SLOT   R_SPARC_JMP_SLOT
+#elif 0 /* disabled because not tested */ && (defined __s390__)
+#define R_JUMP_SLOT   R_390_JMP_SLOT
+#define R_GLOBAL_DATA R_390_GLOB_DAT
+#elif defined __s390x__
+#define R_JUMP_SLOT   R_390_JMP_SLOT
+#define R_GLOBAL_DATA R_390_GLOB_DAT
 #elif 0 /* disabled because not tested */ && (defined __sparc || defined __sparc__)
 #define R_JUMP_SLOT   R_SPARC_JMP_SLOT
+#define R_GLOBAL_DATA R_SPARC_GLOB_DAT
+#elif 0 /* disabled because not tested */ && (defined __sparcv9 || defined __sparc_v9__)
+#define R_JUMP_SLOT   R_SPARC_JMP_SLOT
+#define R_GLOBAL_DATA R_SPARC_GLOB_DAT
 #elif 0 /* disabled because not tested */ && (defined __ia64 || defined __ia64__)
 #define R_JUMP_SLOT   R_IA64_IPLTMSB
 #else