From d347f74537fcca43c18751fd11da58690bb7ec21 Mon Sep 17 00:00:00 2001
From: Justin Smith <justsmth@amazon.com>
Date: Mon, 4 Nov 2024 12:21:51 -0500
Subject: [PATCH] Also test w/ gcc 4.8

---
 .github/docker_images/gcc-4.8/Dockerfile     | 8 ++++++--
 .github/docker_images/gcc-4.8/awslc_build.sh | 4 ++--
 crypto/evp_extra/evp_extra_test.cc           | 4 ++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/docker_images/gcc-4.8/Dockerfile b/.github/docker_images/gcc-4.8/Dockerfile
index c86416324e1..f01cd7594b8 100644
--- a/.github/docker_images/gcc-4.8/Dockerfile
+++ b/.github/docker_images/gcc-4.8/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0 OR ISC
 
-FROM gcc:4.8
+FROM --platform=linux/amd64 gcc:4.8
 
 VOLUME ["/awslc"]
 
@@ -14,7 +14,11 @@ RUN curl -LOk "https://github.com/Kitware/CMake/releases/download/v3.6.3/cmake-3
 RUN sha256sum cmake-3.6.3-Linux-x86_64.tar.gz | grep -q "9d915d505c07d84b610e1be6242c7cad68b4b7a4090ce85ecf9cec5effa47c43"
 RUN tar -C /usr/local -xzf cmake-3.6.3-Linux-x86_64.tar.gz
 RUN rm cmake-3.6.3-Linux-x86_64.tar.gz
+RUN curl -LOk "https://go.dev/dl/go1.18.10.linux-amd64.tar.gz"
+RUN sha256sum go1.18.10.linux-amd64.tar.gz | grep -q "5e05400e4c79ef5394424c0eff5b9141cb782da25f64f79d54c98af0a37f8d49"
+RUN rm -rf /usr/local/go && tar -C /usr/local -xzf go1.18.10.linux-amd64.tar.gz
+RUN rm go1.18.10.linux-amd64.tar.gz
 
-ENV PATH="${PATH}:/usr/local/cmake-3.6.3-Linux-x86_64/bin"
+ENV PATH="${PATH}:/usr/local/cmake-3.6.3-Linux-x86_64/bin:/usr/local/go/bin"
 
 ENTRYPOINT ["/entry.sh"]
diff --git a/.github/docker_images/gcc-4.8/awslc_build.sh b/.github/docker_images/gcc-4.8/awslc_build.sh
index 1cecf63add9..d2f22e432f2 100755
--- a/.github/docker_images/gcc-4.8/awslc_build.sh
+++ b/.github/docker_images/gcc-4.8/awslc_build.sh
@@ -12,7 +12,7 @@ SRC_DIR="${SRC_DIR:-/awslc}"
 
 pushd "${BUILD_DIR}"
 
-cmake "${SRC_DIR}" "-DDISABLE_GO=ON" "-DDISABLE_PERL=ON" "-DMY_ASSEMBLER_IS_TOO_OLD_FOR_512AVX=1"
-make -j 4 ssl
+cmake "${SRC_DIR}" "-DDISABLE_PERL=ON" "-DMY_ASSEMBLER_IS_TOO_OLD_FOR_512AVX=1"
+cmake --build "${BUILD_DIR}" --target run_tests
 
 popd # ${BUILD_DIR}
diff --git a/crypto/evp_extra/evp_extra_test.cc b/crypto/evp_extra/evp_extra_test.cc
index 079d19f3e01..c007f08814e 100644
--- a/crypto/evp_extra/evp_extra_test.cc
+++ b/crypto/evp_extra/evp_extra_test.cc
@@ -1153,6 +1153,8 @@ static bssl::UniquePtr<EVP_PKEY> ParsePrivateKey(int type, const uint8_t *in,
   return pkey;
 }
 
+#if !defined(__GNUC__) || (__GNUC__ > 4)
+
 static std::string PrintToString(const EVP_PKEY *pkey, int indent,
                                  int (*print_func)(BIO *out,
                                                    const EVP_PKEY *pkey,
@@ -1454,6 +1456,8 @@ TEST(EVPExtraTest, Print) {
 )");
 }
 
+#endif
+
 // Tests loading a bad key in PKCS8 format.
 TEST(EVPExtraTest, BadECKey) {
   const uint8_t *derp = kExampleBadECKeyDER;