Runtime

Timestamp:

Dec 3, 2012 5:43:17 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

82438

Message:

IPRT/thread-posix.cpp: avoid the pthread_setname_np dlsym trickery in the static variant of the runtime, causes crashes

Location:

trunk/src/VBox/Runtime

Files:

trunk/src/VBox/Runtime/Makefile.kmk

-              r43880
+              r44020
 RuntimeR3_SDKS          = VBOX_LIBXML2 VBOX_OPENSSL VBOX_BOOST ## @todo why is BOOST and XML2 here? r3/xml.cpp is not in this lib...
 RuntimeR3_SDKS.win      = $(VBOX_WINPSDK) $(VBOX_WINDDK)
 RuntimeR3_DEFS          = IN_RT_R3 IN_SUP_R3 LDR_WITH_NATIVE LDR_WITH_ELF32 LDR_WITH_PE RT_WITH_VBOX RT_NO_GIP
+RuntimeR3_DEFS          = IN_RT_R3 IN_SUP_R3 IN_RT_STATIC LDR_WITH_NATIVE LDR_WITH_ELF32 LDR_WITH_PE RT_WITH_VBOX RT_NO_GIP
 #RuntimeR3_DEFS         += RTMEM_WRAP_TO_EF_APIS
 ifdef IPRT_WITH_KSTUFF
 …
 VBoxRT_INST                    = $(INST_DLL) $(INST_TESTCASE)
 endif
 VBoxRT_DEFS                    = $(filter-out RT_NO_GIP,$(RuntimeR3_DEFS)) IN_SUP_R3 IN_SUP_R3
+VBoxRT_DEFS                    = $(filter-out RT_NO_GIP IN_RT_STATIC,$(RuntimeR3_DEFS)) IN_SUP_R3 IN_SUP_R3
 ifn1of ($(KBUILD_TARGET_ARCH), amd64 x86)
  VBoxRT_DEFS                  += RT_NO_GIP

-              r43363
+              r44020
 # include <mach/mach_host.h>
 #endif
+#if defined(RT_OS_DARWIN) /*|| defined(RT_OS_FREEBSD) - later */ || defined(RT_OS_LINUX) \
+#ifdef IN_RT_STATIC
+/* The pthread_setname_np trickery below assumes a working dl env which is
+ * not guaranteed in the context of a fully static executable. */
+# undef IPRT_MAY_HAVE_PTHREAD_SET_NAME_NP
+#else
+# if defined(RT_OS_DARWIN) /*|| defined(RT_OS_FREEBSD) - later */ || defined(RT_OS_LINUX) \
  || defined(IPRT_MAY_HAVE_PTHREAD_SET_NAME_NP)
+# define IPRT_MAY_HAVE_PTHREAD_SET_NAME_NP
+# include <dlfcn.h>
+#  define IPRT_MAY_HAVE_PTHREAD_SET_NAME_NP
+#  include <dlfcn.h>
+# endif
 #endif
 #if defined(RT_OS_HAIKU)

Note: See TracChangeset for help on using the changeset viewer.