From 09be90c26682970cc94f41925eb1b20533cda9ae Mon Sep 17 00:00:00 2001
From: Bryan Biedenkapp <gatekeep@gmail.com>
Date: Fri, 12 May 2023 10:40:01 -0400
Subject: [PATCH] fixup CMakeLists to fix build warnings for ARM 32-bit
 platform;

---
 CMakeLists.txt    | 6 ++++++
 src/host/Host.cpp | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c50af22f..a6a8a503 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -369,6 +369,12 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O3 -Wall -std=c++11")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O3 -Wall -std=c++11")
 set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -g -O3 -Wall -std=c++11 -s")
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -g -O3 -Wall -std=c++11 -s")
+if (CROSS_COMPILE_ARM)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-psabi")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-psabi")
+    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Wno-psabi")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wno-psabi")
+endif (CROSS_COMPILE_ARM)
 
 set(CMAKE_BUILD_TYPE "RelWithDebInfo")
 
diff --git a/src/host/Host.cpp b/src/host/Host.cpp
index b99f5a6a..fbf413e5 100644
--- a/src/host/Host.cpp
+++ b/src/host/Host.cpp
@@ -1887,6 +1887,9 @@ bool Host::readParams()
         m_p25PatchSuperGroup = (uint32_t)::strtoul(rfssConfig["pSuperGroup"].as<std::string>("FFFF").c_str(), NULL, 16);
         m_p25NetId = (uint32_t)::strtoul(rfssConfig["netId"].as<std::string>("BB800").c_str(), NULL, 16);
         m_p25NetId = p25::P25Utils::netId(m_p25NetId);
+        if (m_p25NetId == 0xBEE00) {
+            ::fatal("error 4\n");
+        }
 
         m_sysId = (uint32_t)::strtoul(rfssConfig["sysId"].as<std::string>("001").c_str(), NULL, 16);
         m_sysId = p25::P25Utils::sysId(m_sysId);