Changeset 10384 in vbox

Timestamp:

Jul 8, 2008 8:43:39 PM (17 years ago)

Author:

vboxsync

Message:

VBOX_HAVE_VISIBILITY_HIDDEN -> RT_USE_VISIBILITY_DEFAULT and RT_USE_VISIBILITY_HIDDEN. Added -keep_private_extern to VBOXR0DRV on darwin, and RT_USE_VISIBILITY_HIDDEN to try work around the non-working private_extern in g++.

Location:

trunk

Files:

• Config.kmk (modified) (3 diffs)
• include/iprt/cdefs.h (modified) (4 diffs)

trunk/Config.kmk

@@ -1190 +1190 @@
         $(APPEND) '$@' 'ifneq ($$(VBOX_GCC_VERSION_CC),)'
         $(APPEND) '$@' ' ifneq ($$(int-ge $$(VBOX_GCC_VERSION_CC),40000),)'
-        $(APPEND) '$@' '  VBOX_GCC_fvisibility-hidden  ?= $(call VBOX_GCC_CHECK_CC,-fvisibility=hidden -DVBOX_HAVE_VISIBILITY_HIDDEN,)'
+        $(APPEND) '$@' '  VBOX_GCC_fvisibility-hidden  ?= $(call VBOX_GCC_CHECK_CC,-fvisibility=hidden -DVBOX_HAVE_VISIBILITY_HIDDEN -DRT_USE_VISIBILITY_DEFAULT,)'
         $(APPEND) '$@' ' endif'
         $(APPEND) '$@' 'endif'
@@ -1795 +1795 @@
 ifeq ($(KBUILD_TARGET),darwin)
 TEMPLATE_VBOXR0DRV_TOOL                = GXX4MACHO
-TEMPLATE_VBOXR0DRV_DEFS               += $(VBOX_DARWIN_DEF_SDK_DEFS) KERNEL KERNEL_PRIVATE DRIVER_PRIVATE APPLE NeXT
+TEMPLATE_VBOXR0DRV_DEFS               += $(VBOX_DARWIN_DEF_SDK_DEFS) KERNEL KERNEL_PRIVATE DRIVER_PRIVATE APPLE NeXT RT_USE_VISIBILITY_HIDDEN
 # I didn't really know why we have to state explicitly the position of the
 # sdk headers. Maybe it has something to do with the fact that the kernel.framework
@@ -1814 +1814 @@
 TEMPLATE_VBOXR0DRV_CFLAGS.profile      = $(TEMPLATE_VBOXR0DRV_CXXFLAGS.profile)
 TEMPLATE_VBOXR0DRV_CFLAGS.kprofile     = $(TEMPLATE_VBOXR0DRV_CXXFLAGS.kprofile)
-TEMPLATE_VBOXR0DRV_LDFLAGS             = $(VBOX_DARWIN_DEF_SDK_LDFLAGS) -static -nostdlib -r -Wl,-Y,1455
+TEMPLATE_VBOXR0DRV_LDFLAGS             = $(VBOX_DARWIN_DEF_SDK_LDFLAGS) -static -nostdlib -r -Wl,-Y,1455 -keep_private_extern
 TEMPLATE_VBOXR0DRV_LIBS                = kmodc++ kmod cc_kext cpp_kext $(VBOX_GCC_LIBGCC)
 endif

trunk/include/iprt/cdefs.h

@@ -444 +444 @@
 #if defined(_MSC_VER) || defined(RT_OS_OS2)
 # define DECLEXPORT(type)       __declspec(dllexport) type
-#elif defined(VBOX_HAVE_VISIBILITY_HIDDEN)
+#elif defined(RT_USE_VISIBILITY_DEFAULT)
 # define DECLEXPORT(type)      __attribute__((visibility("default"))) type
 #else
@@ -464 +464 @@
  * @param   type    The return type of the function or the data type of the variable.
  */
-#if defined(RT_OS_OS2) || defined(RT_OS_WINDOWS) || !defined(VBOX_HAVE_VISIBILITY_HIDDEN)
+#if defined(RT_OS_OS2) || defined(RT_OS_WINDOWS) || !defined(RT_USE_VISIBILITY_HIDDEN)
 # define DECLHIDDEN(type)       type
 #else
@@ -1297 +1297 @@
 #if defined(_MSC_VER) || defined(RT_OS_OS2)
 # define DECLEXPORT_CLASS       __declspec(dllexport)
-#elif defined(VBOX_HAVE_VISIBILITY_HIDDEN)
+#elif defined(RT_USE_VISIBILITY_DEFAULT)
 # define DECLEXPORT_CLASS       __attribute__((visibility("default")))
 #else
@@ -1313 +1313 @@
 #if defined(_MSC_VER) || (defined(RT_OS_OS2) && !defined(__IBMC__) && !defined(__IBMCPP__))
 # define DECLIMPORT_CLASS       __declspec(dllimport)
-#elif defined(VBOX_HAVE_VISIBILITY_HIDDEN)
+#elif defined(RT_USE_VISIBILITY_DEFAULT)
 # define DECLIMPORT_CLASS       __attribute__((visibility("default")))
 #else