From a31e21ebd3ea7bab49c23ede3e9b87421d586e09 Mon Sep 17 00:00:00 2001
From: Justin Smith <justsmth@amazon.com>
Date: Fri, 1 Mar 2024 10:43:26 -0500
Subject: [PATCH] Add more platforms to CI

---
 .github/workflows/cross-test.yml | 37 ++++++++++++++++++++++++++++++++
 README.md                        |  4 +++-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/cross-test.yml b/.github/workflows/cross-test.yml
index fbaa9acbf1f..037c813f0b2 100644
--- a/.github/workflows/cross-test.yml
+++ b/.github/workflows/cross-test.yml
@@ -48,3 +48,40 @@ jobs:
       - uses: actions/checkout@v4
       - name: PPC64LE Build/Test
         run: tests/ci/run_cross_tests.sh ppc64le powerpc64le-unknown-linux-gnu "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_BUILD_TYPE=Release -DFIPS=1 -DBUILD_SHARED_LIBS=1"
+  riscv64-non-fips-build-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install qemu
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install qemu-user qemu-user-binfmt
+      - uses: actions/checkout@v4
+      - name: RISC-V 64 Build/Test
+# The flag below is set to avoid the following error with GCC 11.4.0:
+#
+#  /home/runner/work/aws-lc/aws-lc/crypto/pem/pem_lib.c:705:11: error: 'strncmp' of strings of length 1 and 9 and bound of 9 evaluates to nonzero [-Werror=string-compare]
+#  705 |       if (strncmp(buf, "-----END ", 9) == 0) {
+#      |           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        env:
+          CFLAGS: "-Wno-string-compare"
+        run: tests/ci/run_cross_tests.sh riscv riscv64-unknown-linux-gnu "-DCMAKE_BUILD_TYPE=Release"
+  armv6-non-fips-build-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install qemu
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install qemu-user qemu-user-binfmt
+      - uses: actions/checkout@v4
+      - name: armv6 Build/Test
+        run: tests/ci/run_cross_tests.sh armv6 armv6-unknown-linux-gnueabi "-DCMAKE_BUILD_TYPE=Release"
+  loongarch64-non-fips-build-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install qemu
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install qemu-user qemu-user-binfmt
+      - uses: actions/checkout@v4
+      - name: armv6 Build/Test
+        run: tests/ci/run_cross_tests.sh loongarch64 loongarch64-unknown-linux-gnu "-DCMAKE_BUILD_TYPE=Release"
diff --git a/README.md b/README.md
index 03a1a5c5a54..2ab69dc048d 100644
--- a/README.md
+++ b/README.md
@@ -109,7 +109,9 @@ that improve the experience for consumers on these platforms.
 | Android   | arm32       |
 | iOS       | aarch64     |
 | Linux     | arm32       |
-| Linux     | Loongarch64 | 
+| Linux     | loongarch64 |
+| Linux     | risc-v64    |
+| Linux     | s390x       |
 | Windows   | aarch64     |
 | OpenBSD   | x86-64      |
 | FreeBSD   | x86-64      |