Changeset 39826 in vbox

Timestamp:

Jan 22, 2012 11:12:24 AM (13 years ago)

Author:

vboxsync

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

75830

Message:

Runtume/linux: build linux-3.3.0-rc1 (please review).

File:

• trunk/include/iprt/types.h (modified) (2 diffs)

trunk/include/iprt/types.h

@@ -110 +110 @@
 #   endif
 #  endif
+#  if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) \
+    || !defined(__cplusplus) \
+    || !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING) \
+    || !defined(CONFIG_OPTIMIZE_INLINING)
+   /* compiler-gcc.h redefines inline macrodefenitions when CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING and CONFIG_OPTIMIZED_INLINING
+    * are defined appeding __attribute__((no_instrument_function)) which isn't supported by g++. inline used in linux/posix_types.h that
+    * why we need include linux/type.h after compiler-gcc.h
+    */
 #  include <linux/types.h>
+#  endif
 #  include <linux/stddef.h>
 #  undef uintptr_t
@@ -124 +133 @@
 #    define __inline__ __inline__
 #   endif
+#  if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) \
+    && defined(__cplusplus) \
+    && defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING) \
+    && defined(CONFIG_OPTIMIZE_INLINING)
+    /*
+     * <linux/compiler-gcc.h> does when CONFIG_OPTIMIZE_INLINING and CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING
+     * are defined and affects VBox c++ sources,
+     *
+     * define inline            inline          notrace
+     * define __inline__        __inline__      notrace
+     * define __inline          __inline        notrace
+     *
+     * upper in <linux/compiler-gcc.h>
+     * #define notrace __attribute__((no_instrument_function))
+     */
+#   undef inline
+#   define inline inline
+#   undef __inline__
+#   define __inline__ __inline__
+#   undef __inline
+#  define __inline __inline
+#  undef __always_inline
+#  define __always_inline __attribute__((always_inline))
+#  include <linux/types.h>
+#  endif /* KERNEL_VERSION(3.3.0)< */
 #  endif
 #  undef false