Changeset 25591 in vbox

Timestamp:

Dec 29, 2009 7:11:46 PM (15 years ago)

Author:

vboxsync

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

56282

Message:

fix for compiling against Linux 2.6.33+

Location:

trunk

Files:

• Config.kmk (modified) (3 diffs)
• include/iprt/types.h (modified) (1 diff)
• src/VBox/Additions/linux/drm/vboxvideo_drm.c (modified) (1 diff)
• src/VBox/HostDrivers/Support/SUPDrvInternal.h (modified) (1 diff)
• src/VBox/Runtime/include/internal/iprt.h (modified) (1 diff)
• src/VBox/Runtime/r0drv/linux/the-linux-kernel.h (modified) (1 diff)

trunk/Config.kmk

@@ -1997 +1997 @@
  ifeq ($(origin VBOX_LINUX_SRC),undefined)
   ifneq ($(wildcard /lib/modules/$(shell uname -r)/build/include/linux/autoconf.h),)
-   export VBOX_LINUX_SRC           := /lib/modules/$(shell uname -r)/build
+   export VBOX_LINUX_SRC := /lib/modules/$(shell uname -r)/build
   else
-   export VBOX_LINUX_SRC           := /usr/src/linux
+   export VBOX_LINUX_SRC := /usr/src/linux
   endif
  endif
  ifneq ($(VBOX_LINUX_SRC),)
   ifeq ($(origin VBOX_LINUX_INCS),undefined)
-   export VBOX_LINUX_INCS           := $(VBOX_LINUX_SRC)/include
+   export VBOX_LINUX_INCS := $(VBOX_LINUX_SRC)/include
    # XXX hack alert! support splitted Linux kernels (make O=<build directory>)
    # XXX put this crap elsewhere
@@ -2020 +2020 @@
    endif
    ifneq ($(kernelpath),)
-    VBOX_LINUX_INCS                 += $(VBOX_LINUX_SRC)/include2 $(kernelpath)/include
+    VBOX_LINUX_INCS += $(VBOX_LINUX_SRC)/include2 $(kernelpath)/include
    else
     kernelpath := $(VBOX_LINUX_SRC)
    endif
-   VBOX_LINUX_INCS                  += $(kernelpath)/include/asm-i386/mach-default \
-                                       $(kernelpath)/include/asm-x86/mach-default \
-                                       $(kernelpath)/arch/x86/include \
-                                       $(kernelpath)/arch/x86/include/asm/mach-default \
-                                       $(kernelpath)/include
+   VBOX_LINUX_INCS  += $(kernelpath)/include/asm-i386/mach-default \
+                       $(kernelpath)/include/asm-x86/mach-default \
+                       $(kernelpath)/arch/x86/include \
+                       $(kernelpath)/arch/x86/include/asm/mach-default \
+                       $(kernelpath)/include
   endif
+ endif
+ # Since Linux 2.6.15, <linux/autoconf.h> is included like this. It cannot hurt to do the
+ # same for older Linux kernels
+ ifneq ($(wildcard $(VBOX_LINUX_SRC)/include/linux/autoconf.h),)
+  # Linux < 2.6.33
+  export VBOX_LINUX_INCLUDE := -include $(VBOX_LINUX_SRC)/include/linux/autoconf.h
+ else ifneq ($(wildcard $(VBOX_LINUX_SRC)/include/generated/autoconf.h),)
+  # Linux >= 2.6.33
+  export VBOX_LINUX_INCLUDE := -include $(VBOX_LINUX_SRC)/include/generated/autoconf.h
  endif
 endif
@@ -2291 +2300 @@
 TEMPLATE_VBOXR0DRV_DEFS                = __KERNEL__ MODULE IN_RING0 IN_RT_R0
 TEMPLATE_VBOXR0DRV_INCS                = $(VBOX_LINUX_INCS)
-TEMPLATE_VBOXR0DRV_CFLAGS              = -nostdinc -iwithprefix include \
+TEMPLATE_VBOXR0DRV_CFLAGS              = -nostdinc -iwithprefix include $(VBOX_LINUX_INCLUDE) \
         $(VBOX_GCC_WARN) -Wstrict-prototypes $(VBOX_GCC_Wno-pointer-sign) -Wno-sign-compare \
         $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-common

trunk/include/iprt/types.h

@@ -98 +98 @@
 #  define false linux_false
 #  define uintptr_t linux_uintptr_t
-#  include <linux/autoconf.h>
+#  ifndef AUTOCONF_INCLUDED
+#   include <linux/autoconf.h>
+#  endif
 #  include <linux/types.h>
 #  include <linux/stddef.h>

trunk/src/VBox/Additions/linux/drm/vboxvideo_drm.c

@@ -54 +54 @@
  */
 
-#include <linux/autoconf.h>
+#ifndef AUTOCONF_INCLUDED
+# include <linux/autoconf.h>
+#endif
 #include <linux/version.h>
 #include <linux/module.h>

trunk/src/VBox/HostDrivers/Support/SUPDrvInternal.h

@@ -81 +81 @@
 
 #elif defined(RT_OS_LINUX)
-#   include <linux/autoconf.h>
+#   ifndef AUTOCONF_INCLUDED
+#    include <linux/autoconf.h>
+#   endif
 #   include <linux/version.h>
 #   if defined(CONFIG_MODVERSIONS) && !defined(MODVERSIONS)

trunk/src/VBox/Runtime/include/internal/iprt.h

@@ -44 +44 @@
  && !defined(RT_NO_EXPORT_SYMBOL)
 # define bool linux_bool /* see r0drv/linux/the-linux-kernel.h */
-# include <linux/autoconf.h>
+# ifndef AUTOCONF_INCLUDED
+#  include <linux/autoconf.h>
+# endif
 # if defined(CONFIG_MODVERSIONS) && !defined(MODVERSIONS)
 #  include <linux/version.h>

trunk/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h

@@ -39 +39 @@
 #define bool linux_bool
 
-#include <linux/autoconf.h>
+#ifndef AUTOCONF_INCLUDED
+# include <linux/autoconf.h>
+#endif
 #include <linux/version.h>