Index: src/common/common.h
===================================================================
--- src/common/common.h (revision 60435)
+++ src/common/common.h (working copy)
@@ -220,6 +220,9 @@

 #define UNIX
 #define FB_OS OsDarwin
+#ifdef ARM
+#define FB_CPU CpuArm
+#endif /* ARM */
 #ifdef __ppc__
 #define powerpc
 #define FB_CPU CpuPowerPc
Index: src/jrd/license.h
===================================================================
--- src/jrd/license.h   (revision 60435)
+++ src/jrd/license.h   (working copy)
@@ -125,6 +125,9 @@
 #if defined(__ppc__) || defined(__ppc64__)
 #define FB_PLATFORM     "UP"   // Darwin/PowerPC
 #endif
+#if defined(ARM)
+#define FB_PLATFORM     "ARM"
+#endif
 #endif // DARWIN

 #ifndef FB_VERSION
Index: src/remote/inet.cpp
===================================================================
--- src/remote/inet.cpp (revision 60435)
+++ src/remote/inet.cpp (working copy)
@@ -799,7 +799,7 @@
    gai_hints.ai_family = ((packet || host.hasData() || !ipv6) ? AF_UNSPEC : AF_INET6);
    gai_hints.ai_socktype = SOCK_STREAM;

-#ifndef WIN_NT
+#if !defined(WIN_NT) && !defined(__clang__)
    gai_hints.ai_protocol = SOL_TCP;
 #else
    gai_hints.ai_protocol = IPPROTO_TCP;
Index: src/remote/protocol.h
===================================================================
--- src/remote/protocol.h   (revision 60435)
+++ src/remote/protocol.h   (working copy)
@@ -93,6 +93,7 @@
    arch_netbsd         = 38,
    arch_darwin_ppc     = 39,
    arch_winnt_64       = 40,
+    arch_arm            = 7,
    arch_darwin_x64     = 41,
    arch_darwin_ppc64   = 42,
    arch_max            = 43    // Keep this at the end
Index: src/remote/remote_def.h
===================================================================
--- src/remote/remote_def.h (revision 60435)
+++ src/remote/remote_def.h (working copy)
@@ -70,6 +70,8 @@
 const P_ARCH ARCHITECTURE  = arch_darwin_x64;
 #elif defined(DARWINPPC64)
 const P_ARCH ARCHITECTURE  = arch_darwin_ppc64;
+#elif defined(ARM)
+const P_ARCH ARCHITECTURE  = arch_arm;
 #endif


Index: src/yvalve/config/os/darwin/config_root.cpp
===================================================================
--- src/yvalve/config/os/darwin/config_root.cpp (revision 60435)
+++ src/yvalve/config/os/darwin/config_root.cpp (working copy)
@@ -37,7 +37,7 @@
 #include "../common/os/path_utils.h"
 #include "../common/file_params.h"

-#include <CoreServices/CoreServices.h>
+//#include <CoreServices/CoreServices.h>
 #include <CoreFoundation/CFBundle.h>
 #include <CoreFoundation/CFURL.h>
 #include <mach-o/dyld.h>