Index: src/jrd/recsrc/HashJoin.cpp
===================================================================
--- src/jrd/recsrc/HashJoin.cpp (revision 60435)
+++ src/jrd/recsrc/HashJoin.cpp (working copy)
@@ -65,7 +65,11 @@
    void qsort_ctx(void* base, size_t count, size_t width, qsort_compare_callback compare, void* arg)
    {
 #if defined(LINUX)
+#ifdef qsort_r
        qsort_r(base, count, width, compare, arg);
+#else
+#undef USE_QSORT_CTX
+#endif
 #elif defined(WIN_NT)
        struct qsort_ctx_data tmp = {arg, compare};
        qsort_s(base, count, width, &qsort_ctx_arg_swap, &tmp);
Index: src/utilities/ntrace/PluginLogWriter.cpp
===================================================================
--- src/utilities/ntrace/PluginLogWriter.cpp    (revision 60435)
+++ src/utilities/ntrace/PluginLogWriter.cpp    (working copy)
@@ -97,8 +97,12 @@
        );
    m_fileHandle = _open_osfhandle((intptr_t) hFile, 0);
 #else
-   m_fileHandle = ::open(m_fileName.c_str(), O_CREAT | O_APPEND | O_RDWR, S_IREAD | S_IWRITE);
+   m_fileHandle = ::open(m_fileName.c_str(), O_CREAT | O_APPEND | O_RDWR
+#ifndef ARM
+        , S_IREAD | S_IWRITE
 #endif
+        );
+#endif

    if (m_fileHandle < 0)
        checkErrno("open");