Fix building with clang on non-darwin platforms

RyeMutt · RyeMutt · commit d2e80039df17 · 2025-11-02T21:40:05.000-05:00
Signed-off-by: Rye &lt;rye@alchemyviewer.org&gt;
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
@@ -216,6 +216,10 @@ endif(DARWIN)
 if (LINUX OR DARWIN)
   add_compile_options(-Wall -Wno-sign-compare -Wno-trigraphs -Wno-reorder -Wno-unused-but-set-variable -Wno-unused-variable)
 
+  if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    add_compile_options(-Wno-unused-private-field)
+  endif()
+
   if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
     add_compile_options(-Wno-unused-local-typedef)
   endif()
diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake
@@ -15,6 +15,7 @@ if (LINUX)
   pkg_check_modules(WAYLAND_CLIENT wayland-client)
 
   if(WAYLAND_CLIENT_FOUND)
+      target_include_directories(ll::uilibraries INTERFACE ${WAYLAND_CLIENT_INCLUDE_DIRS})
       target_compile_definitions(ll::uilibraries INTERFACE LL_WAYLAND=1)
   else()
       message("pkgconfig could not find wayland client, compiling without full wayland support")
diff --git a/indra/llcommon/StackWalker.cpp b/indra/llcommon/StackWalker.cpp
@@ -785,6 +785,8 @@ struct IMAGEHLP_MODULE64_V2 {
           case 8: //SymVirtual:
             szSymType = "Virtual";
             break;
+          case NumSymTypes:
+            break;
         }
       }
       LPCSTR pdbName = Module.LoadedImageName;
diff --git a/indra/llcommon/llapr.cpp b/indra/llcommon/llapr.cpp
@@ -230,11 +230,11 @@ bool LLVolatileAPRPool::isFull()
 bool _ll_apr_warn_status(apr_status_t status, const char* file, int line)
 {
     if(APR_SUCCESS == status) return false;
-#if !LL_LINUX
+
     char buf[MAX_STRING];   /* Flawfinder: ignore */
     apr_strerror(status, buf, sizeof(buf));
     LL_WARNS("APR") << "APR: " << file << ":" << line << " " << buf << LL_ENDL;
-#endif
+
     return true;
 }
 
diff --git a/indra/llcommon/lldate.cpp b/indra/llcommon/lldate.cpp
@@ -131,11 +131,7 @@ void LLDate::toStream(std::ostream& s) const
     }
 
     s << std::dec << std::setfill('0');
-#if( LL_WINDOWS || __GNUC__ > 2)
     s << std::right;
-#else
-    s.setf(ios::right);
-#endif
     s        << std::setw(4) << (exp_time.tm_year + 1900)
       << '-' << std::setw(2) << (exp_time.tm_mon + 1)
       << '-' << std::setw(2) << (exp_time.tm_mday)
diff --git a/indra/llcommon/llfindlocale.cpp b/indra/llcommon/llfindlocale.cpp
@@ -134,7 +134,7 @@ accumulate_locstring(const char *str, FL_Locale *l) {
   return 0;
 }
 
-
+#ifndef LL_WINDOWS
 static int
 accumulate_env(const char *name, FL_Locale *l) {
   char *env;
@@ -148,7 +148,7 @@ accumulate_env(const char *name, FL_Locale *l) {
   free(lang); free(country); free(variant);
   return 0;
 }
-
+#endif
 
 static void
 canonise_fl(FL_Locale *l) {
diff --git a/indra/llcommon/llinstancetracker.h b/indra/llcommon/llinstancetracker.h
@@ -246,9 +246,7 @@ class LLInstanceTracker
     }
 
 protected:
-#if LL_CLANG || LL_GNUC
-    __attribute__((no_sanitize("vptr")))
-#endif
+    LL_UBSAN_SUPRESS_VPTR
     LLInstanceTracker(const KEY& key)
     {
         // We do not intend to manage the lifespan of this object with
@@ -487,9 +485,7 @@ class LLInstanceTracker<T, void, KEY_COLLISION_BEHAVIOR>
     using key_snapshot_of = instance_snapshot_of<SUBCLASS>;
 
 protected:
-#if LL_CLANG || LL_GNUC
-    __attribute__((no_sanitize("vptr")))
-#endif
+    LL_UBSAN_SUPRESS_VPTR
     LLInstanceTracker()
     {
         // Since we do not intend for this shared_ptr to manage lifespan, give
diff --git a/indra/llcommon/llmd5.cpp b/indra/llcommon/llmd5.cpp
@@ -255,7 +255,7 @@ void LLMD5::raw_digest(unsigned char* s) const
     memcpy(s, digest, 16); /* Flawfinder: ignore */
 }
 
-#if LL_DARWIN
+#if LL_CLANG
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #endif
@@ -280,7 +280,7 @@ void LLMD5::hex_digest(char* s) const
     s[32] = '\0';
 }
 
-#if LL_DARWIN
+#if LL_CLANG
 #pragma clang diagnostic pop
 #endif
 
diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp
@@ -146,9 +146,6 @@ void LLMemory::updateMemoryInfo()
         LL_WARNS() << "task_info failed" << LL_ENDL;
     }
 #elif defined(LL_LINUX)
