From 2334689b57ac0dacfbc49c5faaf0852f2f9c340a Mon Sep 17 00:00:00 2001
From: "Bjoern A. Zeeb" <baz21@cam.ac.uk>
Date: Fri, 12 Feb 2021 11:48:47 +0000
Subject: [PATCH] arch-arm,sim: make compile on FreeBSD

Add missing #include / #define to make at least X86 and ARM gem5.opt
compile again on FreeBSD.

Change-Id: I3faa1437fe7175f3b8174c6f0b6a4c42b6396370
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/41295
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
---
 src/arch/arm/freebsd/se_workload.cc | 3 +++
 src/sim/syscall_emul.hh             | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/arch/arm/freebsd/se_workload.cc b/src/arch/arm/freebsd/se_workload.cc
index 661a4a9d2b..12f966ed5d 100644
--- a/src/arch/arm/freebsd/se_workload.cc
+++ b/src/arch/arm/freebsd/se_workload.cc
@@ -34,6 +34,9 @@
 #include "arch/arm/freebsd/se_workload.hh"
 
 #include <sys/syscall.h>
+#if !defined ( __GNU_LIBRARY__ ) && defined(__FreeBSD__)
+#include <sys/sysctl.h>
+#endif
 
 #include "arch/arm/process.hh"
 #include "base/loader/object_file.hh"
diff --git a/src/sim/syscall_emul.hh b/src/sim/syscall_emul.hh
index 0872b0f006..763c30f550 100644
--- a/src/sim/syscall_emul.hh
+++ b/src/sim/syscall_emul.hh
@@ -110,6 +110,8 @@
 
 #if defined(__APPLE__) && defined(__MACH__) && !defined(CMSG_ALIGN)
 #define CMSG_ALIGN(len) (((len) + sizeof(size_t) - 1) & ~(sizeof(size_t) - 1))
+#elif defined(__FreeBSD__) && !defined(CMSG_ALIGN)
+#define CMSG_ALIGN(n) _ALIGN(n)
 #endif
 
 //////////////////////////////////////////////////////////////////////