From a19ae2ae38070fd51f7b0edb5b18f90a1670920a Mon Sep 17 00:00:00 2001
From: Mike Kruskal <mkruskal@google.com>
Date: Fri, 7 Oct 2022 12:18:02 -0700
Subject: [PATCH] Fix 32-bit test issue

---
 kokoro/linux/32-bit/test_php.sh         | 2 +-
 src/google/protobuf/arena_align_test.cc | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kokoro/linux/32-bit/test_php.sh b/kokoro/linux/32-bit/test_php.sh
index 739467b20c..746ed4c2f1 100644
--- a/kokoro/linux/32-bit/test_php.sh
+++ b/kokoro/linux/32-bit/test_php.sh
@@ -36,7 +36,7 @@ build_php_c() {
   test_php_c
 }
 
-mkdir build
+mkdir -p build
 pushd build
 cmake ..
 cmake --build . -- -j20
diff --git a/src/google/protobuf/arena_align_test.cc b/src/google/protobuf/arena_align_test.cc
index 6fd15bd6bd..e17cb33209 100644
--- a/src/google/protobuf/arena_align_test.cc
+++ b/src/google/protobuf/arena_align_test.cc
@@ -68,7 +68,7 @@ TEST(ArenaAlignDefault, Ceil) {
 }
 
 TEST(ArenaAlignDefault, CeilPtr) {
-  char p[17] = {0};
+  alignas(8) char p[17] = {0};
   auto align_default = ArenaAlignDefault();
   EXPECT_THAT(align_default.Ceil(p + 0), Eq(p + 0));
   EXPECT_THAT(align_default.Ceil(p + 1), Eq(p + 8));
@@ -80,7 +80,7 @@ TEST(ArenaAlignDefault, CeilPtr) {
 }
 
 TEST(ArenaAlignDefault, CheckAligned) {
-  char p[17] = {0};
+  alignas(8) char p[17] = {0};
   auto align_default = ArenaAlignDefault();
   EXPECT_THAT(align_default.CheckAligned(p + 0), Eq(p + 0));
   EXPECT_THAT(align_default.CheckAligned(p + 8), Eq(p + 8));
@@ -95,7 +95,7 @@ TEST(ArenaAlignDefault, CheckAligned) {
 }
 
 TEST(ArenaAlignDefault, CeilDefaultAligned) {
-  char p[17] = {0};
+  alignas(8) char p[17] = {0};
   auto align_default = ArenaAlignDefault();
   EXPECT_THAT(align_default.CeilDefaultAligned(p + 0), Eq(p + 0));
   EXPECT_THAT(align_default.CeilDefaultAligned(p + 8), Eq(p + 8));