-    // Use sysinfo() to get the total physical memory.
-    struct sysinfo info;
-    sysinfo(&info);
     sAllocatedMemInKB = U32Kilobytes::convert(U64Bytes(LLMemory::getCurrentRSS())); // represents the RAM allocated by this process only (in line with the windows implementation)
 #else
     //not valid for other systems for now.
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h
@@ -61,45 +61,48 @@
 # define LL_UNLIKELY(EXPR) (EXPR)
 #endif
 
-
 // Figure out differences between compilers
-#if defined(__clang__)
-    #define GCC_VERSION (__GNUC__ * 10000 \
-                        + __GNUC_MINOR__ * 100 \
-                        + __GNUC_PATCHLEVEL__)
+#if defined(__MSVC_VER__) || defined(_MSC_VER)
+    #ifndef LL_MSVC
+        #define LL_MSVC 1
+    #endif
+
+    // Clang CL is MSVC-like but also supports its own macros
+    #if defined(__clang__)
+        #ifndef LL_CLANG
+            #define LL_CLANG 1
+        #endif
+    #endif
+#elif defined(__clang__)
+    #define CLANG_VERSION (__clang_major__ * 10000 \
+                        + __clang_minor__ * 100 \
+                        + __clang_patchlevel__)
     #ifndef LL_CLANG
         #define LL_CLANG 1
     #endif
-    #ifndef LL_GNUC
-        #define LL_GNUC 1
-    #endif
 #elif defined(__GNUC__)
     #define GCC_VERSION (__GNUC__ * 10000 \
                         + __GNUC_MINOR__ * 100 \
                         + __GNUC_PATCHLEVEL__)
     #ifndef LL_GNUC
         #define LL_GNUC 1
     #endif
-#elif defined(__MSVC_VER__) || defined(_MSC_VER)
-    #ifndef LL_MSVC
-        #define LL_MSVC 1
-    #endif
 #endif
 
 // Set up CPU architecture defines
 #if LL_MSVC && defined(_M_ARM64)
 #      define LL_ARM64 1
-#elif LL_GNUC && (defined(__arm64__) || defined(__aarch64__))
+#elif (LL_GNUC || LL_CLANG) && (defined(__arm64__) || defined(__aarch64__))
 #      define LL_ARM64 1
 #elif LL_MSVC && _M_X64
 #      define LL_X86_64 1
 #      define LL_X86 1
 #elif LL_MSVC && _M_IX86
 #      define LL_X86 1
-#elif LL_GNUC && ( defined(__amd64__) || defined(__x86_64__) )
+#elif (LL_GNUC || LL_CLANG) && ( defined(__amd64__) || defined(__x86_64__) )
 #      define LL_X86_64 1
 #      define LL_X86 1
-#elif LL_GNUC && ( defined(__i386__) )
+#elif (LL_GNUC || LL_CLANG) && ( defined(__i386__) )
 #      define LL_X86 1
 #endif
 
@@ -116,16 +119,6 @@
 
 #endif
 
-// Although thread_local is now a standard storage class, we can't just
-// #define LL_THREAD_LOCAL as thread_local because the *usage* is different.
-// We'll have to take the time to change LL_THREAD_LOCAL declarations by hand.
-#if LL_WINDOWS
-# define LL_THREAD_LOCAL __declspec(thread)
-#else
-# define LL_THREAD_LOCAL __thread
-#endif
-
-
 #if defined(LL_WINDOWS)
 #define BOOST_REGEX_NO_LIB 1
 #define CURL_STATICLIB 1
@@ -150,7 +143,7 @@
 #define LL_DLLIMPORT
 #endif // LL_WINDOWS
 
