From 4cedce5c5e1aa94a511adc65b195846189c430cd Mon Sep 17 00:00:00 2001
From: Thomas Debesse <dev@illwieckz.net>
Date: Fri, 13 Sep 2024 02:19:21 +0200
Subject: [PATCH] nacl: add FreeBSD support

---
 libs/nacl/native_client/src/include/atomic_ops.h              | 2 +-
 libs/nacl/native_client/src/include/nacl_asm.h                | 4 ++--
 .../native_client/src/include/nacl_compiler_annotations.h     | 2 +-
 libs/nacl/native_client/src/include/nacl_platform.h           | 4 ++--
 libs/nacl/native_client/src/include/portability.h             | 4 ++--
 .../nacl/native_client/src/shared/imc/posix/nacl_imc_posix.cc | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libs/nacl/native_client/src/include/atomic_ops.h b/libs/nacl/native_client/src/include/atomic_ops.h
index a25fe323cc..fe36a009c0 100644
--- a/libs/nacl/native_client/src/include/atomic_ops.h
+++ b/libs/nacl/native_client/src/include/atomic_ops.h
@@ -41,7 +41,7 @@
 
 #include "native_client/src/include/nacl_base.h"
 
-#if defined(__native_client__) || NACL_LINUX
+#if defined(__native_client__) || NACL_LINUX || NACL_FREEBSD
 #include "native_client/src/include/gcc/atomic_ops.h"
 #elif NACL_OSX
 #include "native_client/src/include/osx/atomic_ops_osx.h"
diff --git a/libs/nacl/native_client/src/include/nacl_asm.h b/libs/nacl/native_client/src/include/nacl_asm.h
index 2af8d3b3e6..fd2f134c7d 100644
--- a/libs/nacl/native_client/src/include/nacl_asm.h
+++ b/libs/nacl/native_client/src/include/nacl_asm.h
@@ -14,7 +14,7 @@
  */
 #if NACL_OSX
 # define IDENTIFIER(n)  _##n
-#elif NACL_LINUX
+#elif NACL_LINUX || NACL_FREEBSD
 # define IDENTIFIER(n)  n
 #elif NACL_WINDOWS
 # if defined(_WIN64)
@@ -30,7 +30,7 @@
 
 #if NACL_OSX
 # define HIDDEN(n)  .private_extern IDENTIFIER(n)
-#elif NACL_LINUX
+#elif NACL_LINUX || NACL_FREEBSD
 # define HIDDEN(n)  .hidden IDENTIFIER(n)
 #elif NACL_WINDOWS
 /* On Windows, symbols are hidden by default. */
diff --git a/libs/nacl/native_client/src/include/nacl_compiler_annotations.h b/libs/nacl/native_client/src/include/nacl_compiler_annotations.h
index f013b03c10..22c09e64d7 100644
--- a/libs/nacl/native_client/src/include/nacl_compiler_annotations.h
+++ b/libs/nacl/native_client/src/include/nacl_compiler_annotations.h
@@ -16,7 +16,7 @@
 
 #if NACL_WINDOWS
 # define DLLEXPORT __declspec(dllexport)
-#elif NACL_LINUX || NACL_OSX
+#elif NACL_LINUX || NACL_FREEBSD || NACL_OSX
 # define DLLEXPORT __attribute__ ((visibility("default")))
 #elif defined(__native_client__)
 /* do nothing */
diff --git a/libs/nacl/native_client/src/include/nacl_platform.h b/libs/nacl/native_client/src/include/nacl_platform.h
index 4f35ebb7b3..a5bd1feb36 100644
--- a/libs/nacl/native_client/src/include/nacl_platform.h
+++ b/libs/nacl/native_client/src/include/nacl_platform.h
@@ -12,7 +12,7 @@
 
 #include "native_client/src/include/elf.h"
 
-#if NACL_LINUX || NACL_OSX
+#if NACL_LINUX || NACL_FREEBSD || NACL_OSX
 #include <sys/types.h>
 #include <stdint.h>
 #include <unistd.h>
@@ -26,7 +26,7 @@
 #ifndef MAP_ANONYMOUS
 #define MAP_ANONYMOUS MAP_ANON
 #endif
-#elif NACL_LINUX
+#elif NACL_LINUX || NACL_FREEBSD
 # include <sys/mman.h>
 #endif
 
diff --git a/libs/nacl/native_client/src/include/portability.h b/libs/nacl/native_client/src/include/portability.h
index 08c1ffbf81..b932649ed0 100644
--- a/libs/nacl/native_client/src/include/portability.h
+++ b/libs/nacl/native_client/src/include/portability.h
@@ -180,7 +180,7 @@
 # define NACL_PRIX64 NACL___PRI64_PREFIX "X"
 #endif
 
-#else  /* NACL_LINUX, NACL_OSX, __native_client__ */
+#else  /* NACL_LINUX, NACL_FREEBSD, NACL_OSX, __native_client__ */
 
 # ifndef __STDC_FORMAT_MACROS
 #  define __STDC_FORMAT_MACROS  /* C++ */
@@ -251,7 +251,7 @@
 #  define NACL_PRIX8  "X"
 # endif  /* NACL_OSX */
 
-#endif  /* NACL_LINUX, NACL_OSX, __native_client__ */
+#endif  /* NACL_LINUX, NACL_FREEBSD, NACL_OSX, __native_client__ */
 
 /*
  * macros for run-time error detectors (such as Valgrind/Memcheck).
diff --git a/libs/nacl/native_client/src/shared/imc/posix/nacl_imc_posix.cc b/libs/nacl/native_client/src/shared/imc/posix/nacl_imc_posix.cc
index e4242ada3f..b8a50977d1 100644
--- a/libs/nacl/native_client/src/shared/imc/posix/nacl_imc_posix.cc
+++ b/libs/nacl/native_client/src/shared/imc/posix/nacl_imc_posix.cc
@@ -35,7 +35,7 @@
 #include "native_client/src/shared/platform/nacl_check.h"
 
 
-#if NACL_LINUX && defined(NACL_ENABLE_TMPFS_REDIRECT_VAR)
+#if (NACL_LINUX || NACL_FREEBSD) && defined(NACL_ENABLE_TMPFS_REDIRECT_VAR)
 static const char kNaClTempPrefixVar[] = "NACL_TMPFS_PREFIX";
 #endif
 
@@ -172,7 +172,7 @@ NaClHandle NaClCreateMemoryObject(size_t length, int executable) {
    * To handle this case, sel_ldr can take a path
    * to tmpfs from the environment.
    */
-#if NACL_LINUX && defined(NACL_ENABLE_TMPFS_REDIRECT_VAR)
+#if (NACL_LINUX || NACL_FREEBSD) && defined(NACL_ENABLE_TMPFS_REDIRECT_VAR)
   if (NACL_ENABLE_TMPFS_REDIRECT_VAR) {
     const char* prefix = getenv(kNaClTempPrefixVar);
     if (prefix != NULL) {