Changeset 41307 in vbox for trunk/src/VBox/Runtime/common/log/log.cpp

Timestamp:

May 15, 2012 12:09:10 PM (13 years ago)

Author:

vboxsync

Message:

Runtime/common/log/log: make g_Logger weak which is the better solution

File:

• trunk/src/VBox/Runtime/common/log/log.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/common/log/log.cpp

@@ -183 +183 @@
 *******************************************************************************/
 #ifdef IN_RC
-/** Default logger instance. */
-extern "C" DECLIMPORT(RTLOGGERRC)   g_Logger;
+/** Default logger instance. Make it weak because our RC module loader does not
+ *  necessarily resolve this symbol and the compiler _must_ check if this is
+ *  the case or not. */
+extern "C" DECLWEAK(DECLIMPORT(RTLOGGERRC)) g_Logger;
 #else /* !IN_RC */
 /** Default logger instance. */
@@ -2113 +2115 @@
     {
 #ifdef IN_RC
-        /*
-         * XXX gcc assumes that the address of a variable is always > 0 but this
-         * is not always true for g_Logger (special case in our RC loader)
-         */
-        PRTLOGGER pLogger1 = &g_Logger;
-        pLogger = ASMAtomicReadPtrT(&pLogger1, PRTLOGGER);
+        pLogger = &g_Logger;
 #else
         pLogger = g_pLogger;
@@ -2164 +2161 @@
 {
 #ifdef IN_RC
-    /*
-     * XXX gcc assumes that the address of a variable is always > 0 but this
-     * is not always true for g_Logger (special case in our RC loader)
-     */
-    PRTLOGGER pLogger = &g_Logger;
-    return ASMAtomicReadPtrT(&pLogger, PRTLOGGER);
+    return &g_Logger;
 
 #else /* !IN_RC */
@@ -2206 +2198 @@
 {
 #ifdef IN_RC
-    /*
-     * XXX gcc assumes that the address of a variable is always > 0 but this
-     * is not always true for g_Logger (special case in our RC loader)
-     */
-    PRTLOGGER pLogger = &g_Logger;
-    return ASMAtomicReadPtrT(&pLogger, PRTLOGGER);
+    return &g_Logger;
 #else
 # ifdef IN_RING0