From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Fri, 17 Mar 2023 18:48:08 +0000 (+0100)
Subject: Bug 467482 - Build failure on aarch64 Alpine
X-Git-Tag: VALGRIND_3_21_0~112
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=022a9caf40ceb32b8dfe258a8f2777f6299457d3;p=thirdparty%2Fvalgrind.git

Bug 467482 - Build failure on aarch64 Alpine

Patch submitted by
	fanquake@gmail.com
---

diff --git a/NEWS b/NEWS
index cd20f7773a..8ede199d67 100644
--- a/NEWS
+++ b/NEWS
@@ -10,9 +10,6 @@ AMD64/macOS 10.13 and nanoMIPS/Linux.
 
 * ==================== CORE CHANGES ===================
 
-* Make the address space limit on FreeBSD amd64 128Gbytes
-  (the same as Linux and Solaris, it was 32Gbytes)
-
 * When GDB is used to debug a program running under valgrind using
   the valgrind gdbserver, GDB will automatically load some
   python code provided in valgrind defining GDB front end commands
@@ -56,6 +53,11 @@ AMD64/macOS 10.13 and nanoMIPS/Linux.
   option to change the behaviour of Valgrind:
     --realloc-zero-bytes-frees=yes|no [yes on Linux glibc, no otherwise]
 
+* ================== PLATFORM CHANGES =================
+
+* Make the address space limit on FreeBSD amd64 128Gbytes
+  (the same as Linux and Solaris, it was 32Gbytes)
+
 * ==================== TOOL CHANGES ===================
 
 * Memcheck:
@@ -125,6 +127,7 @@ are not entered into bugzilla tend to get forgotten about or ignored.
 464969  D language demangling
 465435  m_libcfile.c:66 (vgPlain_safe_fd): Assertion 'newfd >= VG_(fd_hard_limit)' failed.
 466104  aligned_alloc problems, part 1
+467482  Build failure on aarch64 Alpine
 n-i-bz  FreeBSD rfork syscall fail with EINVAL or ENOSYS rather than VG_(unimplemented)
 
 To see details of a given bug, visit
diff --git a/coregrind/m_replacemalloc/vg_replace_malloc.c b/coregrind/m_replacemalloc/vg_replace_malloc.c
index c46e719c94..d3f33e66cf 100644
--- a/coregrind/m_replacemalloc/vg_replace_malloc.c
+++ b/coregrind/m_replacemalloc/vg_replace_malloc.c
@@ -1607,7 +1607,7 @@ extern int *___errno (void) __attribute__((weak));
 #if defined(VGO_freebsd)
 #define VG_MEMALIGN_MAKE_SIZE_MULTIPLE_ALIGN 1
 #else
-#define VG_MEMALIG_MAKE_SIZE_MULTIPLE_ALIGN 0
+#define VG_MEMALIGN_MAKE_SIZE_MULTIPLE_ALIGN 0
 #endif
 
 #if defined(VGO_solaris)