From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Tue, 6 Jan 2026 19:33:16 +0000 (+0100)
Subject: valgrind.h: FreeBSD cleanup
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21e5da76b5b0a830eda9143efa66e44ce25073f4;p=thirdparty%2Fvalgrind.git

valgrind.h: FreeBSD cleanup

Wasn't undefining the PLAT macros
Add FreeBSD to the head and tail comments for each arch

amd64 is getting crowded, if we add any more OSes then I think
just "amd64 platforms" will be enough rather than listing 5 or 6
or more platforms.
---

diff --git a/include/valgrind.h.in b/include/valgrind.h.in
index 24a659998..c49be6b3c 100644
--- a/include/valgrind.h.in
+++ b/include/valgrind.h.in
@@ -266,7 +266,7 @@
    inline asm stuff to be useful.
 */
 
-/* ----------------- x86-{linux,darwin,solaris} ---------------- */
+/* -------------- x86-{linux,darwin,solaris,freebsd} ------------- */
 
 #if defined(PLAT_x86_linux)  ||  defined(PLAT_x86_darwin)  \
     ||  (defined(PLAT_x86_win32) && defined(__GNUC__)) \
@@ -331,7 +331,7 @@ typedef
  } while (0)
 
 #endif /* PLAT_x86_linux || PLAT_x86_darwin || (PLAT_x86_win32 && __GNUC__)
-          || PLAT_x86_solaris */
+          || PLAT_x86_solaris || PLAT_x86_freebsd */
 
 /* ------------------------- x86-Win32 ------------------------- */
 
@@ -406,7 +406,7 @@ valgrind_do_client_request_expr(uintptr_t _zzq_default, uintptr_t _zzq_request,
 
 #endif /* PLAT_x86_win32 */
 
-/* ----------------- amd64-{linux,darwin,solaris} --------------- */
+/* -------------- amd64-{linux,darwin,solaris,freebsd} ------------ */
 
 #if defined(PLAT_amd64_linux)  ||  defined(PLAT_amd64_darwin) \
     ||  defined(PLAT_amd64_solaris) \
@@ -471,7 +471,8 @@ typedef
                     );                                           \
  } while (0)
 
-#endif /* PLAT_amd64_linux || PLAT_amd64_darwin || PLAT_amd64_solaris */
+#endif /* PLAT_amd64_linux || PLAT_amd64_darwin
+          || PLAT_amd64_solaris || PLAT_amd64_freebsd */
 
 /* ------------------------- amd64-Win64 ------------------------- */
 
@@ -774,7 +775,7 @@ typedef
 
 #endif /* PLAT_arm_linux */
 
-/* ------------------------ arm64-{linux,freebsd} ------------------------- */
+/* -------------------- arm64-{linux,freebsd} -------------------- */
 
 #if defined(PLAT_arm64_linux) || defined(PLAT_arm64_freebsd)
 
@@ -1310,7 +1311,7 @@ typedef
    do { volatile unsigned long _junk;                             \
         CALL_FN_W_7W(_junk,fnptr,arg1,arg2,arg3,arg4,arg5,arg6,arg7); } while (0)
 
-/* ----------------- x86-{linux,darwin,solaris} ---------------- */
+/* -------------- x86-{linux,darwin,solaris,freebsd} ------------- */
 
 #if defined(PLAT_x86_linux)  ||  defined(PLAT_x86_darwin) \
     ||  defined(PLAT_x86_solaris)  || defined(PLAT_x86_freebsd)
@@ -1740,9 +1741,10 @@ typedef
       lval = (__typeof__(lval)) _res;                             \
    } while (0)
 
-#endif /* PLAT_x86_linux || PLAT_x86_darwin || PLAT_x86_solaris */
+#endif /* PLAT_x86_linux || PLAT_x86_darwin
+          || PLAT_x86_solaris || PLAT_x86_freebsd */
 
-/* ---------------- amd64-{linux,darwin,solaris} --------------- */
+/* ------------- amd64-{linux,darwin,solaris,freebsd} ------------ */
 
 #if defined(PLAT_amd64_linux)  ||  defined(PLAT_amd64_darwin) \
     ||  defined(PLAT_amd64_solaris)  ||  defined(PLAT_amd64_freebsd)
@@ -2294,7 +2296,8 @@ typedef
       lval = (__typeof__(lval)) _res;                                  \
    } while (0)
 
-#endif /* PLAT_amd64_linux || PLAT_amd64_darwin || PLAT_amd64_solaris */
+#endif /* PLAT_amd64_linux || PLAT_amd64_darwin
+          || PLAT_amd64_solaris || PLAT_amd64_freebsd */
 
 /* ------------------------ ppc32-linux ------------------------ */
 
@@ -4368,7 +4371,7 @@ typedef
 
 #endif /* PLAT_arm_linux */
 
-/* ------------------------ arm64-linux ------------------------ */
+/* ------------------- arm64-{linux,freebsd} -------------------- */
 
 #if defined(PLAT_arm64_linux) || defined(PLAT_arm64_freebsd)
 
@@ -4817,7 +4820,7 @@ typedef
       lval = (__typeof__(lval)) _res;                             \
    } while (0)
 
-#endif /* PLAT_arm64_linux */
+#endif /* PLAT_arm64_linux || PLAT_arm64_freebsd */
 
 /* ------------------------- s390x-linux ------------------------- */
 
@@ -7684,6 +7687,9 @@ VALGRIND_PRINTF_BACKTRACE(const char *format, ...)
 
 #undef PLAT_x86_darwin
 #undef PLAT_amd64_darwin
+#undef PLAT_x86_freebsd
+#undef PLAT_amd64_freebsd
+#undef PLAT_arm64_freebsd
 #undef PLAT_x86_win32
 #undef PLAT_amd64_win64
 #undef PLAT_x86_linux