-#if __clang__ || ! defined(LL_WINDOWS)
+#if LL_CLANG || ! defined(LL_WINDOWS)
 // Only on Windows, and only with the Microsoft compiler (vs. clang) is
 // wchar_t potentially not a distinct type.
 #define LL_WCHAR_T_NATIVE 1
@@ -211,6 +204,13 @@
 #define LL_PRETTY_FUNCTION __PRETTY_FUNCTION__
 #endif
 
+// vptr warning supression funtionality for undefined behavior sanitizer
+#if LL_CLANG || LL_GNUC
+#   define LL_UBSAN_SUPRESS_VPTR __attribute__((no_sanitize("vptr")))
+#else
+#   define LL_UBSAN_SUPRESS_VPTR
+#endif
+
 #if LL_ARM64
 #define GLM_FORCE_NEON 1
 #else
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
@@ -1424,11 +1424,7 @@ S32 LLSDNotationFormatter::format_impl(const LLSD& data, std::ostream& ostr,
 
     case LLSD::TypeBoolean:
         if(mBoolAlpha ||
-#if( LL_WINDOWS || __GNUC__ > 2)
            (ostr.flags() & std::ios::boolalpha)
-#else
-           (ostr.flags() & 0x0100)
-#endif
             )
         {
             ostr << (data.asBoolean()
diff --git a/indra/llcommon/llstl.h b/indra/llcommon/llstl.h
@@ -522,18 +522,8 @@ llbind2nd(const _Operation& __oper, const _Tp& __x)
 inline
 bool before(const std::type_info* lhs, const std::type_info* rhs)
 {
-#if LL_LINUX && defined(__GNUC__) && ((__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 4))
-    // If we're building on Linux with gcc, and it's either gcc 3.x or
-    // 4.{0,1,2,3}, then we have to use a workaround. Note that we use gcc on
-    // Mac too, and some people build with gcc on Windows (cygwin or mingw).
-    // On Linux, different load modules may produce different type_info*
-    // pointers for the same type. Have to compare name strings to get good
-    // results.
-    return strcmp(lhs->name(), rhs->name()) < 0;
-#else  // not Linux, or gcc 4.4+
     // Just use before(), as we normally would
     return lhs->before(*rhs);
-#endif
 }
 
 /**
diff --git a/indra/llcommon/stdtypes.h b/indra/llcommon/stdtypes.h
@@ -38,6 +38,11 @@ typedef signed short            S16;
 typedef unsigned short          U16;
 typedef signed int              S32;
 typedef unsigned int            U32;
+typedef long long int           S64;
+typedef long long unsigned int  U64;
+
+#define S64L(a) (a##LL)
+#define U64L(a) (a##ULL)
 
 // to express an index that might go negative
 // (ssize_t is provided by SOME compilers, don't collide)
@@ -62,21 +67,6 @@ typedef wchar_t             llwchar;
 #define LLWCHAR_IS_WCHAR_T 1
 #endif
 
-#if LL_WINDOWS
-typedef signed __int64          S64;
-// probably should be 'hyper' or similiar
-#define S64L(a)                 (a)
-typedef unsigned __int64        U64;
-#define U64L(a)                 (a)
-#else
-typedef long long int           S64;
-typedef long long unsigned int      U64;
-#if LL_DARWIN || LL_LINUX
-#define S64L(a)             (a##LL)
-#define U64L(a)             (a##ULL)
-#endif
-#endif
-
 typedef float               F32;
 typedef double              F64;
 
@@ -121,10 +111,6 @@ typedef U8 LLPCode;
 
 #define LL_ARRAY_SIZE( _kArray ) ( sizeof( (_kArray) ) / sizeof( _kArray[0] ) )
 
-#if LL_LINUX && __GNUC__ <= 2
-typedef int intptr_t;
-#endif
-
 /*****************************************************************************
 *   Narrowing
 *****************************************************************************/
diff --git a/indra/llcommon/tests/commonmisc_test.cpp b/indra/llcommon/tests/commonmisc_test.cpp
@@ -503,7 +503,7 @@ namespace tut
         result_str = (const char*) result;
         ensure_equals("U64_to_str converted 1.4", val_str, result_str);
 
-        val = U64L(-1); // 0xFFFFFFFFFFFFFFFF == 18446744073709551615
+        val = U64(-1); // 0xFFFFFFFFFFFFFFFF == 18446744073709551615
         val_str = "18446744073709551615";
         U64_to_str(val, result, sizeof(result));
         result_str = (const char*) result;
@@ -619,7 +619,7 @@ namespace tut
         val = U64_to_F64(U64L(2));
         ensure_equals("U64_to_F64 converted 3.6", val, result);
 
-        result = U64L(0x7FFFFFFFFFFFFFFF) * 1.0L; // 0x7FFFFFFFFFFFFFFF
+        result = F64(0x7FFFFFFFFFFFFFFF) * 1.0; // 0x7FFFFFFFFFFFFFFF
         val = U64_to_F64(U64L(0x7FFFFFFFFFFFFFFF));
         ensure_equals("U64_to_F64 converted 3.7", val, result);
     }
diff --git a/indra/llcommon/tests/lldependencies_test.cpp b/indra/llcommon/tests/lldependencies_test.cpp
@@ -233,19 +233,7 @@ namespace tut
 
         StringList keys(make<StringList>(list_of("The")("brown")("dog.")("fox")("jumps")("lazy")("over")("quick")("the")("yellow")));
         ensure_equals(instance_from_range<StringList>(deps.get_key_range()), keys);
-#if (! defined(__GNUC__)) || (__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ > 3)
-        // This is the succinct way, works on modern compilers
         ensure_equals(instance_from_range<StringList>(make_transform_range(deps.get_range(), extract_key)), keys);
-#else   // gcc 3.3
-        StringDeps::range got_range(deps.get_range());
-        StringDeps::iterator kni = got_range.begin(), knend = got_range.end();
-        StringList::iterator ki = keys.begin(), kend = keys.end();
-        for ( ; kni != knend && ki != kend; ++kni, ++ki)
-        {
-            ensure_equals(kni->first, *ki);
-        }
-        ensure("get_range() returns proper length", kni == knend && ki == kend);
-#endif  // gcc 3.3
         // blow off get_node_range() because they're all LLDependenciesEmpty instances
     }
 
diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp
@@ -59,7 +59,7 @@ static const char* FieldName[] =
 
 namespace
 {
-#ifdef __clang__
+#if defined(LL_CLANG)
 #   pragma clang diagnostic ignored "-Wunused-function"
 #elif defined(LL_GNUC)
 #   pragma GCC diagnostic ignored "-Wunused-function"
diff --git a/indra/llcommon/tests/llstring_test.cpp b/indra/llcommon/tests/llstring_test.cpp
@@ -377,7 +377,7 @@ namespace tut
     {
         F32 value;
         std::string str_val("2147483647"); //0x7FFFFFFF
-        ensure("1: convertToF32 failed", LLStringUtil::convertToF32(str_val, value) && value == 2147483647);
+        ensure("1: convertToF32 failed", LLStringUtil::convertToF32(str_val, value) && value == 2147483647.f);
 
         str_val = "0";
         ensure("2: convertToF32 failed", LLStringUtil::convertToF32(str_val, value) && value == 0);
@@ -399,7 +399,7 @@ namespace tut
     {
         F64 value;
         std::string str_val("9223372036854775807"); //0x7FFFFFFFFFFFFFFF
-        ensure("1: convertToF64 failed", LLStringUtil::convertToF64(str_val, value) && value == 9223372036854775807LL);
+        ensure("1: convertToF64 failed", LLStringUtil::convertToF64(str_val, value) && value == 9223372036854775807.0);
 
         str_val = "0";
         ensure("2: convertToF64 failed", LLStringUtil::convertToF64(str_val, value) && value == 0.0F);
diff --git a/indra/llcorehttp/llhttpconstants.h b/indra/llcorehttp/llhttpconstants.h
@@ -100,6 +100,8 @@ extern const std::string HTTP_VERB_POST;
 extern const std::string HTTP_VERB_DELETE;
 extern const std::string HTTP_VERB_MOVE;
 extern const std::string HTTP_VERB_OPTIONS;
+extern const std::string HTTP_VERB_PATCH;
+extern const std::string HTTP_VERB_COPY;
 
 enum EHTTPMethod
 {
diff --git a/indra/llkdu/include_kdu_xxxx.h b/indra/llkdu/include_kdu_xxxx.h
@@ -16,7 +16,7 @@
 // #include "include_kdu_xxxx.h"
 // // kdu_xxxx #undef'ed by include_kdu_xxxx.h
 
-#if __clang__
+#if LL_CLANG
 // don't *really* want to rebuild KDU so turn off specific warnings for this header
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wself-assign-field"
diff --git a/indra/llkdu/tests/llimagej2ckdu_test.cpp b/indra/llkdu/tests/llimagej2ckdu_test.cpp
@@ -29,7 +29,7 @@
 // Class to test
 #include "llimagej2ckdu.h"
 
-#if __clang__
+#if LL_CLANG
 // For this source, it's true that private fields in llkdumem.h are unused.
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-private-field"
diff --git a/indra/llmessage/llbufferstream.cpp b/indra/llmessage/llbufferstream.cpp
diff --git a/indra/llmessage/llbufferstream.h b/indra/llmessage/llbufferstream.h
diff --git a/indra/llmessage/llpartdata.cpp b/indra/llmessage/llpartdata.cpp
diff --git a/indra/newview/llappviewerlinux.h b/indra/newview/llappviewerlinux.h
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
diff --git a/indra/test/lltut.h b/indra/test/lltut.h

Original file line number	Diff line number	Diff line change
`@@ -785,6 +785,8 @@ struct IMAGEHLP_MODULE64_V2 {`
`785`	`785`	`case 8: //SymVirtual:`
`786`	`786`	`szSymType = "Virtual";`
`787`	`787`	`break;`
	`788`	`+ case NumSymTypes:`
	`789`	`+ break;`
`788`	`790`	`}`
`789`	`791`	`}`
`790`	`792`	`LPCSTR pdbName = Module.LoadedImageName;`
Original file line number	Diff line number	Diff line change
`@@ -230,11 +230,11 @@ bool LLVolatileAPRPool::isFull()`
`230`	`230`	`bool _ll_apr_warn_status(apr_status_t status, const char* file, int line)`
`231`	`231`	`{`
`232`	`232`	`if(APR_SUCCESS == status) return false;`
`233`		`-#if !LL_LINUX`
	`233`	`+`
`234`	`234`	`char buf[MAX_STRING]; /* Flawfinder: ignore */`
`235`	`235`	`apr_strerror(status, buf, sizeof(buf));`
`236`	`236`	`LL_WARNS("APR") << "APR: " << file << ":" << line << " " << buf << LL_ENDL;`
`237`		`-#endif`
	`237`	`+`
`238`	`238`	`return true;`
`239`	`239`	`}`
`240`	`240`
Original file line number	Diff line number	Diff line change
`@@ -246,9 +246,7 @@ class LLInstanceTracker`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`protected:`
`249`		`-#if LL_CLANG \|\| LL_GNUC`
`250`		`- __attribute__((no_sanitize("vptr")))`
`251`		`-#endif`
	`249`	`+ LL_UBSAN_SUPRESS_VPTR`
`252`	`250`	`LLInstanceTracker(const KEY& key)`
`253`	`251`	`{`
`254`	`252`	`// We do not intend to manage the lifespan of this object with`
`@@ -487,9 +485,7 @@ class LLInstanceTracker<T, void, KEY_COLLISION_BEHAVIOR>`
`487`	`485`	`using key_snapshot_of = instance_snapshot_of<SUBCLASS>;`
`488`	`486`
`489`	`487`	`protected:`
`490`		`-#if LL_CLANG \|\| LL_GNUC`
`491`		`- __attribute__((no_sanitize("vptr")))`
`492`		`-#endif`
	`488`	`+ LL_UBSAN_SUPRESS_VPTR`
`493`	`489`	`LLInstanceTracker()`
`494`	`490`	`{`
`495`	`491`	`// Since we do not intend for this shared_ptr to manage lifespan, give`
Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ void LLMD5::raw_digest(unsigned char* s) const`
`255`	`255`	`memcpy(s, digest, 16); /* Flawfinder: ignore */`
`256`	`256`	`}`
`257`	`257`
`258`		`-#if LL_DARWIN`
	`258`	`+#if LL_CLANG`
`259`	`259`	`#pragma clang diagnostic push`
`260`	`260`	`#pragma clang diagnostic ignored "-Wdeprecated-declarations"`
`261`	`261`	`#endif`
`@@ -280,7 +280,7 @@ void LLMD5::hex_digest(char* s) const`
`280`	`280`	`s[32] = '\0';`
`281`	`281`	`}`
`282`	`282`
`283`		`-#if LL_DARWIN`
	`283`	`+#if LL_CLANG`
`284`	`284`	`#pragma clang diagnostic pop`
`285`	`285`	`#endif`
`286`	`286`